You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2014/11/04 00:00:23 UTC
[1/2] git commit: SM-2368: Upgrade to Camel 2.14.0 and CXF 3.0.2
Repository: servicemix
Updated Branches:
refs/heads/master 12a2aeb74 -> 5eed29afc
SM-2368: Upgrade to Camel 2.14.0 and CXF 3.0.2
(Cherry-picked from the commit 76ed680ce48f141e4a6f2778a4882b51ef0edd33)
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/ba1ee8ea
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/ba1ee8ea
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/ba1ee8ea
Branch: refs/heads/master
Commit: ba1ee8ea5296621e28fed4bc6ff803b5af8c8b26
Parents: 12a2aeb
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Nov 3 22:11:04 2014 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Nov 3 23:09:42 2014 +0100
----------------------------------------------------------------------
.../src/main/filtered-resources/features.xml | 2 +-
.../src/main/filtered-resources/internal.xml | 2 +-
.../camel-cxf-rest-client/pom.xml | 2 +-
examples/cxf/cxf-jaxrs-blueprint/pom.xml | 2 +-
examples/cxf/cxf-jaxrs/pom.xml | 2 +-
examples/cxf/cxf-jaxws-blueprint/pom.xml | 2 +-
examples/cxf/cxf-ws-rm/pom.xml | 2 +-
examples/cxf/cxf-ws-security-blueprint/pom.xml | 7 +---
.../examples/cxf/ClientPasswordCallback.java | 3 +-
examples/cxf/cxf-ws-security-osgi/pom.xml | 7 +---
.../examples/cxf/ClientPasswordCallback.java | 4 +-
examples/cxf/cxf-ws-security-signature/pom.xml | 14 +++----
.../examples/cxf/ServerPasswordCallback.java | 4 +-
parent/pom.xml | 43 +++++++++-----------
pom.xml | 12 ++----
15 files changed, 45 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/assembly/src/main/filtered-resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
index 4d66aa2..d275462 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -69,7 +69,7 @@
<bundle>mvn:com.google.guava/guava/${google.guava.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core/${swagger.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs/${swagger.bundle.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs/${swagger.jaxrs.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jackson-module-scala/${jackson-module-scala.bundle.version}</bundle>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/assembly/src/main/filtered-resources/internal.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/internal.xml b/assembly/src/main/filtered-resources/internal.xml
index 7fe188b..71fdaa2 100644
--- a/assembly/src/main/filtered-resources/internal.xml
+++ b/assembly/src/main/filtered-resources/internal.xml
@@ -24,7 +24,7 @@
<!-- workaround before SM-2179 get addressed on CXF side-->
<feature name="jaxrs-api">
- <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-m10/${servicemix.specs.version}</bundle>
+ <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0/${servicemix.specs.version}</bundle>
</feature>
<!-- workaround for SM-2301 -->
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml b/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
index 5bd0054..b49836a 100644
--- a/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
+++ b/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.5</version>
+ <version>2.2.7</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/examples/cxf/cxf-jaxrs-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxrs-blueprint/pom.xml b/examples/cxf/cxf-jaxrs-blueprint/pom.xml
index 5c3aa7b..eedb74f 100644
--- a/examples/cxf/cxf-jaxrs-blueprint/pom.xml
+++ b/examples/cxf/cxf-jaxrs-blueprint/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
+ <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/examples/cxf/cxf-jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxrs/pom.xml b/examples/cxf/cxf-jaxrs/pom.xml
index 0d76aca..63e4e70 100644
--- a/examples/cxf/cxf-jaxrs/pom.xml
+++ b/examples/cxf/cxf-jaxrs/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
+ <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/examples/cxf/cxf-jaxws-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxws-blueprint/pom.xml b/examples/cxf/cxf-jaxws-blueprint/pom.xml
index 2d2da33..42fcec7 100644
--- a/examples/cxf/cxf-jaxws-blueprint/pom.xml
+++ b/examples/cxf/cxf-jaxws-blueprint/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
+ <artifactId>cxf-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/examples/cxf/cxf-ws-rm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-rm/pom.xml b/examples/cxf/cxf-ws-rm/pom.xml
index bd13f0c..34a2928 100644
--- a/examples/cxf/cxf-ws-rm/pom.xml
+++ b/examples/cxf/cxf-ws-rm/pom.xml
@@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
+ <artifactId>cxf-core</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/examples/cxf/cxf-ws-security-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-blueprint/pom.xml b/examples/cxf/cxf-ws-security-blueprint/pom.xml
index a567bcd..8eae3e7 100644
--- a/examples/cxf/cxf-ws-security-blueprint/pom.xml
+++ b/examples/cxf/cxf-ws-security-blueprint/pom.xml
@@ -37,10 +37,6 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
@@ -70,8 +66,7 @@
org.osgi.service.blueprint,
org.apache.cxf.ws.security.wss4j,
javax.security.auth.callback,
- org.apache.ws.security,
- org.apache.ws.security.processor,
+ org.apache.wss4j.common.ext,
org.apache.cxf.interceptor.security,
org.apache.cxf.transport.http,
org.apache.cxf, org.apache.cxf.endpoint, org.apache.cxf.frontend, org.apache.cxf.interceptor, org.apache.cxf.jaxws, org.apache.cxf.message, org.apache.cxf.phase
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java b/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
index f2687af..f52ea0a 100644
--- a/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
+++ b/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
@@ -19,11 +19,12 @@
package org.apache.servicemix.examples.cxf;
+import org.apache.wss4j.common.ext.WSPasswordCallback;
+
import java.io.IOException;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
public class ClientPasswordCallback implements CallbackHandler {
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/examples/cxf/cxf-ws-security-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-osgi/pom.xml b/examples/cxf/cxf-ws-security-osgi/pom.xml
index 2e21172..71ad79a 100644
--- a/examples/cxf/cxf-ws-security-osgi/pom.xml
+++ b/examples/cxf/cxf-ws-security-osgi/pom.xml
@@ -37,10 +37,6 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
@@ -70,8 +66,7 @@
org.apache.cxf.ws.security.wss4j,
org.springframework.beans.factory.config,
javax.security.auth.callback,
- org.apache.ws.security,
- org.apache.ws.security.processor,
+ org.apache.wss4j.common.ext,
org.apache.cxf.interceptor.security,
org.apache.cxf.transport.http,
org.apache.cxf, org.apache.cxf.endpoint, org.apache.cxf.frontend, org.apache.cxf.interceptor, org.apache.cxf.jaxws, org.apache.cxf.message, org.apache.cxf.phase
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java b/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
index f2687af..2733689 100755
--- a/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
+++ b/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
@@ -19,11 +19,13 @@
package org.apache.servicemix.examples.cxf;
+import org.apache.wss4j.common.ext.WSPasswordCallback;
+
import java.io.IOException;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
+
public class ClientPasswordCallback implements CallbackHandler {
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/examples/cxf/cxf-ws-security-signature/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-signature/pom.xml b/examples/cxf/cxf-ws-security-signature/pom.xml
index ed44b3a..f849fca 100644
--- a/examples/cxf/cxf-ws-security-signature/pom.xml
+++ b/examples/cxf/cxf-ws-security-signature/pom.xml
@@ -38,13 +38,13 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -61,8 +61,6 @@
javax.xml.bind.annotation,
javax.xml.namespace,
javax.wsdl,
- META-INF.cxf,
- META-INF.cxf.osgi,
org.apache.cxf.bus,
org.apache.cxf.bus.spring,
org.apache.cxf.bus.resource,
@@ -72,13 +70,11 @@
org.apache.cxf.ws.security.wss4j,
org.springframework.beans.factory.config,
javax.security.auth.callback,
- org.apache.ws.security,
- org.apache.ws.security.processor,
+ org.apache.wss4j.common.ext,
org.apache.cxf.binding.soap.saaj,
org.apache.commons.io
</Import-Package>
<Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
- <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java b/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
index 8aab9b9..956952b 100755
--- a/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
+++ b/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/ServerPasswordCallback.java
@@ -19,11 +19,13 @@
package org.apache.servicemix.examples.cxf;
+import org.apache.wss4j.common.ext.WSPasswordCallback;
+
import java.io.IOException;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
+
public class ServerPasswordCallback implements CallbackHandler {
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 27fa7be..e6315e1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -39,8 +39,8 @@
<properties>
<activemq.version>5.10.0</activemq.version>
<activiti.version>5.15.1</activiti.version>
- <camel.version>2.13.2</camel.version>
- <cxf.version>2.7.11</cxf.version>
+ <camel.version>2.14.0</camel.version>
+ <cxf.version>3.0.2</cxf.version>
<felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
<karaf.version>3.0.2-SNAPSHOT</karaf.version>
@@ -155,17 +155,7 @@
<!-- Apache CXF -->
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common</artifactId>
+ <artifactId>cxf-core</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
@@ -200,11 +190,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-core</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-aegis</artifactId>
<version>${cxf.version}</version>
</dependency>
@@ -240,6 +225,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-clustering</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-javascript</artifactId>
<version>${cxf.version}</version>
</dependency>
@@ -250,6 +240,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
@@ -290,6 +285,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-oauth</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
<version>${cxf.version}</version>
</dependency>
@@ -359,18 +359,13 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xerces-xsd-validation</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.cxf.services.wsn</groupId>
<artifactId>cxf-services-wsn-core</artifactId>
<version>${cxf-version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
+ <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ba1ee8ea/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d18d070..3e803f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,8 +85,9 @@
<jaxb.api.version>2.2</jaxb.api.version>
<osgi.version>5.0.0</osgi.version>
<scala.bundle.version>2.10.2_1</scala.bundle.version>
- <wsdl4j.bundle.version>1.6.2_6</wsdl4j.bundle.version>
- <swagger.bundle.version>1.3.0_1</swagger.bundle.version>
+ <wsdl4j.bundle.version>1.6.3_1</wsdl4j.bundle.version>
+ <swagger.bundle.version>1.3.2_1</swagger.bundle.version>
+ <swagger.jaxrs.bundle.version>1.3.2_2</swagger.jaxrs.bundle.version>
<javassist.bundle.version>3.12.1.GA_2</javassist.bundle.version>
<reflections.bundle.version>0.9.8_1</reflections.bundle.version>
<json4s.bundle.version>3.2.4_1</json4s.bundle.version>
@@ -126,7 +127,7 @@
<h2.version>1.3.170</h2.version>
<xerces.version>2.11.0</xerces.version>
<xml.api.version>2.11.0-20110622</xml.api.version>
- <xalan.version>2.7.1</xalan.version>
+ <xalan.version>2.7.2</xalan.version>
<pax.exam.version>4.2.0</pax.exam.version>
<pax.url.version>2.2.0</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
@@ -191,11 +192,6 @@
<version>${xalan.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>${wss4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>${pax.url.version}</version>
[2/2] git commit: SM-2321: Upgrade to Karaf 3.0.2
Posted by ks...@apache.org.
SM-2321: Upgrade to Karaf 3.0.2
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/5eed29af
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/5eed29af
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/5eed29af
Branch: refs/heads/master
Commit: 5eed29afc4fbf49f094b9026e5f2b5c5cb46b60f
Parents: ba1ee8e
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Nov 3 23:50:32 2014 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Nov 3 23:50:32 2014 +0100
----------------------------------------------------------------------
.../src/main/resources/etc/custom.properties | 3 +-
.../resources/etc/org.ops4j.pax.url.mvn.cfg | 32 +++++++++++---------
.../src/main/resources/etc/users.properties | 2 +-
.../itests/IntegrationTestConfigurations.scala | 2 +-
parent/pom.xml | 2 +-
pom.xml | 2 +-
6 files changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/assembly/src/main/resources/etc/custom.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/custom.properties b/assembly/src/main/resources/etc/custom.properties
index eff5579..53965f1 100644
--- a/assembly/src/main/resources/etc/custom.properties
+++ b/assembly/src/main/resources/etc/custom.properties
@@ -115,7 +115,8 @@ org.osgi.framework.system.packages.extra = \
org.apache.xerces.xni.grammars; version="2.11.0", \
org.apache.xerces.impl.xs; version="2.11.0", \
org.apache.xerces.impl.validation; version="2.11.0", \
- org.apache.xml.serialize; version="2.11.0"
+ org.apache.xml.serialize; version="2.11.0", \
+ sun.misc
#
# Delay console startup until bundles have been properly started
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
index f4ebff5..54ee0ae 100644
--- a/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ b/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -57,12 +57,6 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false
# org.ops4j.pax.url.mvn.proxySupport=false
#
-# Disable aether support by default. This ensure that the defaultRepositories
-# below will be used
-#
-org.ops4j.pax.url.mvn.disableAether=true
-
-#
# Comma separated list of repositories scanned when resolving an artifact.
# Those repositories will be checked before iterating through the
# below list of repositories and even before the local repository
@@ -73,17 +67,24 @@ org.ops4j.pax.url.mvn.disableAether=true
#
# The following property value will add the system folder as a repo.
#
-org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots@id=karaf.${karaf.default.repository},\
- file:${karaf.home}/local-repo@snapshots@id=karaf.local-repo
+org.ops4j.pax.url.mvn.defaultRepositories=\
+ file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots,\
+ file:${karaf.data}/kar@id=kar.repository@multi@snapshots
+ file:${karaf.home}/local-repo@snapshots@id=system.local-repo
+
+# Use the default local repo (e.g.~/.m2/repository) as a "remote" repo
+#org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false
#
# Comma separated list of repositories scanned when resolving an artifact.
# The default list includes the following repositories:
-# http://repo1.maven.org/maven2
-# http://repository.apache.org/content/groups/snapshots-group
-# http://svn.apache.org/repos/asf/servicemix/m2-repo
-# http://repository.springsource.com/maven/bundles/release
-# http://repository.springsource.com/maven/bundles/external
+# http://repo1.maven.org/maven2@id=maven.central.repo, \
+# http://repository.springsource.com/maven/bundles/release@id=springsource.release.repo, \
+# http://repository.springsource.com/maven/bundles/external@id=springsource.external.repo, \
+# http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \
+# http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \
+# http://zodiac.springsource.com/maven/bundles/release@id=gemini, \
+# https://oss.sonatype.org/content/repositories/releases/@id=maven.sonatype.repo
# To add repositories to the default ones, prepend '+' to the list of repositories
# to add.
# A repository url can be appended with zero or more of the following flags:
@@ -93,9 +94,10 @@ org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.rep
#
org.ops4j.pax.url.mvn.repositories= \
http://repo1.maven.org/maven2@id=maven.central.repo, \
- http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \
- http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \
http://repository.springsource.com/maven/bundles/release@id=springsource.release.repo, \
http://repository.springsource.com/maven/bundles/external@id=springsource.external.repo, \
+ http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \
+ http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \
+ http://zodiac.springsource.com/maven/bundles/release@id=gemini, \
https://oss.sonatype.org/content/repositories/releases/@id=maven.sonatype.repo
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/assembly/src/main/resources/etc/users.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/users.properties b/assembly/src/main/resources/etc/users.properties
index e066450..ca4b482 100644
--- a/assembly/src/main/resources/etc/users.properties
+++ b/assembly/src/main/resources/etc/users.properties
@@ -30,7 +30,7 @@
# with the name "karaf".
#
smx = smx,_g_:admingroup
-_g_\:admingroup = group,admin,manager,viewer
+_g_\:admingroup = group,admin,manager,viewer,webconsole
# Workaround for SM-2267: sometimes, the webconsole configuration first hands out a ConnectionFactory
# that uses karaf/karaf as the credentials before picking up the settings in system.properties
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
----------------------------------------------------------------------
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
index 070046e..9681fbc 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
@@ -51,7 +51,7 @@ trait IntegrationTestConfigurations {
karafDistributionConfiguration().
frameworkUrl(
maven().groupId("org.apache.servicemix").artifactId(artifact).`type`("zip").versionAsInProject()).
- karafVersion("3.0.1").name("Apache ServiceMix (${name})").
+ karafVersion("3.0.2").name("Apache ServiceMix (${name})").
unpackDirectory(new File(s"target/pax-exam/${artifact}")).
useDeployFolder(false),
keepRuntimeFolder(),
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e6315e1..2acfedd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -43,7 +43,7 @@
<cxf.version>3.0.2</cxf.version>
<felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
- <karaf.version>3.0.2-SNAPSHOT</karaf.version>
+ <karaf.version>3.0.2</karaf.version>
<aries.proxy.version>1.0.3</aries.proxy.version>
<aries.util.version>1.1.0</aries.util.version>
<aries.blueprint.core.version>1.4.1</aries.blueprint.core.version>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3e803f2..72bbb76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
<pax.url.version>2.2.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>