SM-2547: Perform some housekeeping in poms - dependencies moved to parent
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/657aaa57 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/657aaa57 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/657aaa57 Branch: refs/heads/servicemix-5.4.x Commit: 657aaa57e3ce77f1b3a1df83c88a6c2d5c954918 Parents: cc7e70c Author: Krzysztof Sobkowiak <[email protected]> Authored: Thu May 7 00:11:45 2015 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Thu May 7 00:11:45 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 151 ++++++++++++++++++++++++++++++++++++++++++++++------ pom.xml | 120 ----------------------------------------- 2 files changed, 135 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/657aaa57/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 904f58d..72c01ff 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -41,31 +41,63 @@ <properties> <activemq.version>5.11.1</activemq.version> <activiti.version>5.16.4</activiti.version> + <akka.version>2.3.9</akka.version> + <aries.blueprint.core.version>1.4.2</aries.blueprint.core.version> + <aries.proxy.version>1.0.4</aries.proxy.version> + <aries.util.version>1.1.0</aries.util.version> <camel.version>2.14.2</camel.version> + <commons-codec.bundle.version>1.10</commons-codec.bundle.version> + <commons-dbcp.bundle.version>1.4_3</commons-dbcp.bundle.version> + <commons-fileupload.version>1.3.1</commons-fileupload.version> + <commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version> + <commons-io.version>2.4</commons-io.version> + <commons-lang.version>2.6</commons-lang.version> + <commons-lang3.version>3.3</commons-lang3.version> <cxf.version>3.0.4</cxf.version> - <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version> - + <derby.bundle.version>10.11.1.1_1</derby.bundle.version> + <drools.bundle.version>${drools.version}_1</drools.bundle.version> + <drools.version>5.6.0.Final</drools.version> + <fasterxml.jackson.version>2.4.1</fasterxml.jackson.version> <felix.bundlerepository.version>2.0.2</felix.bundlerepository.version> + <felix.webconsole.plugins.scriptconsole.version>1.0.0</felix.webconsole.plugins.scriptconsole.version> + <geronimo-atinject.version>1.0</geronimo-atinject.version> + <geronimo-connector.version>2.1.3</geronimo-connector.version> + <geronimo-j2ee-connector.version>2.0.0</geronimo-j2ee-connector.version> + <geronimo-jms.version>1.1.1</geronimo-jms.version> + <geronimo-servlet.version>1.0</geronimo-servlet.version> + <geronimo-ws-metadata.version>1.1.3</geronimo-ws-metadata.version> + <google.guava.version>15.0</google.guava.version> + <h2.version>1.3.170</h2.version> + <javassist.bundle.version>3.12.1.GA_3</javassist.bundle.version> + <jaxb.api.version>2.2</jaxb.api.version> + <jodatime2.bundle.version>2.6</jodatime2.bundle.version> + <jpa.version>2.1.0</jpa.version> + <json4s.bundle.version>3.2.11_1</json4s.bundle.version> <karaf.version>2.4.1</karaf.version> - <aries.proxy.version>1.0.4</aries.proxy.version> - <aries.util.version>1.1.0</aries.util.version> - <aries.blueprint.core.version>1.4.2</aries.blueprint.core.version> + <mvel2.version>2.2.1.Final</mvel2.version> + <mybatis.version>3.2.7</mybatis.version> + <osgi.version>5.0.0</osgi.version> + <pax.exam.version>4.5.0</pax.exam.version> <pax.logging.version>1.8.1</pax.logging.version> - - <akka.version>2.3.9</akka.version> - <scala.version>2.11.5</scala.version> + <pax.url.version>2.3.0</pax.url.version> + <postgresql.version>9.1-901</postgresql.version> + <reflections.bundle.version>0.9.8_1</reflections.bundle.version> <scala-2.10.version>2.10.4</scala-2.10.version> <scala-xml.version>1.0.4</scala-xml.version> - <google.guava.version>15.0</google.guava.version> - <fasterxml.jackson.version>2.4.1</fasterxml.jackson.version> - <typesafe-config.version>1.2.0</typesafe-config.version> - <mvel2.version>2.2.1.Final</mvel2.version> - <mybatis.version>3.2.7</mybatis.version> - <jodatime2.bundle.version>2.6</jodatime2.bundle.version> - <jpa.version>2.1.0</jpa.version> + <scala.version>2.11.5</scala.version> + <servicemix.specs.version>2.4.0</servicemix.specs.version> + <slf4j.version>1.7.10</slf4j.version> + <spring.version>3.2.11.RELEASE_1</spring.version> + <swagger.bundle.version>1.3.12_1</swagger.bundle.version> <swagger.version>1.3.11</swagger.version> + <thoughtworks.paranamer.version>2.7</thoughtworks.paranamer.version> + <typesafe-config.version>1.2.0</typesafe-config.version> + <wsdl4j.bundle.version>1.6.3_1</wsdl4j.bundle.version> + <xalan.version>2.7.2</xalan.version> + <xerces.version>2.11.0</xerces.version> + <xml.api.version>2.11.0-20110622</xml.api.version> - <servicemix.specs.version>2.4.0</servicemix.specs.version> + <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version> <maven-archetype-packaging-version>2.0</maven-archetype-packaging-version> </properties> @@ -136,6 +168,7 @@ <artifactId>activemq-pool</artifactId> <version>${activemq.version}</version> </dependency> + <!-- Activiti--> <dependency> <groupId>org.activiti</groupId> @@ -152,6 +185,7 @@ <artifactId>activiti-osgi</artifactId> <version>${activiti.version}</version> </dependency> + <!-- Apache Karaf --> <dependency> <groupId>org.apache.karaf</groupId> @@ -172,6 +206,7 @@ <version>${karaf.version}</version> <type>zip</type> </dependency> + <!-- Apache CXF --> <dependency> <groupId>org.apache.cxf</groupId> @@ -383,6 +418,8 @@ <artifactId>cxf-services-wsn-core</artifactId> <version>${cxf-version}</version> </dependency> + + <!-- ServiceMix Specs --> <dependency> <groupId>org.apache.servicemix.specs</groupId> <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId> @@ -423,6 +460,8 @@ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId> <version>${servicemix.specs.version}</version> </dependency> + + <!-- Pax Logging --> <dependency> <groupId>org.ops4j.pax.logging</groupId> <artifactId>pax-logging-service</artifactId> @@ -433,6 +472,86 @@ <artifactId>pax-logging-api</artifactId> <version>${pax.logging.version}</version> </dependency> + + <!-- Geronimo Specs --> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-ws-metadata_2.0_spec</artifactId> + <version>${geronimo-ws-metadata.version}</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>${geronimo-atinject.version}</version> + </dependency> + + <!-- ServiceMix Bundles --> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId> + <version>${commons-httpclient.bundle.version}</version> + </dependency> + + <!-- Pax Url --> + <dependency> + <groupId>org.ops4j.pax.url</groupId> + <artifactId>pax-url-aether</artifactId> + <version>${pax.url.version}</version> + </dependency> + + <!-- Pax Exam --> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam</artifactId> + <version>${pax.exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-container-karaf</artifactId> + <version>${pax.exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-container-remote</artifactId> + <version>${pax.exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-junit4</artifactId> + <version>${pax.exam.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-spi</artifactId> + <version>${pax.exam.version}</version> + <scope>test</scope> + </dependency> + + <!-- Other Dependencies --> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>${xerces.version}</version> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>${xalan.version}</version> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>serializer</artifactId> + <version>${xalan.version}</version> + </dependency> <dependency> <groupId>com.wordnik</groupId> <artifactId>swagger-jaxrs_2.11</artifactId> http://git-wip-us.apache.org/repos/asf/servicemix/blob/657aaa57/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 493a8dd..5de4d75 100644 --- a/pom.xml +++ b/pom.xml @@ -67,30 +67,6 @@ <properties> - <!-- Geronimo --> - <geronimo-connector.version>2.1.3</geronimo-connector.version> - <geronimo-j2ee-connector.version>2.0.0</geronimo-j2ee-connector.version> - <geronimo-jms.version>1.1.1</geronimo-jms.version> - <geronimo-servlet.version>1.0</geronimo-servlet.version> - <geronimo-ws-metadata.version>1.1.3</geronimo-ws-metadata.version> - <geronimo-atinject.version>1.0</geronimo-atinject.version> - - <!-- ServiceMix Bundles --> - <commons-codec.bundle.version>1.10</commons-codec.bundle.version> - <commons-dbcp.bundle.version>1.4_3</commons-dbcp.bundle.version> - <commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version> - <commons-io.version>2.4</commons-io.version> - <derby.bundle.version>10.11.1.1_1</derby.bundle.version> - <drools.bundle.version>${drools.version}_1</drools.bundle.version> - <jaxb.api.version>2.2</jaxb.api.version> - <osgi.version>5.0.0</osgi.version> - <wsdl4j.bundle.version>1.6.3_1</wsdl4j.bundle.version> - <swagger.bundle.version>1.3.12_1</swagger.bundle.version> - <javassist.bundle.version>3.12.1.GA_3</javassist.bundle.version> - <reflections.bundle.version>0.9.8_1</reflections.bundle.version> - <json4s.bundle.version>3.2.11_1</json4s.bundle.version> - <thoughtworks.paranamer.version>2.7</thoughtworks.paranamer.version> - <!-- ServiceMix legal shared resources --> <servicemix.legal.version>1.0</servicemix.legal.version> @@ -120,21 +96,6 @@ <maven-dependency-plugin.version>2.9</maven-dependency-plugin.version> <apache-rat-plugin.version>0.11</apache-rat-plugin.version> - <!-- Other Dependencies --> - <commons-fileupload.version>1.3.1</commons-fileupload.version> - <commons-lang.version>2.6</commons-lang.version> - <commons-lang3.version>3.3</commons-lang3.version> - <drools.version>5.6.0.Final</drools.version> - <felix.webconsole.plugins.scriptconsole.version>1.0.0</felix.webconsole.plugins.scriptconsole.version> - <h2.version>1.3.170</h2.version> - <xerces.version>2.11.0</xerces.version> - <xml.api.version>2.11.0-20110622</xml.api.version> - <xalan.version>2.7.2</xalan.version> - <pax.exam.version>4.5.0</pax.exam.version> - <pax.url.version>2.3.0</pax.url.version> - <postgresql.version>9.1-901</postgresql.version> - <slf4j.version>1.7.10</slf4j.version> - <spring.version>3.2.11.RELEASE_1</spring.version> </properties> <pluginRepositories> @@ -151,87 +112,6 @@ </pluginRepository> </pluginRepositories> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ws-metadata_2.0_spec</artifactId> - <version>${geronimo-ws-metadata.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - <version>${geronimo-atinject.version}</version> - </dependency> - - <!-- ServiceMix Bundles --> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId> - <version>${commons-httpclient.bundle.version}</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons-io.version}</version> - </dependency> - - <!-- Other Dependencies --> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>${xerces.version}</version> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>${xalan.version}</version> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>serializer</artifactId> - <version>${xalan.version}</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-aether</artifactId> - <version>${pax.url.version}</version> - </dependency> - - <!-- Pax Exam --> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam</artifactId> - <version>${pax.exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-karaf</artifactId> - <version>${pax.exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-remote</artifactId> - <version>${pax.exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> - <version>${pax.exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-spi</artifactId> - <version>${pax.exam.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - <build> <defaultGoal>install</defaultGoal>
