camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] camel git commit: Remove old cruft about karaf 2 and 3
Date Fri, 08 Sep 2017 07:29:12 GMT
Repository: camel
Updated Branches:
  refs/heads/master 59c4c8e8b -> da4b458d3


Remove old cruft about karaf 2 and 3


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

Branch: refs/heads/master
Commit: da4b458d34fa56f28704255f38fa6835566c7b93
Parents: 24b87c0
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Fri Sep 8 09:29:00 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Sep 8 09:29:07 2017 +0200

----------------------------------------------------------------------
 parent/pom.xml                         |  2 +-
 tests/camel-blueprint-cxf-test/pom.xml | 42 +++++++++++++++--------------
 2 files changed, 23 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/da4b458d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4766afe..a9c71e33 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -428,7 +428,7 @@
     <jzlib-bundle-version>1.1.3_2</jzlib-bundle-version>
     <kafka-version>0.11.0.0</kafka-version>
     <kafka-bundle-version>0.11.0.0_1</kafka-bundle-version>
-    <karaf-version>2.4.4</karaf-version>
+    <karaf2-version>2.4.4</karaf2-version>
     <karaf4-version>4.1.2</karaf4-version>
     <kie-version>6.5.0.Final</kie-version>
     <krati-version>0.4.9</krati-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/da4b458d/tests/camel-blueprint-cxf-test/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml
index 30ddce1..9cff630 100644
--- a/tests/camel-blueprint-cxf-test/pom.xml
+++ b/tests/camel-blueprint-cxf-test/pom.xml
@@ -17,7 +17,8 @@
     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>
 
@@ -28,7 +29,7 @@
   </parent>
 
   <artifactId>camel-blueprint-cxf-test</artifactId>
-  <name>Camel :: Integration Tests :: Blueprint CXF Tests </name>
+  <name>Camel :: Integration Tests :: Blueprint CXF Tests</name>
   <description>Tests the camel-cxf blueprint features</description>
 
   <dependencies>
@@ -40,30 +41,31 @@
       <scope>test</scope>
     </dependency>
 
+    <!-- TODO OSGi hell with starting up Karaf 4.x for this test -->
     <dependency>
       <groupId>org.apache.karaf.jaas</groupId>
       <artifactId>org.apache.karaf.jaas.jasypt</artifactId>
       <exclusions>
-          <exclusion>
-              <groupId>org.apache.servicemix.bundles</groupId>
-              <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
-          </exclusion>
+        <exclusion>
+          <groupId>org.apache.servicemix.bundles</groupId>
+          <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
+        </exclusion>
       </exclusions>
-      <version>${karaf-version}</version>
+      <version>${karaf2-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.jasypt</groupId>
-        <artifactId>jasypt</artifactId>
-        <version>${jasypt-version}</version>
-        <scope>test</scope>
+      <groupId>org.jasypt</groupId>
+      <artifactId>jasypt</artifactId>
+      <version>${jasypt-version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
       <scope>test</scope>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>
       <scope>test</scope>
@@ -86,25 +88,25 @@
       <exclusions>
         <exclusion>
           <groupId>org.apache.aries.blueprint</groupId>
-          <artifactId>org.apache.aries.blueprint.core</artifactId>         
+          <artifactId>org.apache.aries.blueprint.core</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.aries.blueprint</groupId>
-          <artifactId>org.apache.aries.blueprint.api</artifactId>         
+          <artifactId>org.apache.aries.blueprint.api</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.aries.quiesce</groupId>
-          <artifactId>org.apache.aries.quiesce.api</artifactId>         
+          <artifactId>org.apache.aries.quiesce.api</artifactId>
         </exclusion>
         <!--  exclude additional unneeded components -->
         <exclusion>
           <groupId>org.apache.camel</groupId>
-          <artifactId>camel-spring</artifactId>         
+          <artifactId>camel-spring</artifactId>
         </exclusion>
       </exclusions>
       <scope>test</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
@@ -151,7 +153,7 @@
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-extension-providers</artifactId>
       <scope>test</scope>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
@@ -169,7 +171,7 @@
       <artifactId>org.osgi.compendium</artifactId>
       <scope>test</scope>
     </dependency>
-    
+
     <!-- logging -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
@@ -188,7 +190,7 @@
     </dependency>
 
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>java9</id>


Mime
View raw message