CAMEL-4817 move the version properties into parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c88e547c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c88e547c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c88e547c Branch: refs/heads/camel-gora Commit: c88e547ccd0175705618671fbc604ab70e903c6f Parents: 4e7783b Author: Willem Jiang <willem.ji...@gmail.com> Authored: Tue Nov 19 16:17:46 2013 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Mon Dec 9 10:07:08 2013 +0800 ---------------------------------------------------------------------- components/camel-gora/pom.xml | 56 +++++++++++++++----------------------- parent/pom.xml | 3 ++ 2 files changed, 25 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c88e547c/components/camel-gora/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml index e05920e..d808643 100644 --- a/components/camel-gora/pom.xml +++ b/components/camel-gora/pom.xml @@ -46,24 +46,6 @@ <camel.osgi.export.pkg>org.apache.camel.component.gora.*</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=gora</camel.osgi.export.service> - <!-- - Libraries versions - --> - - <!-- apache gora --> - <apache-gora.version>0.4-SNAPSHOT</apache-gora.version> - - <mockito.version>1.9.0</mockito.version> - <powermock.version>1.4.11</powermock.version> - - <hadoop.version>1.1.1_1</hadoop.version> - <avro.version>1.6.1_1</avro.version> - <jackson.version>1.6.9</jackson.version> - - <jdom.version>1.1.2_1</jdom.version> - <guava.version>11.0.2_2</guava.version> - <commons-beanutils.version>1.8.3</commons-beanutils.version> - </properties> <build> @@ -99,25 +81,25 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>${mockito.version}</version> + <version>${mockito-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-core</artifactId> - <version>${powermock.version}</version> + <version>${powermock-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> - <version>${powermock.version}</version> + <version>${powermock-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito</artifactId> - <version>${powermock.version}</version> + <version>${powermock-version}</version> <scope>test</scope> </dependency> <dependency> @@ -141,21 +123,27 @@ <dependency> <groupId>org.apache.gora</groupId> <artifactId>gora-core</artifactId> - <version>${apache-gora.version}</version> + <version>${apache-gora-version}</version> </dependency> <!-- hadoop --> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.hadoop-core</artifactId> - <version>${hadoop.version}</version> + <version>${hadoop-bundle-version}</version> + <exclusions> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils-core</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Avro --> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.avro</artifactId> - <version>${avro.version}</version> + <version>${avro-bundle-version}</version> </dependency> <!-- other --> @@ -163,27 +151,27 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>${jackson.version}</version> + <version>${jackson-version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>${jackson.version}</version> + <version>${jackson-version}</version> </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.jdom</artifactId> - <version>${jdom.version}</version> + <version>${jdom-bundle-version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.guava</artifactId> - <version>${guava.version}</version> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${google-guava-version}</version> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>${commons-beanutils.version}</version> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId> + <version>${commons-beanutils-bundle-version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/c88e547c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 02c7d60..4f21389 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -43,6 +43,7 @@ <antlr-runtime-bundle-version>3.4_2</antlr-runtime-bundle-version> <aopalliance-bundle-version>1.0_6</aopalliance-bundle-version> <apacheds-version>1.5.7</apacheds-version> + <apache-gora-version>0.4-SNAPSHOT</apache-gora-version> <apache-mime4j-version>0.7.2</apache-mime4j-version> <aries-blueprint-api-version>1.0.0</aries-blueprint-api-version> <aries-blueprint-core-version>1.1.0</aries-blueprint-core-version> @@ -79,6 +80,7 @@ <cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version> <cometd-java-server>2.3.1</cometd-java-server> <commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version> + <commons-beanutils-version>1.8.3</commons-beanutils-version> <commons-codec-version>1.8</commons-codec-version> <commons-collections-version>3.2.1</commons-collections-version> <commons-compress-version>1.5</commons-compress-version> @@ -329,6 +331,7 @@ <plexus-container-default-version>1.0-alpha-48</plexus-container-default-version> <plexus-utils-version>1.5.6</plexus-utils-version> <pojosr-version>0.2.1</pojosr-version> + <powermock-version>1.5.1</powermock-version> <protobuf-java-bundle-version>2.3.0_3</protobuf-java-bundle-version> <protobuf-version>2.3.0</protobuf-version> <qpid-bundle-version>0.22_1</qpid-bundle-version>
