Repository: servicemix Updated Branches: refs/heads/master 532cfb48c -> 6f61273c6
SM-2535: Upgrade to Apache Camel 2.15.2 Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/d0651088 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d0651088 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d0651088 Branch: refs/heads/master Commit: d0651088d6e1ce1073a47de86eeac1d6b6d100d4 Parents: 532cfb4 Author: Krzysztof Sobkowiak <[email protected]> Authored: Tue May 5 21:50:04 2015 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Tue May 5 21:50:04 2015 +0200 ---------------------------------------------------------------------- assembly/src/main/filtered-resources/examples.xml | 6 +++--- parent/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/d0651088/assembly/src/main/filtered-resources/examples.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/examples.xml b/assembly/src/main/filtered-resources/examples.xml index 5ec1730..a91514c 100644 --- a/assembly/src/main/filtered-resources/examples.xml +++ b/assembly/src/main/filtered-resources/examples.xml @@ -58,21 +58,21 @@ </feature> <feature name="examples-camel-sql-derby" version="${version}" resolver="(obr)"> <feature version="${camel.version}">camel-sql</feature> - <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.derby/${derby.bundle.version}</bundle> <bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-derby/${version}</bundle> <bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${version}</bundle> </feature> <feature name="examples-camel-sql-pgsql" version="${version}" resolver="(obr)"> <feature version="${camel.version}">camel-sql</feature> - <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">wrap:mvn:postgresql/postgresql/${postgresql.version}.jdbc4</bundle> <bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-pgsql/${version}</bundle> <bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${version}</bundle> </feature> <feature name="examples-camel-sql-h2" version="${version}" resolver="(obr)"> <feature version="${camel.version}">camel-sql</feature> - <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.osgi/org.osgi.compendium/${osgi.version}</bundle> <bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle> <bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-h2/${version}</bundle> http://git-wip-us.apache.org/repos/asf/servicemix/blob/d0651088/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index dcc8791..2b16ed3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -39,7 +39,7 @@ <properties> <activemq.version>5.11.1</activemq.version> <activiti.version>5.17.0</activiti.version> - <camel.version>2.15.1</camel.version> + <camel.version>2.15.2</camel.version> <cxf.version>3.0.4</cxf.version> <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version> http://git-wip-us.apache.org/repos/asf/servicemix/blob/d0651088/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index db6dc64..e549f6a 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ <!-- ServiceMix Bundles --> <commons-codec.bundle.version>1.10</commons-codec.bundle.version> - <commons-dbcp.bundle.version>1.4_3</commons-dbcp.bundle.version> + <commons-dbcp.version>1.4</commons-dbcp.version> <commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version> <commons-io.version>2.4</commons-io.version> <derby.bundle.version>10.11.1.1_1</derby.bundle.version> @@ -135,7 +135,7 @@ <pax.exam.version>4.5.0</pax.exam.version> <pax.url.version>2.3.0</pax.url.version> <postgresql.version>9.1-901</postgresql.version> - <slf4j.version>1.7.10</slf4j.version> + <slf4j.version>1.7.12</slf4j.version> <spring.version>3.2.11.RELEASE_1</spring.version> </properties>
