cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject git commit: CXF-6052 Upgrade the Karaf version to 2.4.0
Date Thu, 16 Oct 2014 02:39:56 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes df7a7538f -> d951b7efb


 CXF-6052  Upgrade the Karaf version to 2.4.0


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

Branch: refs/heads/3.0.x-fixes
Commit: d951b7efb0376ffb1f1581cc9788d26efa0928b0
Parents: df7a753
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Thu Oct 16 09:31:32 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Thu Oct 16 10:39:23 2014 +0800

----------------------------------------------------------------------
 parent/pom.xml                                  | 20 ++++++++++----------
 .../src/main/resources/features.xml             |  8 ++++----
 .../cxf/xkms/itests/BasicIntegrationTest.java   | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d951b7ef/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a02891f..7cdcbd0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -6,9 +6,9 @@
   regarding copyright ownership. The ASF licenses this file
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
- 
+
   http://www.apache.org/licenses/LICENSE-2.0
- 
+
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -171,12 +171,12 @@
         <cxf.hibernate.validator.version>5.0.2.Final</cxf.hibernate.validator.version>
         <cxf.glassfish.json.version>1.0.4</cxf.glassfish.json.version>
         <cxf.javax.el.version>3.0.0</cxf.javax.el.version>
-        <cxf.hibernate-validator.bundle.version>5.0.2.Final_1</cxf.hibernate-validator.bundle.version>

+        <cxf.hibernate-validator.bundle.version>5.0.2.Final_1</cxf.hibernate-validator.bundle.version>
         <!-- various OSGi related versions -->
         <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.6</cxf.karaf.version>
+        <cxf.karaf.version>2.4.0</cxf.karaf.version>
         <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
         <cxf.pax.exam.version>3.4.0</cxf.pax.exam.version>
         <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
@@ -682,11 +682,11 @@
                     </exclusion>
                     <exclusion>
                         <groupId>commons-httpclient</groupId>
-                        <artifactId>commons-httpclient</artifactId>         
  	
+                        <artifactId>commons-httpclient</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
-            
+
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -895,19 +895,19 @@
                 <artifactId>cdi-api</artifactId>
                 <version>${cxf.cdi.api.version}</version>
                 <optional>true</optional>
-            </dependency>  
+            </dependency>
             <dependency>
                 <groupId>javax.json</groupId>
                 <artifactId>javax.json-api</artifactId>
                 <version>${cxf.json.api.version}</version>
                 <optional>true</optional>
-            </dependency>          
+            </dependency>
             <dependency>
                 <groupId>org.glassfish</groupId>
                 <artifactId>javax.json</artifactId>
                 <version>${cxf.glassfish.json.version}</version>
                 <optional>true</optional>
-            </dependency>            
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jdk14</artifactId>
@@ -1792,7 +1792,7 @@
                 <artifactId>tika-parsers</artifactId>
                 <version>${cxf.tika.version}</version>
 			</dependency>
-			
+
         </dependencies>
     </dependencyManagement>
     <profiles>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d951b7ef/services/xkms/xkms-features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-features/src/main/resources/features.xml b/services/xkms/xkms-features/src/main/resources/features.xml
index 59c10b5..6134ee6 100644
--- a/services/xkms/xkms-features/src/main/resources/features.xml
+++ b/services/xkms/xkms-features/src/main/resources/features.xml
@@ -7,9 +7,9 @@
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
   with the License. You may obtain a copy of the License at
- 
+
   http://www.apache.org/licenses/LICENSE-2.0
- 
+
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,7 +22,7 @@
     <feature name="cxf-xkms-client" version="${project.version}">
         <feature>cxf-jaxws</feature>
         <feature>cxf-http</feature>
-        <feature>wss4j</feature>
+        <feature>cxf-ws-security</feature>
         <bundle start-level="40" dependency="true">mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}</bundle>
         <bundle>mvn:${project.groupId}/cxf-services-xkms-common/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/cxf-services-xkms-client/${project.version}</bundle>
@@ -42,7 +42,7 @@
             mvn:${project.groupId}/cxf-services-xkms-features/${project.version}/cfg/org.apache.cxf.xkms
         </configfile>
     </feature>
-    
+
     <feature name="cxf-xkms-ldap" version="${project.version}">
         <feature>cxf-xkms-service</feature>
         <bundle>mvn:${project.groupId}/cxf-services-xkms-x509-repo-ldap/${project.version}</bundle>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d951b7ef/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 81853f3..ea0feac 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
@@ -50,20 +50,20 @@ public class BasicIntegrationTest {
 
     private static final String HTTP_PORT = "9191";
     private static final String XKMS_ENDPOINT = "http://localhost:" + HTTP_PORT + "/cxf/XKMS";
-    
+
     // Adding apache snapshots as cxf trunk may contain snapshot dependencies
-    private static final String REPOS = "http://repo1.maven.org/maven2@id=central, " 
+    private static final String REPOS = "http://repo1.maven.org/maven2@id=central, "
         + "http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache-snapshots
";
 
     protected MavenArtifactUrlReference karafUrl;
     protected MavenUrlReference xkmsFeatures;
-    
+
     @Inject
     protected XKMSPortType xkmsService;
 
     @Configuration
     public Option[] getConfig() {
-        String karafVersion = System.getProperty("karaf.version", "2.3.6");
+        String karafVersion = System.getProperty("karaf.version", "2.4.0");
         String localRepository = System.getProperty("localRepository");
         karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf")
             .version(karafVersion).type("tar.gz");
@@ -83,16 +83,16 @@ public class BasicIntegrationTest {
             copy("data/xkms/certificates/http___localhost_8080_services_TestService.cer"),
             copy("data/xkms/certificates/crls/wss40CACRL.cer"),
             copy("etc/org.ops4j.pax.logging.cfg"),
-            editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories",
REPOS), 
+            editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories",
REPOS),
             editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port",
HTTP_PORT),
             editConfigurationFilePut("etc/org.apache.cxf.xkms.client.cfg", "xkms.endpoint",
XKMS_ENDPOINT),
             when(localRepository != null)
-                .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", 
+                .useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
                             "org.ops4j.pax.url.mvn.localRepository",
                             localRepository)),
             features(xkmsFeatures, "cxf-xkms-service", "cxf-xkms-client", "cxf-xkms-ldap"),
             configureConsole().ignoreLocalConsole(),
-            
+
             //KarafDistributionOption.keepRuntimeFolder(),
             //CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
         };


Mime
View raw message