corrected merge to latest snapshot version

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / build.properties

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index d575af4169fd78c319ed38d2f9b2d19b8c15c6b0..78ed69c09c7d10aaec99663468f6e8f74688ac33 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -1,4 +1,5 @@
 bin.includes = META-INF/,\\r
+               .,\\r
                lib/activation-1.1.1.jar,\\r
                lib/antlr-2.7.7.jar,\\r
                lib/aopalliance-1.0.jar,\\r
@@ -22,22 +23,6 @@ bin.includes = META-INF/,\
                lib/batik-util-1.7.jar,\\r
                lib/batik-xml-1.7.jar,\\r
                lib/c3p0-0.9.2.jar,\\r
-               lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-io-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-model-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-print-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-services-3.3.0-SNAPSHOT.jar,\\r
                lib/cglib-nodep-2.2.2.jar,\\r
                lib/com.springsource.org.aopalliance-1.0.0.jar,\\r
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\\r
@@ -60,7 +45,7 @@ bin.includes = META-INF/,\
                lib/dozer-5.3.0.jar,\\r
                lib/easymock-3.1.jar,\\r
                lib/easymockclassextension-2.3.jar,\\r
-               lib/ehcache-core-2.4.3.jar,\\r
+               lib/ehcache-core-2.6.9.jar,\\r
                lib/ezmorph-1.0.6.jar,\\r
                lib/fop-1.1.jar,\\r
                lib/guava-r05.jar,\\r
@@ -150,7 +135,6 @@ bin.includes = META-INF/,\
                lib/plexus-classworlds-1.2-alpha-9.jar,\\r
                lib/plexus-container-default-1.0-alpha-30.jar,\\r
                lib/plexus-utils-2.0.5.jar,\\r
-               lib/poi-3.9.jar,\\r
                lib/postgresql-9.1-901.jdbc4.jar,\\r
                lib/sanselan-0.97-incubator.jar,\\r
                lib/servlet-api-2.5.jar,\\r
@@ -171,15 +155,6 @@ bin.includes = META-INF/,\
                lib/spring-security-core-3.1.3.RELEASE.jar,\\r
                lib/stax-1.2.0.jar,\\r
                lib/stax-api-1.0.1.jar,\\r
-               lib/unitils-core-3.3.jar,\\r
-               lib/unitils-database-3.3.jar,\\r
-               lib/unitils-dbmaintainer-3.3.jar,\\r
-               lib/unitils-dbunit-3.3.jar,\\r
-               lib/unitils-easymock-3.3.jar,\\r
-               lib/unitils-inject-3.3.jar,\\r
-               lib/unitils-mock-3.3.jar,\\r
-               lib/unitils-orm-3.3.jar,\\r
-               lib/unitils-spring-3.3.jar,\\r
                lib/usertype.jodatime-2.0.1.jar,\\r
                lib/usertype.spi-2.0.1.jar,\\r
                lib/validation-api-1.0.0.GA.jar,\\r
@@ -201,10 +176,27 @@ bin.includes = META-INF/,\
                lib/google-api-translate-java-0.92.jar,\\r
                lib/odfdom-0.8.jar,\\r
                lib/h2mig_pagestore_addon.jar,\\r
-               lib/spring-security-remoting-3.1.3.RELEASE.jar\r
+               lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
+               lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
+               lib/jena-core-2.11.2.jar,\\r
+               lib/jena-iri-1.0.2.jar,\\r
+               lib/poi-3.10-FINAL.jar,\\r
+               lib/poi-ooxml-3.10-FINAL.jar,\\r
+               lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
+               lib/xmlbeans-2.3.0.jar,\\r
+               lib/cdmlib-commons-3.6.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.6.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.6.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.6.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.6.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.6.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.6.1-SNAPSHOT.jar,\\r
+               lib/swagger-annotations-1.3.5.jar\r
+\r
 jars.compile.order = .\r
 output.. = bin/\r
 source.. = src/main/java/,\\r
-           src/main/resources/,\\r
-           src/test/java/\r
+           src/main/resources/\r
+src.includes = src/\r
 \r