Repository: camel Updated Branches: refs/heads/camel-2.15.x 0493c54d2 -> 8b24c95be
[CAMEL-8658] Replace SMX version of commons-dbcp bundles with Apache bundles (cherry picked from commit 72b351287f44aac91c645c465747f823517e247e) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8b24c95b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8b24c95b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8b24c95b Branch: refs/heads/camel-2.15.x Commit: 8b24c95be69b580198729118f328084007429a73 Parents: 0493c54 Author: Grzegorz Grzybek <gr.grzy...@gmail.com> Authored: Fri Apr 17 13:59:36 2015 +0200 Committer: Grzegorz Grzybek <gr.grzy...@gmail.com> Committed: Fri Apr 17 14:00:19 2015 +0200 ---------------------------------------------------------------------- .../src/main/resources/features.xml | 2 +- .../camel-example-sql/src/main/resources/features.xml | 2 +- parent/pom.xml | 1 - platforms/karaf/features/src/main/resources/features.xml | 10 +++++----- 4 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8b24c95b/examples/camel-example-sql-blueprint/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-sql-blueprint/src/main/resources/features.xml b/examples/camel-example-sql-blueprint/src/main/resources/features.xml index e19231a..3850aa3 100644 --- a/examples/camel-example-sql-blueprint/src/main/resources/features.xml +++ b/examples/camel-example-sql-blueprint/src/main/resources/features.xml @@ -24,7 +24,7 @@ <feature version="${project.version}">camel-sql</feature> <bundle>mvn:org.apache.derby/derby/${derby-version}</bundle> <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle> + <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle> <bundle>mvn:org.apache.camel/camel-example-sql-blueprint/${project.version}</bundle> </feature> http://git-wip-us.apache.org/repos/asf/camel/blob/8b24c95b/examples/camel-example-sql/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-sql/src/main/resources/features.xml b/examples/camel-example-sql/src/main/resources/features.xml index d00926c..9515951 100644 --- a/examples/camel-example-sql/src/main/resources/features.xml +++ b/examples/camel-example-sql/src/main/resources/features.xml @@ -24,7 +24,7 @@ <feature version="${project.version}">camel-sql</feature> <bundle>mvn:org.apache.derby/derby/${derby-version}</bundle> <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle> + <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle> <bundle>mvn:org.apache.camel/camel-example-sql/${project.version}</bundle> </feature> http://git-wip-us.apache.org/repos/asf/camel/blob/8b24c95b/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0963624..3e8e727 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -102,7 +102,6 @@ <commons-csv-version>1.1</commons-csv-version> <commons-cli-version>1.2</commons-cli-version> <commons-daemon-version>1.0.15</commons-daemon-version> - <commons-dbcp-bundle-version>1.4_3</commons-dbcp-bundle-version> <commons-dbcp-version>1.4</commons-dbcp-version> <commons-digester-1x-version>1.8.1</commons-digester-1x-version> <commons-digester-version>2.1</commons-digester-version> http://git-wip-us.apache.org/repos/asf/camel/blob/8b24c95b/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 957c98a..8aad119 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -137,7 +137,7 @@ <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle> <feature version='${spring-version-range-karaf}'>spring-jdbc</feature> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle> + <bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle> <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa2-spec-version}</bundle> @@ -686,7 +686,7 @@ <feature>transaction</feature> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle> + <bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle> @@ -821,7 +821,7 @@ <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle> + <bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle> @@ -998,7 +998,7 @@ <feature version='${project.version}'>camel-spring</feature> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle> + <bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle> <bundle dependency='true'>mvn:org.mybatis/mybatis/${mybatis-version}</bundle> <bundle>mvn:org.apache.camel/camel-mybatis/${project.version}</bundle> @@ -1110,7 +1110,7 @@ </feature> <feature name='camel-quartz' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle> + <bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz-bundle-version}</bundle> <feature version='${project.version}'>camel-core</feature>
