Repository: servicemix Updated Branches: refs/heads/servicemix-5.3.x 9e0d79573 -> 928aa0a24
SM-2404: Upgrade to Karaf 2.4.1 Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/928aa0a2 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/928aa0a2 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/928aa0a2 Branch: refs/heads/servicemix-5.3.x Commit: 928aa0a24dadafcdf1f20f39ae7901cbb9305345 Parents: 9e0d795 Author: Krzysztof Sobkowiak <[email protected]> Authored: Sat Jan 10 14:00:50 2015 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Sat Jan 10 14:00:50 2015 +0100 ---------------------------------------------------------------------- assembly/pom.xml | 7 +++++++ itests/pom.xml | 2 +- parent/pom.xml | 10 +++++----- pom.xml | 6 +++--- 4 files changed, 16 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/928aa0a2/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index e11f8c5..36ecaff 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -177,6 +177,13 @@ <inherited>false</inherited> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-http-lightweight</artifactId> + <version>2.6</version> + </dependency> + </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/servicemix/blob/928aa0a2/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index 951a629..bbc0503 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -63,7 +63,7 @@ <dependency> <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-service</artifactId> + <artifactId>pax-logging-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/servicemix/blob/928aa0a2/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2599d9d..e108c87 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -44,11 +44,11 @@ <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version> <felix.bundlerepository.version>2.0.2</felix.bundlerepository.version> - <karaf.version>2.4.0</karaf.version> - <aries.proxy.version>1.0.3</aries.proxy.version> + <karaf.version>2.4.1</karaf.version> + <aries.proxy.version>1.0.4</aries.proxy.version> <aries.util.version>1.1.0</aries.util.version> - <aries.blueprint.core.version>1.4.1</aries.blueprint.core.version> - <pax.logging.version>1.7.4</pax.logging.version> + <aries.blueprint.core.version>1.4.2</aries.blueprint.core.version> + <pax.logging.version>1.8.1</pax.logging.version> <akka.version>2.2.3</akka.version> <scala.version>2.10.2</scala.version> @@ -58,7 +58,7 @@ <mvel2.version>2.1.7.Final</mvel2.version> <mybatis.version>3.2.7</mybatis.version> <jodatime.bundle.version>2.3_1</jodatime.bundle.version> - <jpa.version>1.0.1</jpa.version> + <jpa.version>2.1.0</jpa.version> <servicemix.specs.version>2.4.0</servicemix.specs.version> http://git-wip-us.apache.org/repos/asf/servicemix/blob/928aa0a2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8378680..f5760d3 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ <lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version> <maven-idea-plugin.version>2.2.1</maven-idea-plugin.version> <cobertura-maven-plugin.version>2.2</cobertura-maven-plugin.version> - <maven-surefire-plugin.version>2.18</maven-surefire-plugin.version> + <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version> <maven-enforcer-plugin.version>1.3.1</maven-enforcer-plugin.version> <exec-maven-plugin.version>1.3.2</exec-maven-plugin.version> <build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version> @@ -131,10 +131,10 @@ <xml.api.version>2.11.0-20110622</xml.api.version> <xalan.version>2.7.1</xalan.version> <pax.exam.version>4.4.0</pax.exam.version> - <pax.url.version>2.2.0</pax.url.version> + <pax.url.version>2.3.0</pax.url.version> <postgresql.version>9.1-901</postgresql.version> <slf4j.version>1.7.5</slf4j.version> - <spring.version>3.2.9.RELEASE_1</spring.version> + <spring.version>3.2.11.RELEASE_1</spring.version> <wss4j.version>1.6.15</wss4j.version> </properties>
