cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: Update to Karaf 2.3.6 for testing (at this point, need to move to 3.0.1 shortly)
Date Tue, 02 Sep 2014 17:11:35 GMT
Repository: cxf
Updated Branches:
  refs/heads/master d9877ad2e -> ed4d48dbc


Update to Karaf 2.3.6 for testing (at this point, need to move to 3.0.1 shortly)


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

Branch: refs/heads/master
Commit: ed4d48dbca1f4d9c7b3061c1bcbb17dd832232e7
Parents: d9877ad
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Sep 2 12:55:20 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Tue Sep 2 12:55:20 2014 -0400

----------------------------------------------------------------------
 osgi/itests/pom.xml                             | 28 +++++++++++++++++-
 .../cxf/osgi/itests/CXFOSGiTestSupport.java     | 30 ++++++++++++++++++--
 osgi/karaf/commands/pom.xml                     |  2 +-
 parent/pom.xml                                  |  2 +-
 services/xkms/xkms-itests/pom.xml               |  3 +-
 .../cxf/xkms/itests/BasicIntegrationTest.java   |  2 +-
 6 files changed, 58 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ed4d48db/osgi/itests/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 098fc21..6887b6b 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -129,7 +129,32 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>apache-karaf</artifactId>
+            <version>${cxf.karaf.version}</version>
+            <type>tar.gz</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.karaf.shell</groupId>
+                    <artifactId>org.apache.karaf.shell.dev</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse</groupId>
+                    <artifactId>osgi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.karaf</groupId>
+                    <artifactId>org.apache.karaf.client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.apache.felix.framework</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -137,6 +162,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
+                <version>1.2</version>
                 <executions>
                     <execution>
                         <id>generate-depends-file</id>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ed4d48db/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 468f4cb..4249dff 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -24,6 +24,7 @@ package org.apache.cxf.osgi.itests;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintStream;
 import java.net.DatagramSocket;
 import java.net.ServerSocket;
@@ -32,6 +33,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Dictionary;
 import java.util.Enumeration;
+import java.util.Properties;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -43,7 +45,9 @@ import javax.inject.Inject;
 import org.apache.felix.service.command.CommandProcessor;
 import org.apache.felix.service.command.CommandSession;
 import org.apache.karaf.features.FeaturesService;
+
 import org.junit.Assert;
+
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.ProbeBuilder;
 import org.ops4j.pax.exam.TestProbeBuilder;
@@ -69,7 +73,6 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDist
  * 
  */
 public class CXFOSGiTestSupport {
-    static final String KARAF_VERSION = "2.3.5";
     static final Long COMMAND_TIMEOUT = 10000L;
     static final Long DEFAULT_TIMEOUT = 20000L;
     static final Long SERVICE_TIMEOUT = 30000L;
@@ -95,20 +98,41 @@ public class CXFOSGiTestSupport {
         return probe;
     }
 
+    private static String getKarafVersion() {
+        InputStream ins = CXFOSGiTestSupport.class.getResourceAsStream("/META-INF/maven/dependencies.properties");
+        Properties p = new Properties();
+        try {
+            p.load(ins);
+        } catch (Throwable t) {
+            //
+        }
+        String karafVersion = p.getProperty("org.apache.karaf/apache-karaf/version");
+        if (karafVersion == null) {
+            karafVersion = System.getProperty("cxf.karaf.version");
+        }
+        if (karafVersion == null) {
+            karafVersion = System.getProperty("karaf.version");
+        }
+        if (karafVersion == null) {
+            // setup the default version of it
+            karafVersion = "2.3.6";
+        }
+        return karafVersion;
+    }    
     /**
      * Create an {@link org.ops4j.pax.exam.Option} for using a .
      * 
      * @return
      */
     protected Option cxfBaseConfig() {
-        karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf").version(KARAF_VERSION)
+        karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf").version(getKarafVersion())
             .type("tar.gz");
         cxfUrl = maven().groupId("org.apache.cxf.karaf").artifactId("apache-cxf").versionAsInProject()
             .type("xml").classifier("features");
         String localRepo = System.getProperty("localRepository");
         return composite(karafDistributionConfiguration()
                              .frameworkUrl(karafUrl)
-                             .karafVersion(KARAF_VERSION)
+                             .karafVersion(getKarafVersion())
                              .name("Apache Karaf")
                              .useDeployFolder(false)
                              .unpackDirectory(new File("target/paxexam/")),

http://git-wip-us.apache.org/repos/asf/cxf/blob/ed4d48db/osgi/karaf/commands/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/commands/pom.xml b/osgi/karaf/commands/pom.xml
index 2abd0f7..96e55fa 100644
--- a/osgi/karaf/commands/pom.xml
+++ b/osgi/karaf/commands/pom.xml
@@ -59,7 +59,7 @@
               org.apache.felix.service.command;version="[0.6,1)",
               org.apache.felix.gogo.commands;version="[0.6,1)",
               org.apache.cxf*;version="[3,4)",
-              org.apache.karaf.shell.console;version="[2.2,4)",
+              org.apache.karaf.shell.console;version="[2.3,4)",
               *
                         </Import-Package>
                         <_nouses>true</_nouses>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ed4d48db/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fdd1a0d..219544d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -162,7 +162,7 @@
         <cxf.aries.version>1.0.0</cxf.aries.version>
         <cxf.aries.version.range>[1.0,2)</cxf.aries.version.range>
         <cxf.osgi.version>4.2.0</cxf.osgi.version>
-        <cxf.karaf.version>2.3.3</cxf.karaf.version>
+        <cxf.karaf.version>2.3.6</cxf.karaf.version>
         <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
         <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
         <cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ed4d48db/services/xkms/xkms-itests/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index 2bccae0..f2bfd75 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -23,7 +23,6 @@
     </parent>
     <properties>
         <pax.exam.version>3.4.0</pax.exam.version>
-        <karaf.version>2.3.5</karaf.version>
     </properties>
     <dependencies>
         <dependency>
@@ -124,7 +123,7 @@
                 <configuration>
                     <systemPropertyVariables>
                         <org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
-                        <karaf.version>${karaf.version}</karaf.version>
+                        <karaf.version>${cxf.karaf.version}</karaf.version>
                         <org.ops4j.pax.url.mvn.localRepository>${maven.repo.local}</org.ops4j.pax.url.mvn.localRepository>
                     </systemPropertyVariables>
                 </configuration>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ed4d48db/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
index 3ea621f..81853f3 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
@@ -63,7 +63,7 @@ public class BasicIntegrationTest {
 
     @Configuration
     public Option[] getConfig() {
-        String karafVersion = System.getProperty("karaf.version", "2.3.5");
+        String karafVersion = System.getProperty("karaf.version", "2.3.6");
         String localRepository = System.getProperty("localRepository");
         karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf")
             .version(karafVersion).type("tar.gz");


Mime
View raw message