Repository: servicemix Updated Branches: refs/heads/servicemix-5.5.x 07d353b71 -> e79f3f547
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/e79f3f54 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/e79f3f54 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/e79f3f54 Branch: refs/heads/servicemix-5.5.x Commit: e79f3f54729793139c26f2b129471270f78156b5 Parents: 17dfbd3 Author: Krzysztof Sobkowiak <[email protected]> Authored: Sat May 16 20:49:55 2015 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Sat May 16 20:59:27 2015 +0200 ---------------------------------------------------------------------- assembly/src/main/filtered-resources/examples.xml | 6 +++--- parent/pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/e79f3f54/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 a31559e..bfa8d50 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/e79f3f54/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index cdd08ab..3bac0de 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -45,9 +45,9 @@ <aries.blueprint.core.version>1.4.3</aries.blueprint.core.version> <aries.proxy.version>1.0.4</aries.proxy.version> <aries.util.version>1.1.0</aries.util.version> - <camel.version>2.15.1</camel.version> + <camel.version>2.15.2</camel.version> <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-fileupload.version>1.3.1</commons-fileupload.version> <commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version> <commons-io.version>2.4</commons-io.version> @@ -86,7 +86,7 @@ <scala-xml.version>1.0.4</scala-xml.version> <scala.version>2.11.5</scala.version> <servicemix.specs.version>2.5.0</servicemix.specs.version> - <slf4j.version>1.7.10</slf4j.version> + <slf4j.version>1.7.12</slf4j.version> <spring.version>3.2.11.RELEASE_1</spring.version> <swagger.bundle.version>1.3.12_1</swagger.bundle.version> <swagger.version>1.3.12</swagger.version>
