You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/05/27 10:30:34 UTC
[5/8] git commit: CAMEL-4817 move the version properties into
parent/pom.xml
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/2cc566cc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2cc566cc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2cc566cc
Branch: refs/heads/master
Commit: 2cc566cc2bc671401212e345dbc367a76b3ae480
Parents: e32e10b
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Nov 19 16:17:46 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue May 27 16:11:48 2014 +0800
----------------------------------------------------------------------
components/camel-gora/pom.xml | 56 +++++++++++++++-----------------------
parent/pom.xml | 2 ++
2 files changed, 24 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2cc566cc/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/2cc566cc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c19b6d2..c2c2c98 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -42,6 +42,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</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>
@@ -330,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-version>2.5.0</protobuf-version>
<qpid-bundle-version>0.26_1</qpid-bundle-version>
<qpid-version>0.26</qpid-version>