camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1419455 - in /camel/branches/camel-2.10.x: ./ components/camel-hbase/pom.xml components/camel-hdfs/pom.xml parent/pom.xml platforms/karaf/features/pom.xml
Date Mon, 10 Dec 2012 13:44:18 GMT
Author: davsclaus
Date: Mon Dec 10 13:44:15 2012
New Revision: 1419455

URL: http://svn.apache.org/viewvc?rev=1419455&view=rev
Log:
CAMEL-5859: Aligned camel-hbase and camel-hdfs to use same versions of commons JARs

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/components/camel-hbase/pom.xml
    camel/branches/camel-2.10.x/components/camel-hdfs/pom.xml
    camel/branches/camel-2.10.x/parent/pom.xml
    camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1419415

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/components/camel-hbase/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hbase/pom.xml?rev=1419455&r1=1419454&r2=1419455&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-hbase/pom.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-hbase/pom.xml Mon Dec 10 13:44:15 2012
@@ -55,6 +55,71 @@
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-configuration</groupId>
+                    <artifactId>commons-configuration</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-lang</groupId>
+                    <artifactId>commons-lang</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-net</groupId>
+                    <artifactId>commons-net</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-core-asl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons-codec-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>${commons-collections-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>${commons-configuration-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>${commons-lang-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>${commons-net-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>${jackson-version}</version>
         </dependency>
 
         <!-- testing -->

Modified: camel/branches/camel-2.10.x/components/camel-hdfs/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hdfs/pom.xml?rev=1419455&r1=1419454&r2=1419455&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-hdfs/pom.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-hdfs/pom.xml Mon Dec 10 13:44:15 2012
@@ -53,6 +53,30 @@
                     <groupId>commons-codec</groupId>
                     <artifactId>commons-codec</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-configuration</groupId>
+                    <artifactId>commons-configuration</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-lang</groupId>
+                    <artifactId>commons-lang</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-net</groupId>
+                    <artifactId>commons-net</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-core-asl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -60,6 +84,36 @@
             <artifactId>commons-codec</artifactId>
             <version>${commons-codec-version}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>${commons-collections-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>${commons-configuration-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>${commons-lang-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>${commons-net-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
 
         <!-- testing -->
         <dependency>

Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1419455&r1=1419454&r2=1419455&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Mon Dec 10 13:44:15 2012
@@ -54,7 +54,11 @@
     <cometd-java-server>2.3.1</cometd-java-server>
     <commons-codec-version>1.6</commons-codec-version>
     <commons-collections-version>3.2.1</commons-collections-version>
+    <commons-configuration-version>1.8</commons-configuration-version>
     <commons-csv>1.0-r706899_3</commons-csv>
+    <commons-csv-bundle-version>1.0-r706900_3</commons-csv-bundle-version>
+    <commons-cli-version>1.2</commons-cli-version>
+    <commons-dbcp-bundle-version>1.4_3</commons-dbcp-bundle-version>
     <commons-dbcp-version>1.4</commons-dbcp-version>
     <commons-exec-version>1.0.1</commons-exec-version>
     <commons-io-version>1.4</commons-io-version>

Modified: camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml?rev=1419455&r1=1419454&r2=1419455&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.10.x/platforms/karaf/features/pom.xml Mon Dec 10 13:44:15 2012
@@ -45,7 +45,6 @@
       <cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
       <commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
       <commons-csv-version>1.0-r706900_3</commons-csv-version>
-      <commons-configuration-version>1.6</commons-configuration-version>
       <commons-daemon-version>1.0.5</commons-daemon-version>
       <commons-digester-version>2.1</commons-digester-version>
       <commons-httpclient-bundle-version>3.1_7</commons-httpclient-bundle-version>



Mime
View raw message