11:10 p.m.
Author: epbernard
Date: 2008-05-29 00:10:56 -0400 (Thu, 29 May 2008)
New Revision: 14703
Modified:
search/trunk/build.properties.dist
search/trunk/build.xml
search/trunk/ivy.xml
search/trunk/ivy/ivyconf.xml
search/trunk/pom.xml
Log:
Move dependencies to repository artifacts rather than latest
Modified: search/trunk/build.properties.dist
===================================================================
--- search/trunk/build.properties.dist 2008-05-27 20:56:10 UTC (rev 14702)
+++ search/trunk/build.properties.dist 2008-05-29 04:10:56 UTC (rev 14703)
@@ -1,12 +1,4 @@
common.dir=.
src.dir=src
test.dir=test
-testresources.dir=test-resources
-hibernate-core.home=../hibernate-3.2
-
-#locally present jars
-jpa-api.jar=./lib/ejb3-persistence.jar
-commons-annotations.jar=./lib/hibernate-commons-annotations.jar
-annotations.jar=./lib/test/hibernate-annotations.jar
-entitymanager.jar=./lib/test/hibernate-entitymanager.jar
-validator.jar=./lib/test/hibernate-validator.jar
\ No newline at end of file
+testresources.dir=test-resources
\ No newline at end of file
Modified: search/trunk/build.xml
===================================================================
--- search/trunk/build.xml 2008-05-27 20:56:10 UTC (rev 14702)
+++ search/trunk/build.xml 2008-05-29 04:10:56 UTC (rev 14703)
@@ -17,7 +17,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate Search"/>
<property name="name" value="hibernate-search"/>
- <property name="version" value="3.1.0.CR1"/>
+ <property name="version" value="3.1.0.Beta1"/>
<property name="javadoc.packagenames"
value="org.hibernate.search.*"/>
<property name="copy.test" value="true"/>
<property name="javac.source" value="1.5"/>
@@ -355,6 +355,13 @@
<fileset file="${lib.dir}/build/*.jar"/>
</copy>
+ <!-- ivy uses the module name without hibernate- (to mimic the directory
names). Revert the situation -->
+ <move file="${dist.lib.dir}/commons-annotations.jar"
tofile="${dist.lib.dir}/hibernate-commons-annotations.jar"/>
+ <move file="${dist.lib.dir}/test/commons-annotations.jar"
tofile="${dist.lib.dir}/test/hibernate-commons-annotations.jar"/>
+ <move file="${dist.lib.dir}/test/annotations.jar"
tofile="${dist.lib.dir}/test/hibernate-annotations.jar"/>
+ <move file="${dist.lib.dir}/test/entitymanager.jar"
tofile="${dist.lib.dir}/test/hibernate-entitymanager.jar"/>
+
+
<copy file="${basedir}/build.properties.dist"
tofile="${dist.dir}/build.properties" failonerror="false">
</copy>
<antcall target="common-build.dist"/>
Modified: search/trunk/ivy/ivyconf.xml
===================================================================
--- search/trunk/ivy/ivyconf.xml 2008-05-27 20:56:10 UTC (rev 14702)
+++ search/trunk/ivy/ivyconf.xml 2008-05-29 04:10:56 UTC (rev 14703)
@@ -12,6 +12,9 @@
<ivy pattern="../[module]/target/[revision]/ivy.xml"/>
<artifact
pattern="../[module]/target/[revision]/[artifact].[ext]"/>
</filesystem>
+ <filesystem name="maven-local"
m2compatible="true">
+ <artifact
pattern="${offline.repository.jboss.org}/[organization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
+ </filesystem>
<url name="jboss-rep-maven-regular"
m2compatible="true">
<artifact
pattern="http://repository.jboss.org/maven2/[organization]/[module]/...
</url>
Modified: search/trunk/ivy.xml
===================================================================
--- search/trunk/ivy.xml 2008-05-27 20:56:10 UTC (rev 14702)
+++ search/trunk/ivy.xml 2008-05-29 04:10:56 UTC (rev 14703)
@@ -15,7 +15,7 @@
<!-- compile time dependencies -->
<dependency name="ejb3-persistence" rev="1.0.2.GA"
conf="default->default"/>
- <dependency name="commons-annotations" rev="latest"
conf="default->default"/>
+ <dependency name="commons-annotations" rev="3.1.0.CR1"
conf="default->default"/>
<dependency org="org.slf4j" name="slf4j-api"
rev="1.4.2" conf="default->default"/>
<dependency org="org.hibernate" name="hibernate-core"
rev="3.3.0.CR1" conf="default->default"/>
<dependency org="javax.transaction" name="jta"
rev="1.1" conf="default->default"/>
@@ -30,8 +30,8 @@
<dependency org="dom4j" name="dom4j" rev="1.6.1"
conf="test->default"/>
<!-- test deps -->
- <dependency name="annotations" rev="latest"
conf="test->default"/>
- <dependency name="entitymanager" rev="latest"
conf="test->default"/>
+ <dependency name="annotations" rev="3.4.0.CR1"
conf="test->default"/>
+ <dependency name="entitymanager" rev="3.4.0.CR1"
conf="test->default"/>
<dependency org="cglib" name="cglib" rev="2.1_3"
conf="test->default"/>
<dependency org="asm" name="asm" rev="1.5.3"
conf="test->default"/>
<dependency org="asm" name="asm-attrs"
rev="1.5.3" conf="test->default"/>
Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml 2008-05-27 20:56:10 UTC (rev 14702)
+++ search/trunk/pom.xml 2008-05-29 04:10:56 UTC (rev 14703)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
- <version>3.1.0.CR1</version>
+ <version>3.1.0.Beta1</version>
<description>Hibernate Search</description>
<dependencies>
<dependency>