You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/12/16 21:47:26 UTC
[01/12] camel git commit: Fixed Karaf feature not working
Repository: camel
Updated Branches:
refs/heads/master 190c893c2 -> 490951460
Fixed Karaf feature not working
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/765b581b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/765b581b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/765b581b
Branch: refs/heads/master
Commit: 765b581bebc0efdb3de29ca4bd66631b774050c0
Parents: efc4cf9
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 22:06:51 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:07:03 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/karaf/features/pom.xml | 5 ++---
platforms/karaf/features/src/main/resources/features.xml | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/765b581b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b36a134..c3b5c88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -656,6 +656,7 @@
<yammer-metrics-version>2.2.0</yammer-metrics-version>
<zjsonpatch-version>0.2.3</zjsonpatch-version>
<zookeeper-version>3.4.9</zookeeper-version>
+ <zookeeper-guava-version>16.0</zookeeper-guava-version>
<zxing-version>3.3.0</zxing-version>
<zxing-bundle-version>3.3.0_1</zxing-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/765b581b/platforms/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 73251a9..785e96f7 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -184,8 +184,7 @@
<!-- camel-ignite requires to install apache ignite first -->
<!-- camel-guice does not work in OSGi currently -->
<!-- camel-leveldb uses some wrap magic to install which validator fails but it works -->
- <!-- camel-zipkin needs an OSGi bundle -->
- <feature>camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb|zipkin))*</feature>
+ <feature>camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb))*</feature>
</features>
<configuration>file://${project.build.directory}/classes/config.properties</configuration>
</configuration>
@@ -202,7 +201,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
- <version>2.8</version>
+ <version>2.10</version>
</dependency>
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/765b581b/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 64cebb6..e832155 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2002,6 +2002,10 @@
<feature name='camel-zookeeper' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.curator/curator-framework/${curator-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.curator/curator-client/${curator-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.curator/curator-recipes/${curator-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${zookeeper-guava-version}</bundle>
<bundle>mvn:org.apache.camel/camel-zookeeper/${project.version}</bundle>
</feature>
[06/12] camel git commit: CAMEL-9945: Upgrade to Jetty 9.3
Posted by da...@apache.org.
CAMEL-9945: Upgrade to Jetty 9.3
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/28ed8432
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/28ed8432
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/28ed8432
Branch: refs/heads/master
Commit: 28ed8432b8f23740da9e461cda04357a84d9c31f
Parents: d2b702d
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 20:15:59 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:07:03 2016 +0100
----------------------------------------------------------------------
...entClientConfigSslContextParametersTest.java | 2 ++
.../AhcProduceSSLContextParametersGetTest.java | 2 ++
.../component/jetty9/JettyHttpComponent9.java | 34 --------------------
3 files changed, 4 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/28ed8432/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
index cce907c..5b99635 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
@@ -17,7 +17,9 @@
package org.apache.camel.component.ahc;
import org.apache.camel.util.jsse.SSLContextParameters;
+import org.junit.Ignore;
+@Ignore("TODO: Does not work with Jetty 9.3.x")
public class AhcComponentClientConfigSslContextParametersTest extends AhcComponentClientConfigTest {
public void configureComponent() {
http://git-wip-us.apache.org/repos/asf/camel/blob/28ed8432/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
index 1e31b83..624e60e 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.camel.component.ahc;
+import org.junit.Ignore;
+@Ignore("TODO: Does not work with Jetty 9.3.x")
public class AhcProduceSSLContextParametersGetTest extends AhcProduceGetTest {
protected String getTestServerEndpointUri() {
http://git-wip-us.apache.org/repos/asf/camel/blob/28ed8432/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
index 159da1f..5ba4d02 100644
--- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
+++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
@@ -30,7 +30,6 @@ import org.apache.camel.util.ObjectHelper;
import org.eclipse.jetty.client.HttpClientTransport;
import org.eclipse.jetty.server.AbstractConnector;
import org.eclipse.jetty.server.ConnectionFactory;
-import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.ForwardedRequestCustomizer;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
@@ -48,27 +47,6 @@ public class JettyHttpComponent9 extends JettyHttpComponent {
return new JettyHttpEndpoint9(this, endpointUri.toString(), httpUri);
}
- protected Connector getSslSocketConnector(Server server, JettyHttpEndpoint endpoint) {
- Connector answer = null;
- /*
- if (sslSocketConnectors != null) {
- SslContextFactory con = sslSocketConnectors.get(endpoint.getPort());
- if (con != null) {
- SslConnectionFactory sslConnectionFactory = new SslConnectionFactory(con, null);
- @SuppressWarnings("resource")
- ServerConnector sc = new ServerConnector(server, sslConnectionFactory);
- sc.setPort(endpoint.getPort());
- sc.setHost(endpoint.getHttpUri().getHost());
- answer = sc;
- }
- }
- */
- if (answer == null) {
- answer = createConnector(server, endpoint);
- }
- return answer;
- }
-
protected AbstractConnector createConnectorJettyInternal(Server server,
JettyHttpEndpoint endpoint,
SslContextFactory sslcf) {
@@ -113,18 +91,6 @@ public class JettyHttpComponent9 extends JettyHttpComponent {
if (host != null) {
result.setHost(host);
}
- /*
- if (getSocketConnectorProperties() != null && !"https".equals(endpoint.getProtocol())) {
- // must copy the map otherwise it will be deleted
- Map<String, Object> properties = new HashMap<String, Object>(getSocketConnectorProperties());
- IntrospectionSupport.setProperties(httpConfig, properties);
- if (properties.size() > 0) {
- throw new IllegalArgumentException("There are " + properties.size()
- + " parameters that couldn't be set on the SocketConnector."
- + " Check the uri if the parameters are spelt correctly and that they are properties of the SelectChannelConnector."
- + " Unknown parameters=[" + properties + "]");
- }
- } else*/
if (getSslSocketConnectorProperties() != null && "https".equals(endpoint.getProtocol())) {
// must copy the map otherwise it will be deleted
Map<String, Object> properties = new HashMap<String, Object>(getSslSocketConnectorProperties());
[03/12] camel git commit: Fixed Karaf feature not working
Posted by da...@apache.org.
Fixed Karaf feature not working
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e88bd99a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e88bd99a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e88bd99a
Branch: refs/heads/master
Commit: e88bd99a524068f4724258ff43035aed59912117
Parents: 9ad6806
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 20:54:55 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:07:03 2016 +0100
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e88bd99a/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 be0c115..206fde0 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -666,7 +666,9 @@
<bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client-java6/${google-api-client-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client-jetty/${google-api-client-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle>mvn:org.apache.camel/camel-google-pubsub/${project.version}</bundle>
</feature>
[11/12] camel git commit: Fix more karaf validate features
Posted by da...@apache.org.
Fix more karaf validate features
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4ffcc303
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ffcc303
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ffcc303
Branch: refs/heads/master
Commit: 4ffcc30339eed0b2f100cf8aff8b7a8d04a7ae14
Parents: c72ccec
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 22:42:08 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:42:08 2016 +0100
----------------------------------------------------------------------
platforms/karaf/features/pom.xml | 3 ++-
platforms/karaf/features/src/main/resources/config.properties | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4ffcc303/platforms/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 785e96f7..dc41ce7 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -184,7 +184,8 @@
<!-- camel-ignite requires to install apache ignite first -->
<!-- camel-guice does not work in OSGi currently -->
<!-- camel-leveldb uses some wrap magic to install which validator fails but it works -->
- <feature>camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb))*</feature>
+ <!-- camel-spring-dm cannot be validated -->
+ <feature>camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb|spring-dm))*</feature>
</features>
<configuration>file://${project.build.directory}/classes/config.properties</configuration>
</configuration>
http://git-wip-us.apache.org/repos/asf/camel/blob/4ffcc303/platforms/karaf/features/src/main/resources/config.properties
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/config.properties b/platforms/karaf/features/src/main/resources/config.properties
index 7a78ebc..a9563c3 100755
--- a/platforms/karaf/features/src/main/resources/config.properties
+++ b/platforms/karaf/features/src/main/resources/config.properties
@@ -407,6 +407,7 @@ jre-1.7= \
sun.misc
jre-1.8= \
+ com.sun.nio.file, \
com.sun.tools.xjc, \
javax.accessibility, \
javax.activation;version="1.1", \
@@ -567,4 +568,6 @@ jre-1.8= \
org.xml.sax, \
org.xml.sax.ext, \
org.xml.sax.helpers, \
- sun.misc
+ sun.misc, \
+ sun.nio.ch, \
+ sun.reflect
[09/12] camel git commit: CAMEL-9945: camel-ahc requires jetty 9.2
for testing
Posted by da...@apache.org.
CAMEL-9945: camel-ahc requires jetty 9.2 for testing
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9ad68066
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9ad68066
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9ad68066
Branch: refs/heads/master
Commit: 9ad6806672f69651bfa6cf7563b2c7383e2f9a7c
Parents: 28ed843
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 20:22:59 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:07:03 2016 +0100
----------------------------------------------------------------------
components/camel-ahc/pom.xml | 78 +++++++++++++++++++-
...entClientConfigSslContextParametersTest.java | 2 -
.../AhcProduceSSLContextParametersGetTest.java | 3 -
parent/pom.xml | 1 +
4 files changed, 78 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9ad68066/components/camel-ahc/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index b0e4a52..0398ad3 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -70,7 +71,82 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-jetty9</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
+ <!-- requires jetty 9.2 for testing -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty92-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty92-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty92-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <version>${jetty92-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jetty92-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ <version>${jetty92-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty92-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/camel/blob/9ad68066/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
index 5b99635..cce907c 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
@@ -17,9 +17,7 @@
package org.apache.camel.component.ahc;
import org.apache.camel.util.jsse.SSLContextParameters;
-import org.junit.Ignore;
-@Ignore("TODO: Does not work with Jetty 9.3.x")
public class AhcComponentClientConfigSslContextParametersTest extends AhcComponentClientConfigTest {
public void configureComponent() {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ad68066/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
index 624e60e..a5ed453 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.ahc;
-import org.junit.Ignore;
-
-@Ignore("TODO: Does not work with Jetty 9.3.x")
public class AhcProduceSSLContextParametersGetTest extends AhcProduceGetTest {
protected String getTestServerEndpointUri() {
http://git-wip-us.apache.org/repos/asf/camel/blob/9ad68066/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index addf472..a88b632 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -325,6 +325,7 @@
<jedis-client-bundle-version>2.8.1_1</jedis-client-bundle-version>
<jersey-version>2.11</jersey-version>
<jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
+ <jetty92-version>9.2.19.v20160908</jetty92-version>
<jetty9-version>9.3.14.v20161028</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
[12/12] camel git commit: camel-test-karaf feature cannot install
Posted by da...@apache.org.
camel-test-karaf feature cannot install
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/49095146
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/49095146
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/49095146
Branch: refs/heads/master
Commit: 4909514603d7fc9892f07b109d442dfc57c68063
Parents: 4ffcc30
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 22:45:06 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:45:06 2016 +0100
----------------------------------------------------------------------
components/camel-test-karaf/pom.xml | 8 --------
platforms/karaf/features/src/main/resources/features.xml | 3 ++-
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/49095146/components/camel-test-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-karaf/pom.xml b/components/camel-test-karaf/pom.xml
index 83abab2..ca6f649 100644
--- a/components/camel-test-karaf/pom.xml
+++ b/components/camel-test-karaf/pom.xml
@@ -217,14 +217,6 @@
</build>
</profile>
- <!-- test with older karaf 3.x -->
- <profile>
- <id>karaf3</id>
- <properties>
- <karf-test-version>${karaf3-version}</karf-test-version>
- </properties>
- </profile>
-
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/49095146/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 ffbb5fa..ab63b73 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1839,12 +1839,13 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle>
</feature>
+ <!-- TODO: this feature does not work
<feature name='camel-test-karaf' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-test</feature>
<bundle>mvn:biz.aQute.bnd/biz.aQute.bndlib/${bndlib-version}</bundle>
<bundle>mvn:org.ops4j.pax.tinybundles/tinybundles/${tinybundles-version}</bundle>
<bundle>mvn:org.apache.camel/camel-test-karaf/${project.version}</bundle>
- </feature>
+ </feature> -->
<feature name='camel-test-spring' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-spring</feature>
<feature version='${spring-version-range}'>spring-test</feature>
[08/12] camel git commit: Upgrade AHC
Posted by da...@apache.org.
Upgrade AHC
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d2b702d3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d2b702d3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d2b702d3
Branch: refs/heads/master
Commit: d2b702d3f5756b3b144703cc763507aff18afdc0
Parents: b1d38d5
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 20:08:11 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:07:03 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d2b702d3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b50a049..addf472 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,7 @@
<!-- Note that activemq dependency is only used for testing! -->
<activemq-version>5.14.2</activemq-version>
<aether-version>1.0.2.v20150114</aether-version>
- <ahc-version>2.0.15</ahc-version>
+ <ahc-version>2.0.24</ahc-version>
<ant-bundle-version>1.7.0_6</ant-bundle-version>
<antlr-bundle-version>3.5.2_1</antlr-bundle-version>
<antlr-runtime-bundle-version>3.5.2_1</antlr-runtime-bundle-version>
[02/12] camel git commit: Upgrade netty 4.0
Posted by da...@apache.org.
Upgrade netty 4.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe9ffc26
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe9ffc26
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe9ffc26
Branch: refs/heads/master
Commit: fe9ffc260d7532eaf8e7a4287db0728f6b174169
Parents: e88bd99
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 21:00:37 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:07:03 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fe9ffc26/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a88b632..b36a134 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -452,7 +452,7 @@
<neethi-bundle-version>3.0.1</neethi-bundle-version>
<netty3-version>3.10.6.Final</netty3-version>
<netty-version>4.1.6.Final</netty-version>
- <netty40-version>4.0.41.Final</netty40-version>
+ <netty40-version>4.0.42.Final</netty40-version>
<noggit-bundle-version>0.5_1</noggit-bundle-version>
<!-- should be in-sync with deltaspike -->
<openwebbeans1-version>1.2.7</openwebbeans1-version>
[10/12] camel git commit: Fixed camel-ahc feature
Posted by da...@apache.org.
Fixed camel-ahc feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c72ccecb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c72ccecb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c72ccecb
Branch: refs/heads/master
Commit: c72ccecb137f7dca585937ef246f94ea38726bcd
Parents: 765b581
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 22:34:02 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:34:02 2016 +0100
----------------------------------------------------------------------
.../karaf/features/src/main/resources/features.xml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c72ccecb/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 e832155..ffbb5fa 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -86,13 +86,14 @@
<feature name='camel-ahc' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>wrap:mvn:org.asynchttpclient/async-http-client/${ahc-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-common/${netty40-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty40-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-transport/${netty40-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-handler/${netty40-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty40-version}</bundle>
- <bundle dependency='true'>mvn:io.netty/netty-codec/${netty40-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.asynchttpclient/async-http-client/${ahc-version}$Export-Package=org.asynchttpclient.*;version=${ahc-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty40-version}</bundle>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
[04/12] camel git commit: CAMEL-9945 Upgrade to Jetty 9.3
Posted by da...@apache.org.
CAMEL-9945 Upgrade to Jetty 9.3
In Jetty 9.3 API signature changed from:
List<ProtocolHandler> getProtocolHandler()
to:
ProtocolHandlers getProtocolHandler()
This commit adds reflection bridge to keep the compatibility with Jetty
9.2 and Jetty 9.3.
Tested with Jetty versions: 9.2.19.v20160908, 9.3.8.v20160314,
9.4.0.v20161208
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35c2a64b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35c2a64b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35c2a64b
Branch: refs/heads/master
Commit: 35c2a64b44944dd794da5fd3535cb48f3e742a47
Parents: 190c893
Author: Zoran Regvart <zo...@regvart.com>
Authored: Fri Dec 16 15:36:02 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:07:03 2016 +0100
----------------------------------------------------------------------
.../salesforce/SalesforceHttpClient.java | 34 ++++++++++++++++++--
.../client/SalesforceSecurityHandler.java | 5 +++
2 files changed, 36 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/35c2a64b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
index 6bca3f8..95095aa 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.salesforce;
+import java.lang.reflect.Method;
import java.net.URI;
+import java.util.List;
import java.util.concurrent.TimeUnit;
+import static java.util.Optional.ofNullable;
import org.apache.camel.component.salesforce.internal.SalesforceSession;
import org.apache.camel.component.salesforce.internal.client.SalesforceHttpRequest;
@@ -26,7 +29,9 @@ import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.HttpClientTransport;
import org.eclipse.jetty.client.HttpConversation;
import org.eclipse.jetty.client.HttpRequest;
+import org.eclipse.jetty.client.ProtocolHandler;
import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
import org.eclipse.jetty.util.ssl.SslContextFactory;
/**
@@ -45,15 +50,34 @@ public class SalesforceHttpClient extends HttpClient {
private int maxContentLength = DEFAULT_MAX_CONTENT_LENGTH;
private long timeout = DEFAULT_TIMEOUT;
+ private final Method addSecuirtyHandlerMethod;
+
public SalesforceHttpClient() {
+ this(null);
}
public SalesforceHttpClient(SslContextFactory sslContextFactory) {
- super(sslContextFactory);
+ this(null, sslContextFactory);
}
public SalesforceHttpClient(HttpClientTransport transport, SslContextFactory sslContextFactory) {
- super(transport, sslContextFactory);
+ super(ofNullable(transport).orElse(new HttpClientTransportOverHTTP()), sslContextFactory);
+
+ // Jetty 9.3, as opposed to 9.2 the way to add ProtocolHandler to
+ // HttpClient changed in 9.2 HttpClient::getProtocolHandlers returned
+ // List<ProtocolHandler, in 9.3 onward it returns ProtocolHandlers
+ // instance, this enables us to work with user supplied Jetty (>= 9.2)
+ try {
+ final Class<?> getProtocolHandlersType = HttpClient.class.getMethod("getProtocolHandlers").getReturnType();
+ final boolean isJetty92 = List.class.equals(getProtocolHandlersType);
+ if (isJetty92) {
+ addSecuirtyHandlerMethod = List.class.getMethod("add", Object.class);
+ } else {
+ addSecuirtyHandlerMethod = getProtocolHandlersType.getMethod("put", ProtocolHandler.class);
+ }
+ } catch (NoSuchMethodException e) {
+ throw new IllegalStateException("Found no method of adding SalesforceSecurityHandler as ProtocolHandler to Jetty HttpClient. You need Jetty 9.2 or newer on the classpath.");
+ }
}
@Override
@@ -73,7 +97,11 @@ public class SalesforceHttpClient extends HttpClient {
if (getSession() == null) {
throw new IllegalStateException("Missing SalesforceSession in property session!");
}
- getProtocolHandlers().add(new SalesforceSecurityHandler(this));
+
+ // compensate for Jetty 9.2 vs 9.3 API change
+ final Object protocolHandlers = getProtocolHandlers();
+ addSecuirtyHandlerMethod.invoke(protocolHandlers, new SalesforceSecurityHandler(this));
+
super.doStart();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/35c2a64b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java
index fc11fe9..b9f1393 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java
@@ -274,4 +274,9 @@ public class SalesforceSecurityHandler implements ProtocolHandler {
response, responseFailure);
}
}
+
+ // no @Override annotation here to keep it compatible with Jetty 9.2, getName was added in 9.3
+ public String getName() {
+ return "CamelSalesforceSecurityHandler";
+ }
}
[05/12] camel git commit: CAMEL-9945: Upgrade to Jetty 9.3
Posted by da...@apache.org.
CAMEL-9945: Upgrade to Jetty 9.3
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b1d38d5d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b1d38d5d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b1d38d5d
Branch: refs/heads/master
Commit: b1d38d5d800d216dd822218c216d423cc24af481
Parents: 35c2a64
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 20:05:42 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:07:03 2016 +0100
----------------------------------------------------------------------
components/camel-cometd/pom.xml | 2 +-
components/camel-cxf/pom.xml | 99 +++++++++++++-------
components/camel-jetty9/pom.xml | 5 +
.../jetty/JettyHttpContentTypeTest.java | 2 +-
parent/pom.xml | 36 +------
5 files changed, 75 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/components/camel-cometd/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 35ff182..583f2ec 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -33,7 +33,7 @@
<camel.osgi.export.pkg>org.apache.camel.component.cometd.*</camel.osgi.export.pkg>
<camel.osgi.import.pkg>
!org.apache.camel.component.cometd.*,
- org.eclipse.jetty.util.ssl;version="[9,9.5)";resolution:=optional,
+ org.eclipse.jetty.util.ssl;version="[9.2,10)";resolution:=optional,
${camel.osgi.import.defaults},
*
</camel.osgi.import.pkg>
http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/components/camel-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 5cd9cc4..88ef884 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -113,9 +114,9 @@
<version>${cxf-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security-oauth</artifactId>
- <version>${cxf-version}</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-oauth</artifactId>
+ <version>${cxf-version}</version>
</dependency>
<dependency>
@@ -161,12 +162,12 @@
<artifactId>camel-core-xml</artifactId>
<scope>test</scope>
</dependency>
-
+
<!-- Try to test convert PayLoad into POJO -->
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxb</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jaxb</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -184,25 +185,25 @@
<!-- test for the cxf jms transport -->
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <scope>test</scope>
</dependency>
-
+
<!-- test for cxf failover feature -->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-features-clustering</artifactId>
- <version>${cxf-version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-clustering</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
+ <scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
@@ -215,8 +216,40 @@
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${cxf-version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jetty9</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${cxf-version}</version>
@@ -233,13 +266,13 @@
<artifactId>httpclient</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
@@ -262,7 +295,7 @@
<version>${cxf-version}</version>
<scope>test</scope>
</dependency>
-
+
<!-- this dependency is just for testing -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -270,7 +303,7 @@
<version>${cxf-version}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
@@ -307,7 +340,7 @@
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${cxf-version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
@@ -334,7 +367,7 @@
<configuration>
<childDelegation>false</childDelegation>
<forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
+ <reuseForks>true</reuseForks>
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
<reportFormat>brief</reportFormat>
<useFile>false</useFile>
@@ -381,7 +414,7 @@
<configuration>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<defaultOptions>
- <frontEnd>jaxws21</frontEnd>
+ <frontEnd>jaxws21</frontEnd>
</defaultOptions>
<wsdlOptions>
<wsdlOption>
http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/components/camel-jetty9/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index 7ccba3e..b040bc9 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -83,6 +83,11 @@
<artifactId>jetty-jmx</artifactId>
<version>${jetty9-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty9-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java
index 45fe7e5..2c0b982 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
public class JettyHttpContentTypeTest extends BaseJettyTest {
- private static final String CHARSET = "ISO-8859-1";
+ private static final String CHARSET = "iso-8859-1";
@Test
public void testContentType() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4182c70..b50a049 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -325,7 +325,7 @@
<jedis-client-bundle-version>2.8.1_1</jedis-client-bundle-version>
<jersey-version>2.11</jersey-version>
<jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
- <jetty9-version>9.2.19.v20160908</jetty9-version>
+ <jetty9-version>9.3.14.v20161028</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
@@ -677,7 +677,7 @@
org.apache.commons.httpclient.*;version="[3.1,4.0)",
org.apache.velocity.*;version="[1.6.2,2)",
org.apache.xmlbeans.*;version="[2.4,3)",
- org.eclipse.jetty.*;version="[8.0,10)",
+ org.eclipse.jetty.*;version="[9.2,10)",
com.thoughtworks.xstream.*;version="[1.4.7,2)",
org.antlr.stringtemplate.*;version="[3.0,4)",
org.ccil.cowan.tagsoup.*;version="[1.2,2)",
@@ -4955,38 +4955,6 @@
</profile>
<profile>
- <id>jetty9</id>
- <properties>
- <jetty-version>${jetty9-version}</jetty-version>
- <jetty-plugin-version>${jetty9-version}</jetty-plugin-version>
- <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
- </properties>
- </profile>
-
- <profile>
- <id>jdk1.7</id>
- <activation>
- <jdk>1.7</jdk>
- </activation>
-
- <!-- Update JAXB version here -->
- <properties>
- <jaxb-version>2.2.11</jaxb-version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>jdk1.8</id>
<activation>
<jdk>1.8</jdk>
[07/12] camel git commit: Sort A..Z
Posted by da...@apache.org.
Sort A..Z
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/efc4cf98
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/efc4cf98
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/efc4cf98
Branch: refs/heads/master
Commit: efc4cf984f5867745afe5a1d7a71774630d32838
Parents: fe9ffc2
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 21:05:37 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:07:03 2016 +0100
----------------------------------------------------------------------
.../karaf/features/src/main/resources/features.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/efc4cf98/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 206fde0..64cebb6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -846,6 +846,14 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ibatis/${project.version}</bundle>
</feature>
+ <feature name='camel-ical' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:backport-util-concurrent/backport-util-concurrent/${backport-util-concurrent-version}$Bundle-SymbolicName=backport-util-concurrent.backport-util-concurrent&Bundle-Version=${backport-util-concurrent-version}</bundle>
+ <bundle dependency='true'>mvn:org.mnode.ical4j/ical4j/${ical4j-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-ical/${project.version}</bundle>
+ </feature>
<feature name='camel-ignite' version='${project.version}' resolver='(obr)' start-level='50'>
<details>
<![CDATA[For performance reasons, Apache Ignite requires a JRE with the sun.nio.ch low-level package.
@@ -860,14 +868,6 @@
<feature version='${ignite-version-range}'>ignite-core</feature>
<bundle>mvn:org.apache.camel/camel-ignite/${project.version}</bundle>
</feature>
- <feature name='camel-ical' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
- <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle dependency='true'>wrap:mvn:backport-util-concurrent/backport-util-concurrent/${backport-util-concurrent-version}$Bundle-SymbolicName=backport-util-concurrent.backport-util-concurrent&Bundle-Version=${backport-util-concurrent-version}</bundle>
- <bundle dependency='true'>mvn:org.mnode.ical4j/ical4j/${ical4j-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-ical/${project.version}</bundle>
- </feature>
<feature name='camel-infinispan' version='${project.version}' resolver='(obr)' start-level='50'>
<details>The camel-infinispan feature requires Java 8</details>
<feature version='${project.version}'>camel-core</feature>