karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-3078] Upgrade to CXF 3.0.0
Date Fri, 27 Jun 2014 12:41:07 GMT
Repository: karaf-cave
Updated Branches:
  refs/heads/master 65ba84ba7 -> c9334af0a


[KARAF-3078] Upgrade to CXF 3.0.0


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

Branch: refs/heads/master
Commit: c9334af0ae4a8858b5a855fb32c1201b6fca9393
Parents: 65ba84b
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Fri Jun 27 14:40:45 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Fri Jun 27 14:40:45 2014 +0200

----------------------------------------------------------------------
 BUILDING                                 | 4 ++--
 README                                   | 4 ++--
 assembly/src/main/resources/features.xml | 2 +-
 pom.xml                                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/c9334af0/BUILDING
----------------------------------------------------------------------
diff --git a/BUILDING b/BUILDING
index b8f31e8..65fc6f7 100644
--- a/BUILDING
+++ b/BUILDING
@@ -21,9 +21,9 @@ Building Apache Karaf Cave
 Initial Setup
 -------------
 
-1) Install J2SE 6.0 SDK (or later), which can be downloaded from
+1) Install J2SE 7.0 SDK (or later), which can be downloaded from
    http://www.oracle.com/technetwork/java/javase/downloads.
-   Use version of "JDK 6.0 Update 26" (or later).
+   Use version of "JDK 6.0 Update 50" (or later).
 
 2) Make sure that your JAVA_HOME environment variable is set to the newly installed
    JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/c9334af0/README
----------------------------------------------------------------------
diff --git a/README b/README
index c50d958..f5791c1 100644
--- a/README
+++ b/README
@@ -47,11 +47,11 @@ BUILDING for instructions on building Apache Karaf Cave.
 
 To install Apache Karaf Cave, first you have to register the Cave features descriptor:
 
-karaf@root> features:addurl mvn:org.apache.karaf.cave/apache-karaf-cave/3.0.0-SNAPSHOT/xml/features
+karaf@root()> feature:repo-add mvn:org.apache.karaf.cave/apache-karaf-cave/3.0.0/xml/features
 
 Now, you can install the Cave feature simply by typing:
 
-karaf@root> features:install cave-server
+karaf@root()> feature:install cave-server
 
 The PDF manual is the right place to find any information about Karaf Cave.
 

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/c9334af0/assembly/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml
index 4016abc..27dc0f1 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -24,7 +24,7 @@
         <configfile finalname="/etc/org.apache.cxf.osgi.cfg">
             mvn:org.apache.karaf.cave/apache-karaf-cave/${project.version}/cfg/cxf
         </configfile>
-        <feature version="[2.4,3)">cxf</feature>
+        <feature version="[3,4)">cxf</feature>
         <feature>obr</feature>
         <feature>war</feature>
         <configfile finalname="/etc/org.apache.karaf.cave.server.storage.cfg">

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/c9334af0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 52e3a36..8b1a9b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <commons-io.version>2.4</commons-io.version>
-        <cxf.version>2.7.6</cxf.version>
+        <cxf.version>3.0.0</cxf.version>
         <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
         <httpclient.version>4.2.5</httpclient.version>
         <jsoup.version>1.7.3</jsoup.version>


Mime
View raw message