karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [karaf-cave] branch master updated: Excluding cave-rest feature from verify to allow the build
Date Wed, 08 Nov 2017 05:03:17 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-cave.git


The following commit(s) were added to refs/heads/master by this push:
     new a25c49c  Excluding cave-rest feature from verify to allow the build
a25c49c is described below

commit a25c49c3579667a5e26dc8b2fc583a3c479d8839
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
AuthorDate: Wed Nov 8 06:02:57 2017 +0100

    Excluding cave-rest feature from verify to allow the build
---
 assembly/pom.xml          | 4 ++--
 pom.xml                   | 8 ++++----
 server/http/pom.xml       | 4 ++--
 server/management/pom.xml | 2 +-
 server/maven/pom.xml      | 4 ++--
 server/storage/pom.xml    | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 98f06ee..c575a8b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -80,12 +80,12 @@
                                 <descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
                             </descriptors>
                             <distribution>org.apache.karaf.features:framework</distribution>
-                            <javase>1.7</javase>
+                            <javase>1.8</javase>
                             <framework>
                                 <feature>framework</feature>
                             </framework>
                             <features>
-                                <feature>cave-*</feature>
+                                <feature>!cave-rest</feature>
                             </features>
                             <verifyTransitive>false</verifyTransitive>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index 9bd2b18..5b93497 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,11 +36,11 @@
 
     <properties>
         <commons-io.version>2.4</commons-io.version>
-        <cxf.version>3.1.0</cxf.version>
+        <cxf.version>3.2.1</cxf.version>
         <httpclient.version>4.3.4</httpclient.version>
         <jsoup.version>1.7.3</jsoup.version>
         <karaf.version>4.1.3</karaf.version>
-        <osgi.version>5.0.0</osgi.version>
+        <osgi.version>6.0.0</osgi.version>
         <wagon.version>1.0</wagon.version>
 
         <servlet.spec.groupId>javax.servlet</servlet.spec.groupId>
@@ -127,12 +127,12 @@
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
+                <artifactId>osgi.core</artifactId>
                 <version>${osgi.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.compendium</artifactId>
+                <artifactId>osgi.cmpn</artifactId>
                 <version>${osgi.version}</version>
             </dependency>
             <dependency>
diff --git a/server/http/pom.xml b/server/http/pom.xml
index d96c872..b0951e6 100644
--- a/server/http/pom.xml
+++ b/server/http/pom.xml
@@ -45,11 +45,11 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf</groupId>
diff --git a/server/management/pom.xml b/server/management/pom.xml
index be7bf10..ac37353 100644
--- a/server/management/pom.xml
+++ b/server/management/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/server/maven/pom.xml b/server/maven/pom.xml
index 0d575b4..f323f8d 100644
--- a/server/maven/pom.xml
+++ b/server/maven/pom.xml
@@ -71,12 +71,12 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/server/storage/pom.xml b/server/storage/pom.xml
index e706b10..f675a4d 100644
--- a/server/storage/pom.xml
+++ b/server/storage/pom.xml
@@ -48,11 +48,11 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf</groupId>

-- 
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <commits@karaf.apache.org>'].

Mime
View raw message