From: Cherian Mathew Date: Fri, 5 Jun 2015 16:16:57 +0000 (+0200) Subject: Updating develop poms to hotfix version to avoid merge conflicts X-Git-Tag: 3.7.0~1^2~81 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/c91fa0aa45b6a0b3a945a345d469b711459ae4b0 Updating develop poms to hotfix version to avoid merge conflicts --- diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml index 2ef5065a8..015590ea9 100644 --- a/eu.etaxonomy.taxeditor.application/pom.xml +++ b/eu.etaxonomy.taxeditor.application/pom.xml @@ -1,10 +1,9 @@ - + eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.1 4.0.0 diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml index 4a050c44d..f4bce7746 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml +++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml @@ -1,10 +1,9 @@ - + eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.1 4.0.0 @@ -12,7 +11,7 @@ eclipse-plugin Bulkeditor Bundle - + http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorBulkeditorBundle diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml index f6025565a..7ebc5c5e3 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml +++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml @@ -1,160 +1,158 @@ - - - - eu.etaxonomy - taxeditor-parent - 3.6.1-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.6.1 + + 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 + + + + + diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml index 1ac274434..040ab3866 100644 --- a/eu.etaxonomy.taxeditor.editor/pom.xml +++ b/eu.etaxonomy.taxeditor.editor/pom.xml @@ -1,10 +1,9 @@ - + eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.1 4.0.0 @@ -12,7 +11,7 @@ eclipse-plugin Editor Bundle - + http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml index 6d0a3e0fd..4faf304ae 100644 --- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml +++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml @@ -3,13 +3,13 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.1 4.0.0 eu.etaxonomy.taxeditor.feature.platform eclipse-feature Taxonomic Editor Platform Dependencies - + http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle diff --git a/eu.etaxonomy.taxeditor.feature/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml index d573f8d1e..4c92868f7 100644 --- a/eu.etaxonomy.taxeditor.feature/pom.xml +++ b/eu.etaxonomy.taxeditor.feature/pom.xml @@ -1,10 +1,9 @@ - + eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.1 4.0.0 eu.etaxonomy.taxeditor.feature diff --git a/eu.etaxonomy.taxeditor.help/pom.xml b/eu.etaxonomy.taxeditor.help/pom.xml index 94399ed79..74747fcd9 100644 --- a/eu.etaxonomy.taxeditor.help/pom.xml +++ b/eu.etaxonomy.taxeditor.help/pom.xml @@ -1,10 +1,9 @@ - + eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.1 4.0.0 diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml index 8b83544de..ed81dc650 100644 --- a/eu.etaxonomy.taxeditor.navigation/pom.xml +++ b/eu.etaxonomy.taxeditor.navigation/pom.xml @@ -1,10 +1,9 @@ - + eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.1 4.0.0 diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml index 70bae0d1b..a9a8afc66 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml +++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml @@ -1,10 +1,9 @@ - + taxeditor-parent eu.etaxonomy - 3.6.1-SNAPSHOT + 3.6.1 4.0.0 @@ -13,7 +12,7 @@ eclipse-plugin Printpublisher Bundle - + http://wp5.e-taxonomy.eu/printpublisher diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml index 418d60a1a..9c15669e4 100644 --- a/eu.etaxonomy.taxeditor.store/pom.xml +++ b/eu.etaxonomy.taxeditor.store/pom.xml @@ -1,10 +1,9 @@ - + eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.1 4.0.0 diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml index f47b65227..350129064 100644 --- a/eu.etaxonomy.taxeditor/pom.xml +++ b/eu.etaxonomy.taxeditor/pom.xml @@ -1,9 +1,8 @@ - + eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.1 4.0.0 diff --git a/pom.xml b/pom.xml index fe14b1771..8726503b8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.1 EDIT Taxonomic Editor The Taxonomic Editor for EDIT's platform for cybertaxonomy @@ -82,7 +82,7 @@ Java Developer Architect - + @@ -100,7 +100,7 @@ Java Developer Architect - +