cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject cxf-dosgi git commit: Make sure we do not use any snapshot dependencies
Date Wed, 14 Sep 2016 09:19:51 GMT
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master b15c66ffe -> 8ff43bef6


Make sure we do not use any snapshot dependencies


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

Branch: refs/heads/master
Commit: 8ff43bef6281a7a08a03368cf5a67c9c444adee6
Parents: b15c66f
Author: Christian Schneider <chris@die-schneider.net>
Authored: Wed Sep 14 11:19:34 2016 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Wed Sep 14 11:19:34 2016 +0200

----------------------------------------------------------------------
 distribution/repository/pom.xml |  9 ++++++++-
 parent/pom.xml                  |  2 +-
 samples/repository/pom.xml      | 35 ++++++++++++++++++++++++++++++++++-
 samples/rest/README.md          |  4 ++--
 samples/soap/README.md          |  6 +++---
 samples/soap/soap.bndrun        | 23 ++++++++++++-----------
 samples/ssl/README.md           | 10 +++-------
 7 files changed, 63 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/distribution/repository/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index f70d989..5050920 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -14,9 +14,16 @@
         <dependency>
             <groupId>org.apache.aries.rsa</groupId>
             <artifactId>repository</artifactId>
-            <version>1.10-SNAPSHOT</version>
+            <version>${aries.rsa.version}</version>
             <type>pom</type>
         </dependency>
+        
+        <!-- Workaround for missing dependency in rsa repo -->
+        <dependency>
+            <groupId>org.fusesource.jansi</groupId>
+            <artifactId>jansi</artifactId>
+            <version>1.13</version>
+        </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-all</artifactId>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e5fc564..0ce1d33 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -30,7 +30,7 @@
 
         <osgi.version>5.0.0</osgi.version>
         <osgi.compendium.version>5.0.0</osgi.compendium.version>
-        <aries.rsa.version>1.10-SNAPSHOT</aries.rsa.version>
+        <aries.rsa.version>1.9.0</aries.rsa.version>
         <cxf.version>3.1.7</cxf.version>
         <felix.version>5.4.0</felix.version>
         <zookeeper.version>3.4.8</zookeeper.version>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/samples/repository/pom.xml
----------------------------------------------------------------------
diff --git a/samples/repository/pom.xml b/samples/repository/pom.xml
index 2c7fdb7..a29e5e1 100644
--- a/samples/repository/pom.xml
+++ b/samples/repository/pom.xml
@@ -43,6 +43,7 @@
             <artifactId>org.apache.felix.fileinstall</artifactId>
             <version>3.5.2</version>
         </dependency>
+        <!-- 
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.gogo.command</artifactId>
@@ -79,10 +80,42 @@
             <artifactId>org.apache.felix.gogo.shell</artifactId>
             <version>0.13.0-SNAPSHOT</version>
         </dependency>
+         -->
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.gogo.command</artifactId>
+            <version>0.16.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>org.osgi.core</artifactId>
+                    <groupId>org.osgi</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>org.osgi.compendium</artifactId>
+                    <groupId>org.osgi</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>
+                        org.apache.felix.bundlerepository
+                    </artifactId>
+                    <groupId>org.apache.felix</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.gogo.runtime</artifactId>
+            <version>0.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.gogo.shell</artifactId>
+            <version>0.12.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.4</version>
             <exclusions>
                 <exclusion>
                     <artifactId>animal-sniffer-annotations</artifactId>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/samples/rest/README.md
----------------------------------------------------------------------
diff --git a/samples/rest/README.md b/samples/rest/README.md
index 0c74070..e46b2e4 100644
--- a/samples/rest/README.md
+++ b/samples/rest/README.md
@@ -16,7 +16,7 @@ Unpack karaf 4 into a server and client directory.
 Start the server karaf
 
 ```
-feature:repo-add cxf-dosgi-samples 2.0-SNAPSHOT
+feature:repo-add cxf-dosgi-samples 2.0.0
 feature:install cxf-dosgi-sample-rest-impl
 rsa:endpoints
 ```
@@ -28,7 +28,7 @@ The last command should show one endpoint with a URI as id. You should be
able t
 Start the client karaf
 
 ```
-feature:repo-add cxf-dosgi-samples 2.0-SNAPSHOT
+feature:repo-add cxf-dosgi-samples 2.0.0
 feature:install cxf-dosgi-sample-rest-client
 ```
 Use commands to test

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/samples/soap/README.md
----------------------------------------------------------------------
diff --git a/samples/soap/README.md b/samples/soap/README.md
index 638b3cb..95bde9c 100644
--- a/samples/soap/README.md
+++ b/samples/soap/README.md
@@ -17,7 +17,7 @@ Unpack karaf 4 into a server and client directory.
 Start the server karaf
 
 ```
-feature:repo-add cxf-dosgi-samples 2.0-SNAPSHOT
+feature:repo-add cxf-dosgi-samples 2.0.0
 feature:install cxf-dosgi-sample-soap-impl
 rsa:endpoints
 ```
@@ -29,10 +29,10 @@ The last command should show one endpoint with a URI as id. You should
be able t
 Start the client karaf
 
 ```
-feature:repo-add cxf-dosgi-samples 2.0-SNAPSHOT
+feature:repo-add cxf-dosgi-samples 2.0.0
 feature:install cxf-dosgi-sample-soap-client
 ```
-Use commands to test
+Use these commands to test
 
 ```
 rsa:endpoints

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/samples/soap/soap.bndrun
----------------------------------------------------------------------
diff --git a/samples/soap/soap.bndrun b/samples/soap/soap.bndrun
index 4227b72..75acd17 100644
--- a/samples/soap/soap.bndrun
+++ b/samples/soap/soap.bndrun
@@ -32,28 +32,23 @@
 	osgi.identity;filter:='(osgi.identity=org.ops4j.pax.logging.pax-logging-service)',\
 	osgi.identity;filter:='(osgi.identity=org.objectweb.asm.all)',\
 	osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.samples.cxf-dosgi-samples-soap-impl)',\
-	osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\
 	osgi.identity;filter:='(osgi.identity=org.apache.felix.http.jetty)',\
 	osgi.identity;filter:='(osgi.identity=org.apache.cxf.dosgi.cxf-dosgi-provider-ws)',\
-	osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.topology-manager)'
+	osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.topology-manager)',\
+	osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)',\
+	osgi.identity;filter:='(osgi.identity=org.apache.aries.rsa.discovery.command)'
 -runbundles: \
 	org.apache.cxf.dosgi.samples.cxf-dosgi-samples-soap-api;version='[2.0.0,2.0.1)',\
 	org.apache.cxf.dosgi.samples.cxf-dosgi-samples-soap-impl;version='[2.0.0,2.0.1)',\
 	org.apache.felix.configadmin;version='[1.8.8,1.8.9)',\
 	org.apache.felix.fileinstall;version='[3.5.2,3.5.3)',\
-	org.apache.felix.gogo.command;version='[0.17.0,0.17.1)',\
-	org.apache.felix.gogo.jline;version='[0.1.0,0.1.1)',\
-	org.apache.felix.gogo.runtime;version='[0.17.0,0.17.1)',\
 	org.objectweb.asm.all;version='[5.0.4,5.0.5)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[1.8.5,1.8.6)',\
 	org.ops4j.pax.logging.pax-logging-service;version='[1.8.5,1.8.6)',\
-	org.apache.aries.rsa.core;version='[1.10.0,1.10.1)',\
-	org.apache.aries.rsa.spi;version='[1.10.0,1.10.1)',\
 	javax.servlet-api;version='[3.1.0,3.1.1)',\
 	org.apache.felix.eventadmin;version='[1.4.6,1.4.7)',\
 	org.apache.felix.http.api;version='[2.3.2,2.3.3)',\
 	org.apache.felix.http.jetty;version='[3.0.0,3.0.1)',\
-	jline;version='[3.0.0,3.0.1)',\
 	org.apache.cxf.cxf-core;version='[3.1.7,3.1.8)',\
 	org.apache.cxf.cxf-rt-bindings-soap;version='[3.1.7,3.1.8)',\
 	org.apache.cxf.cxf-rt-bindings-xml;version='[3.1.7,3.1.8)',\
@@ -65,8 +60,14 @@
 	org.apache.cxf.cxf-rt-wsdl;version='[3.1.7,3.1.8)',\
 	org.apache.cxf.dosgi.cxf-dosgi-common;version='[2.0.0,2.0.1)',\
 	org.apache.cxf.dosgi.cxf-dosgi-provider-ws;version='[2.0.0,2.0.1)',\
-	org.apache.felix.scr;version='[2.0.2,2.0.3)',\
 	org.apache.servicemix.bundles.wsdl4j;version='[1.6.3,1.6.4)',\
 	org.apache.ws.xmlschema.core;version='[2.2.1,2.2.2)',\
-	org.apache.aries.rsa.discovery.config;version='[1.10.0,1.10.1)',\
-	org.apache.aries.rsa.topology-manager;version='[1.10.0,1.10.1)'
\ No newline at end of file
+	org.apache.aries.rsa.core;version='[1.9.0,1.9.1)',\
+	org.apache.aries.rsa.spi;version='[1.9.0,1.9.1)',\
+	org.apache.aries.rsa.topology-manager;version='[1.9.0,1.9.1)',\
+	org.apache.felix.gogo.command;version='[0.16.0,0.16.1)',\
+	org.apache.felix.gogo.shell;version='[0.12.0,0.12.1)',\
+	org.apache.felix.scr;version='[2.0.4,2.0.5)',\
+	org.apache.felix.gogo.runtime;version='[0.10.0,0.10.1)',\
+	org.apache.aries.rsa.discovery.command;version='[1.9.0,1.9.1)',\
+	org.fusesource.jansi;version='[1.13.0,1.13.1)'
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/8ff43bef/samples/ssl/README.md
----------------------------------------------------------------------
diff --git a/samples/ssl/README.md b/samples/ssl/README.md
index d3c66e5..feb5563 100644
--- a/samples/ssl/README.md
+++ b/samples/ssl/README.md
@@ -41,13 +41,9 @@ We want the karaf HttpService to be secured by https and require a client
certif
 - Install the example
 
 ``` 
-feature:repo-add cxf-dosgi 2.0-SNAPSHOT
-feature:install cxf-dosgi-provider-ws
-
-install -s mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-soap-api/2.0_SNAPSHOT
-install -s mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-soap-impl/2.0-SNAPSHOT
-install -s mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-soap-client/2.0-SNAPSHOT
-install -s mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-ssl-intent/2.0-SNAPSHOT
+feature:repo-add cxf-dosgi-samples 2.0.0
+feature:install cxf-dosgi-sample-soap-impl cxf-dosgi-sample-soap-client
+install -s mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-ssl-intent/2.0.0
 ```
 
 # Test using browser


Mime
View raw message