From: Cherian Mathew Date: Wed, 16 Sep 2015 17:19:25 +0000 (+0200) Subject: Merge branch 'develop' into remoting-4.0 X-Git-Tag: 3.12.0^2~135^2~1^2~2 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/999d37c42eeb8050f0269503cfa2aee48cda3d01 Merge branch 'develop' into remoting-4.0 Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.cdmlib/build.properties eu.etaxonomy.taxeditor.cdmlib/pom.xml --- 999d37c42eeb8050f0269503cfa2aee48cda3d01 diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath index da7d39d01,e1522a61c..442ca897d --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@@ -1,201 -1,209 +1,202 @@@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - ++ ++ ++ ++ ++ ++ ++ ++ + + ++ diff --cc eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index fe6cb9175,94568ba0d..58774bcc9 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@@ -657,13 -612,12 +657,14 @@@ Bundle-ClassPath: . lib/xmlbeans-2.3.0.jar, lib/poi-ooxml-schemas-3.10-FINAL.jar, lib/swagger-annotations-1.3.5.jar, + lib/apache-log4j-extras-1.2.17.jar, - lib/cdmlib-commons-3.11.0-SNAPSHOT.jar, - lib/cdmlib-ext-3.11.0-SNAPSHOT.jar, - lib/cdmlib-io-3.11.0-SNAPSHOT.jar, - lib/cdmlib-model-3.11.0-SNAPSHOT.jar, - lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar, - lib/cdmlib-print-3.11.0-SNAPSHOT.jar, - lib/cdmlib-remote-3.11.0-SNAPSHOT.jar, - lib/cdmlib-services-3.11.0-SNAPSHOT.jar + lib/cdmlib-commons-3.12.0-SNAPSHOT.jar, + lib/cdmlib-ext-3.12.0-SNAPSHOT.jar, + lib/cdmlib-io-3.12.0-SNAPSHOT.jar, + lib/cdmlib-model-3.12.0-SNAPSHOT.jar, + lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar, + lib/cdmlib-print-3.12.0-SNAPSHOT.jar, + lib/cdmlib-remote-3.12.0-SNAPSHOT.jar, + lib/cdmlib-services-3.12.0-SNAPSHOT.jar ++ Import-Package: eu.etaxonomy.cdm.api.application diff --cc eu.etaxonomy.taxeditor.cdmlib/build.properties index 5622c0ecc,abc7cd856..f38d92b03 --- a/eu.etaxonomy.taxeditor.cdmlib/build.properties +++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties @@@ -185,16 -194,14 +185,16 @@@ bin.includes = META-INF/, lib/poi-ooxml-schemas-3.10-FINAL.jar,\ lib/xmlbeans-2.3.0.jar,\ lib/swagger-annotations-1.3.5.jar,\ - lib/cdmlib-commons-3.11.0-SNAPSHOT.jar,\ - lib/cdmlib-ext-3.11.0-SNAPSHOT.jar,\ - lib/cdmlib-io-3.11.0-SNAPSHOT.jar,\ - lib/cdmlib-model-3.11.0-SNAPSHOT.jar,\ - lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar,\ - lib/cdmlib-print-3.11.0-SNAPSHOT.jar,\ - lib/cdmlib-remote-3.11.0-SNAPSHOT.jar,\ - lib/cdmlib-services-3.11.0-SNAPSHOT.jar,\ + lib/cdmlib-commons-3.12.0-SNAPSHOT.jar,\ + lib/cdmlib-ext-3.12.0-SNAPSHOT.jar,\ + lib/cdmlib-io-3.12.0-SNAPSHOT.jar,\ + lib/cdmlib-model-3.12.0-SNAPSHOT.jar,\ + lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar,\ + lib/cdmlib-print-3.12.0-SNAPSHOT.jar,\ + lib/cdmlib-remote-3.12.0-SNAPSHOT.jar,\ - lib/cdmlib-services-3.12.0-SNAPSHOT.jar ++ lib/cdmlib-services-3.12.0-SNAPSHOT.jar.\ + lib/apache-log4j-extras-1.2.17.jar,\ + resources/cdm.map.ser jars.compile.order = . output.. = bin/ diff --cc eu.etaxonomy.taxeditor.cdmlib/pom.xml index 8180196b8,3f637dae0..26d142e61 --- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml +++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml @@@ -1,591 -1,158 +1,592 @@@ -- -- -- -- eu.etaxonomy -- taxeditor-parent -- 3.11.0-SNAPSHOT -- -- 4.0.0 -- eu.etaxonomy.taxeditor.cdmlib -- eclipse-plugin -- CDM Library Dependencies Plugin - CDM Library and dependencies as a plugin - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.4 - - - copy-dependencies - validate - - copy-dependencies - - - cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io - lib - true - true - true - - - - copy-dependencies-sources - validate - - copy-dependencies - - - sources - cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io - lib - true - true - true - false - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - remove-existing-jars - clean - - run - - - - Remove all cdmlib jars - - - - - - - - update-snapshot-jar-names - validate - - run - - - - Update cdmlib jars to SNAPSHOT when build with timestamp - - - - - - - - - - - - - - - - - - identificationKeyAPI - identificationKeyAPI - 1.0-SNAPSHOT - - - eu.etaxonomy - cdmlib-commons - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-model - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-persistence - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-remote - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-print - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-services - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-io - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-ext - ${cdmlib.version} - - - org.aspectj - aspectjrt - 1.7.1 - - - org.aspectj - aspectjweaver - 1.7.1 - - - - - ++ ++ ++ ++ eu.etaxonomy ++ taxeditor-parent ++ 3.11.0-SNAPSHOT ++ ++ 4.0.0 ++ eu.etaxonomy.taxeditor.cdmlib ++ eclipse-plugin ++ CDM Library Dependencies Plugin + CDM Library and dependencies as a plugin + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.7 + + + - - ++ ++ + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + copy-dependencies + validate + + copy-dependencies + + + + cdmlib-remote-webapp + + + cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote + + ${basedir}/lib + true + true + true + + + + copy-dependency-war + validate + + copy-dependencies + + + + cdmlib-remote-webapp + + + ${basedir}/src/main/resources/etc/jetty + + true + true + true + + - ++ + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + update-snapshot-jar-names + validate + + run + + + + Anonymizing war + + + + + Update cdmlib jars to SNAPSHOT when build with + timestamp + + + + + + + + + + + + + + + + + + + cleanCdmlibJars + + + + maven-clean-plugin + 2.3 + + + + ${basedir}/lib + + cdmlib-* + + false + + + + + + + + + cleanAllJars + + + + maven-clean-plugin + 2.3 + + + + ${basedir}/lib + + * + + false + + + + + + + + + copyAllJars + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + copy-all-dependencies + validate + + copy-dependencies + + + + cdmlib-remote-webapp + + ${basedir}/lib + true + true + true + + + + + + + + + + + SpringSource Enterprise Bundle Repository - External Bundle + Milestones + + http://repository.springsource.com/maven/bundles/milestone + + + + SpringSource Enterprise Bundle Repository - SpringSource + Bundle + Releases + + http://repository.springsource.com/maven/bundles/release + + + + SpringSource Enterprise Bundle Repository - External Bundle + Releases + + http://repository.springsource.com/maven/bundles/external + + + + + + eu.etaxonomy + cdmlib-remote-webapp + ${cdmlib.version} + war + + + eu.etaxonomy + cdmlib-commons + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-model + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-persistence + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-remote + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-print + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-services + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-io + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-ext + ${cdmlib.version} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + net.sf.ehcache + ehcache-core + 2.4.3 + + + org.hibernate + hibernate-core + 4.1.10.Final + + + org.hibernate.common + hibernate-commons-annotations + 4.0.1.Final + + + org.hibernate + hibernate-search-engine + 4.2.0.Final + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.1.Final + + + org.hibernate + hibernate-envers + 4.1.10.Final + + + org.hibernate + hibernate-entitymanager + 4.1.10.Final + + + dom4j + dom4j + 1.6 + + + org.jadira.usertype + usertype.jodatime + 2.0.1 + + + org.jadira.usertype + usertype.spi + 2.0.1 + + + + junit + junit + 4.11 + test + + + log4j + log4j + 1.2.17 + + + org.jdom + jdom + 1.1.3 + + + org.springframework + org.springframework.context + 3.2.2.RELEASE + + + org.springframework + org.springframework.context.support + 3.2.2.RELEASE + + + org.springframework + org.springframework.aspects + 3.2.2.RELEASE + + + org.springframework + org.springframework.test + 3.2.2.RELEASE + + + org.springframework + org.springframework.beans + 3.2.2.RELEASE + + + org.springframework + org.springframework.transaction + 3.2.2.RELEASE + + + org.springframework + org.springframework.web + 3.2.2.RELEASE + + + org.springframework + org.springframework.core + 3.2.2.RELEASE + + + org.springframework + org.springframework.aop + 3.2.2.RELEASE + + + org.springframework + org.springframework.expression + 3.2.2.RELEASE + + + org.springframework + org.springframework.orm + 3.2.2.RELEASE + + + org.springframework + org.springframework.jdbc + 3.2.2.RELEASE + + + org.springframework.security + spring-security-core + 3.1.3.RELEASE + + + org.springframework.security + spring-security-config + 3.1.3.RELEASE + + + org.springframework.security + spring-security-remoting + 3.1.3.RELEASE + + + org.jboss.logging + jboss-logging + 3.1.3.GA + + + org.hamcrest + hamcrest-core + 1.3 + + + com.mchange + c3p0 + 0.9.2 + + + org.jboss.spec.javax.transaction + jboss-transaction-api_1.1_spec + 1.0.0.Final + + + org.aspectj + aspectjrt + 1.7.1 + + + commons-logging + commons-logging + 1.1.1 + + + commons-lang + commons-lang + 2.6 + + + aopalliance + aopalliance + 1.0 + + + joda-time + joda-time + 2.1 + + + com.ibm.lsid + lsid-client + 1.1.2 + + + com.ibm.lsid + lsid-server + 1.1.2 + + + org.apache.lucene + lucene-core + 3.6.2 + + + org.slf4j + slf4j-api + 1.7.2 + + + org.javassist + javassist + 3.17.1-GA + + + au.com.bytecode + opencsv + 2.4 + + + + + + org.unitils + unitils-core + 3.4.2 + + + org.unitils + unitils-spring + 3.4.2 + + + org.unitils + unitils-database + 3.4.2 + + + commons-dbcp + commons-dbcp + 1.4 + + + commons-pool + commons-pool + 1.5.4 + + + org.unitils + unitils-dbmaintainer + 3.4.2 + + + com.h2database + h2 + 1.4.181 + + + org.unitils + unitils-dbunit + 3.4.2 + + + org.dbunit + dbunit + 2.4.9 + + + + + + wsdl4j + wsdl4j + 1.6.3 + + + javax.validation + validation-api + 1.1.0.Final + + - - ++ ++ ++ diff --cc pom.xml index 8e0e789e9,07bdbc79d..11748b47b --- a/pom.xml +++ b/pom.xml @@@ -18,12 -18,11 +18,12 @@@ 1.6 UTF-8 - 3.11.0-SNAPSHOT + 3.12.0-SNAPSHOT 0.22.0 - 3.11.0-SNAPSHOT + 3.12.0-SNAPSHOT snapshot + 3.4.2 eu.etaxonomy.taxeditor.cdmlib