karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anierb...@apache.org
Subject svn commit: r1489037 - in /karaf/trunk: ./ assemblies/features/framework/ assemblies/features/framework/src/main/feature/ assemblies/features/standard/ kar/core/ scr/command/ scr/examples/component-factory/ scr/examples/managed-service/ scr/examples/se...
Date Mon, 03 Jun 2013 15:47:16 GMT
Author: anierbeck
Date: Mon Jun  3 15:47:15 2013
New Revision: 1489037

URL: http://svn.apache.org/r1489037
Log:
[KARAF-2351] - Upgrade to Pax-Swissbox 1.7.0(-SNAPSHOT) and bndlib 2.1.0

Modified:
    karaf/trunk/assemblies/features/framework/pom.xml
    karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
    karaf/trunk/assemblies/features/standard/pom.xml
    karaf/trunk/kar/core/pom.xml
    karaf/trunk/pom.xml
    karaf/trunk/scr/command/pom.xml
    karaf/trunk/scr/examples/component-factory/pom.xml
    karaf/trunk/scr/examples/managed-service/pom.xml
    karaf/trunk/scr/examples/service/pom.xml
    karaf/trunk/scr/management/pom.xml

Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1489037&r1=1489036&r2=1489037&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Mon Jun  3 15:47:15 2013
@@ -82,7 +82,7 @@
 
         <!-- listed in source feature.xml with explicit startlevel -->
         <dependency>
-            <groupId>biz.aQute</groupId>
+            <groupId>biz.aQute.bnd</groupId>
             <artifactId>bndlib</artifactId>
             <exclusions>
                 <exclusion>

Modified: karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml?rev=1489037&r1=1489036&r2=1489037&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Mon Jun  3 15:47:15
2013
@@ -24,7 +24,7 @@
     <feature version="${project.version}" description="Karaf core feature" name="framework">
         <bundle start="true" start-level="5">mvn:org.ops4j.base/ops4j-base-lang/${pax.base.version}</bundle>
         <bundle start="true" start-level="5">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit3.bundle.version}</bundle>
-        <bundle start="true" start-level="5">mvn:biz.aQute/bndlib/${bndlib.version}</bundle>
+        <bundle start="true" start-level="5">mvn:biz.aQute.bnd/bndlib/${bndlib.version}</bundle>
         <bundle start="true" start-level="5">mvn:org.ops4j.pax.swissbox/pax-swissbox-bnd/${pax.swissbox.version}</bundle>
         <bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-maven-commons/${pax.url.version}</bundle>
         <bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>

Modified: karaf/trunk/assemblies/features/standard/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/pom.xml?rev=1489037&r1=1489036&r2=1489037&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/pom.xml (original)
+++ karaf/trunk/assemblies/features/standard/pom.xml Mon Jun  3 15:47:15 2013
@@ -346,7 +346,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>biz.aQute</groupId>
+            <groupId>biz.aQute.bnd</groupId>
             <artifactId>bndlib</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/kar/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/pom.xml?rev=1489037&r1=1489036&r2=1489037&view=diff
==============================================================================
--- karaf/trunk/kar/core/pom.xml (original)
+++ karaf/trunk/kar/core/pom.xml Mon Jun  3 15:47:15 2013
@@ -57,6 +57,10 @@
             <artifactId>pax-url-aether</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.ops4j.pax.swissbox</groupId>
+            <artifactId>pax-swissbox-property</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>org.apache.karaf.features.core</artifactId>
             <scope>provided</scope>

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1489037&r1=1489036&r2=1489037&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon Jun  3 15:47:15 2013
@@ -144,7 +144,7 @@
         <geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version>
         <easymock.version>3.1</easymock.version>
         <equinox.version>3.8.0.v20120529-1548</equinox.version>
-        <bndlib.version>1.50.0</bndlib.version>
+        <bndlib.version>2.1.0</bndlib.version>
         <equinox.region.version>1.0.0.v20110506</equinox.region.version>
         <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
         <felix.configadmin.version>1.6.0</felix.configadmin.version>
@@ -211,7 +211,7 @@
         <pax.base.version>1.4.0</pax.base.version>
         <pax.url.version>1.5.2</pax.url.version>
         <pax.web.version>3.0.1</pax.web.version>
-        <pax.swissbox.version>1.5.1</pax.swissbox.version>
+        <pax.swissbox.version>1.7.0-SNAPSHOT</pax.swissbox.version>
         <pax.tinybundle.version>1.0.0</pax.tinybundle.version>
         <portlet-api.version>2.0</portlet-api.version>
         <servlet.api.version>3.0</servlet.api.version>
@@ -922,7 +922,7 @@
             </dependency>
 
             <dependency>
-                <groupId>biz.aQute</groupId>
+                <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bndlib</artifactId>
                 <version>${bndlib.version}</version>
             </dependency>

Modified: karaf/trunk/scr/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/pom.xml?rev=1489037&r1=1489036&r2=1489037&view=diff
==============================================================================
--- karaf/trunk/scr/command/pom.xml (original)
+++ karaf/trunk/scr/command/pom.xml Mon Jun  3 15:47:15 2013
@@ -65,7 +65,7 @@
             <artifactId>org.apache.felix.scr</artifactId>
         </dependency>
         <dependency>
-            <groupId>biz.aQute</groupId>
+            <groupId>biz.aQute.bnd</groupId>
             <artifactId>bndlib</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/scr/examples/component-factory/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/component-factory/pom.xml?rev=1489037&r1=1489036&r2=1489037&view=diff
==============================================================================
--- karaf/trunk/scr/examples/component-factory/pom.xml (original)
+++ karaf/trunk/scr/examples/component-factory/pom.xml Mon Jun  3 15:47:15 2013
@@ -40,7 +40,7 @@
             <artifactId>org.apache.felix.scr</artifactId>
         </dependency>
         <dependency>
-            <groupId>biz.aQute</groupId>
+            <groupId>biz.aQute.bnd</groupId>
             <artifactId>bndlib</artifactId>
         </dependency>
         <dependency>

Modified: karaf/trunk/scr/examples/managed-service/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/managed-service/pom.xml?rev=1489037&r1=1489036&r2=1489037&view=diff
==============================================================================
--- karaf/trunk/scr/examples/managed-service/pom.xml (original)
+++ karaf/trunk/scr/examples/managed-service/pom.xml Mon Jun  3 15:47:15 2013
@@ -36,7 +36,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>biz.aQute</groupId>
+            <groupId>biz.aQute.bnd</groupId>
             <artifactId>bndlib</artifactId>
         </dependency>
         <dependency>

Modified: karaf/trunk/scr/examples/service/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/service/pom.xml?rev=1489037&r1=1489036&r2=1489037&view=diff
==============================================================================
--- karaf/trunk/scr/examples/service/pom.xml (original)
+++ karaf/trunk/scr/examples/service/pom.xml Mon Jun  3 15:47:15 2013
@@ -37,7 +37,7 @@
     <dependencies>
         <!-- contains the SCR Annotations -->
         <dependency>
-            <groupId>biz.aQute</groupId>
+            <groupId>biz.aQute.bnd</groupId>
             <artifactId>bndlib</artifactId>
         </dependency>
         <!-- contains the SCR Binaries (only required if you need the low level SCR APIs
-->

Modified: karaf/trunk/scr/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/management/pom.xml?rev=1489037&r1=1489036&r2=1489037&view=diff
==============================================================================
--- karaf/trunk/scr/management/pom.xml (original)
+++ karaf/trunk/scr/management/pom.xml Mon Jun  3 15:47:15 2013
@@ -54,7 +54,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>biz.aQute</groupId>
+            <groupId>biz.aQute.bnd</groupId>
             <artifactId>bndlib</artifactId>
             <scope>provided</scope>
         </dependency>



Mime
View raw message