Fix incorrect merge
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 11 Sep 2015 12:42:00 +0000 (14:42 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 11 Sep 2015 12:42:00 +0000 (14:42 +0200)
eu.etaxonomy.taxeditor.cdmlib/build.properties

index 0fcdec366dc41baae573745244bf3887ead7d650..bb3de368cbcb706f58ad83ac3e366c57b52c68f1 100644 (file)
@@ -176,7 +176,7 @@ 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
@@ -185,6 +185,14 @@ bin.includes = META-INF/,\
                lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
                lib/xmlbeans-2.3.0.jar,\\r
                lib/swagger-annotations-1.3.5.jar,\\r
+               lib/cdmlib-commons-3.9.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.9.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.9.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.9.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.9.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.9.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.9.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.9.0-SNAPSHOT.jar,\\r
                lib/apache-log4j-extras-1.2.17.jar,\\r
                resources/cdm.map.ser\r
 jars.compile.order = .\r