camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [2/4] camel git commit: CAMEL-8637: Upgrade Jetty version to 9.x in Camel-CometD - Fixed Karaf feature
Date Thu, 21 Apr 2016 13:41:16 GMT
CAMEL-8637: Upgrade Jetty version to 9.x in Camel-CometD - Fixed Karaf feature


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0b641eeb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0b641eeb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0b641eeb

Branch: refs/heads/master
Commit: 0b641eeb92c3da756e6cae498cad64d7f294db23
Parents: 2a2505f
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Thu Apr 21 14:38:33 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Thu Apr 21 15:18:40 2016 +0200

----------------------------------------------------------------------
 components/camel-cometd/pom.xml                          | 5 ++---
 parent/pom.xml                                           | 2 +-
 platforms/karaf/features/src/main/resources/features.xml | 6 ++++--
 3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0b641eeb/components/camel-cometd/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 814e1c7..83b5c56 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -33,8 +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="[8,9)";resolution:=optional,
-            javax.servlet.*;version="${servlet-version-range}",
+            org.eclipse.jetty.util.ssl;version="[9,9.5)";resolution:=optional,
             ${camel.osgi.import.defaults},
             *
         </camel.osgi.import.pkg>
@@ -77,7 +76,7 @@
         <dependency>
             <groupId>org.cometd.java</groupId>
             <artifactId>cometd-java-server</artifactId>
-            <version>3.0.9</version>
+            <version>${cometd-java-server}</version>
         </dependency>
 
         <!-- Test Dependencies -->

http://git-wip-us.apache.org/repos/asf/camel/blob/0b641eeb/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cba0edb..b9b2604 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -102,7 +102,7 @@
     <cometd-bayeux-version>6.1.11</cometd-bayeux-version>
     <cometd-java-client-version>2.4.3</cometd-java-client-version>
     <cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
-    <cometd-java-server>2.3.1</cometd-java-server>
+    <cometd-java-server>3.0.9</cometd-java-server>
     <commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
     <commons-codec-version>1.10</commons-codec-version>
     <commons-collections-version>3.2.2</commons-collections-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/0b641eeb/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 a7d3ba0..feac278 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -319,10 +319,12 @@
   </feature>
   <feature name='camel-cometd' version='${project.version}' resolver='(obr)' start-level='50'>
     <details>camel-cometd currently requires jetty 8</details>
-    <feature version="[8,9)">jetty</feature>
+    <feature>jetty</feature>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.cometd.java/cometd-java-server/${cometd-java-server}</bundle>
+    <bundle dependency='true'>mvn:org.cometd.java/bayeux-api/${cometd-java-server}</bundle>
+    <bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-server}</bundle>
     <bundle>mvn:org.apache.camel/camel-cometd/${project.version}</bundle>
   </feature>
   <feature name='camel-context' version='${project.version}' resolver='(obr)' start-level='50'>


Mime
View raw message