Author: cmueller
Date: Wed Jan 11 23:19:34 2012
New Revision: 1230321
URL: http://svn.apache.org/viewvc?rev=1230321&view=rev
Log:
CAMEL-4767: Upgrade commons-codec:commons-codec:1.4 ->
commons-codec:commons-codec:1.6
Modified:
camel/trunk/components/camel-atom/pom.xml
camel/trunk/components/camel-aws/pom.xml
camel/trunk/components/camel-crypto/pom.xml
camel/trunk/components/camel-hdfs/pom.xml
camel/trunk/components/camel-http/pom.xml
camel/trunk/components/camel-solr/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-atom/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/pom.xml?rev=1230321&r1=1230320&r2=1230321&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/pom.xml (original)
+++ camel/trunk/components/camel-atom/pom.xml Wed Jan 11 23:19:34 2012
@@ -63,9 +63,18 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-parser</artifactId>
<version>${abdera-version}</version>
Modified: camel/trunk/components/camel-aws/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/pom.xml?rev=1230321&r1=1230320&r2=1230321&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/pom.xml (original)
+++ camel/trunk/components/camel-aws/pom.xml Wed Jan 11 23:19:34 2012
@@ -88,7 +88,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec}</version>
+ <version>${commons-codec-version}</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified: camel/trunk/components/camel-crypto/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/pom.xml?rev=1230321&r1=1230320&r2=1230321&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/pom.xml (original)
+++ camel/trunk/components/camel-crypto/pom.xml Wed Jan 11 23:19:34 2012
@@ -52,7 +52,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec}</version>
+ <version>${commons-codec-version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
Modified: camel/trunk/components/camel-hdfs/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hdfs/pom.xml?rev=1230321&r1=1230320&r2=1230321&view=diff
==============================================================================
--- camel/trunk/components/camel-hdfs/pom.xml (original)
+++ camel/trunk/components/camel-hdfs/pom.xml Wed Jan 11 23:19:34 2012
@@ -48,6 +48,17 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoop-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/components/camel-http/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/pom.xml?rev=1230321&r1=1230320&r2=1230321&view=diff
==============================================================================
--- camel/trunk/components/camel-http/pom.xml (original)
+++ camel/trunk/components/camel-http/pom.xml Wed Jan 11 23:19:34 2012
@@ -50,6 +50,17 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${httpclient-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/components/camel-solr/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/pom.xml?rev=1230321&r1=1230320&r2=1230321&view=diff
==============================================================================
--- camel/trunk/components/camel-solr/pom.xml (original)
+++ camel/trunk/components/camel-solr/pom.xml Wed Jan 11 23:19:34 2012
@@ -44,7 +44,11 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1230321&r1=1230320&r2=1230321&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan 11 23:19:34 2012
@@ -46,7 +46,7 @@
<castor-bundle-version>1.3.1_2</castor-bundle-version>
<cometd-bayeux-version>6.1.11</cometd-bayeux-version>
<cometd-java-server>2.3.1</cometd-java-server>
- <commons-codec>1.4</commons-codec>
+ <commons-codec-version>1.6</commons-codec-version>
<commons-collections-version>3.2.1</commons-collections-version>
<commons-csv>1.0-r706899_3</commons-csv>
<commons-dbcp-version>1.4</commons-dbcp-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1230321&r1=1230320&r2=1230321&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Jan 11 23:19:34 2012
@@ -45,8 +45,6 @@
<cometd-java-server-bundle-version>2.3.1_1</cometd-java-server-bundle-version>
<commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version>
<commons-csv-version>1.0-r706899_3</commons-csv-version>
- <commons-codec-version>${commons-codec}</commons-codec-version>
- <commons-codec-bundle-version>1.3_3</commons-codec-bundle-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>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1230321&r1=1230320&r2=1230321&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed
Jan 11 23:19:34 2012
@@ -84,7 +84,7 @@
</feature>
<feature name='camel-crypto' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
+ <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle
dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcpg-jdk16/${bcpg-jdk16-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-crypto/${project.version}</bundle>
@@ -92,7 +92,7 @@
<feature name='camel-http' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
+ <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<!-- the jetty feature provides the geronimo-servlet_2.5_spec -->
<!-- TODO replace the jetty feature by a Karaf spec feature -->
<feature>jetty</feature>
@@ -174,13 +174,13 @@
<bundle
dependency='true'>mvn:org.apache.abdera/abdera-extensions-main/${abdera-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.abdera/abdera-i18n/${abdera-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.abdera/abdera-parser/${abdera-version}</bundle>
- <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
+ <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle>mvn:org.apache.camel/camel-atom/${project.version}</bundle>
</feature>
<feature name='camel-aws' version='${project.version}' resolver='(obr)'
start-level='50'>
<bundle
dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
- <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
+ <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
<bundle
dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aws-java-sdk/${aws-java-sdk-bundle-version}</bundle>
@@ -303,7 +303,7 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle
dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
- <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
+ <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
<bundle
dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle
dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-version}</bundle>
@@ -619,7 +619,7 @@
<feature name='camel-solr' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.solr-solrj/${solrj-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
+ <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-solr/${project.version}</bundle>
</feature>
