karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [1/3] git commit: [KARAF-2831] Switch to pax url uber bundles
Date Fri, 21 Mar 2014 15:02:52 GMT
Repository: karaf
Updated Branches:
  refs/heads/master f14efe123 -> 257144c27


[KARAF-2831] Switch to pax url uber bundles


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

Branch: refs/heads/master
Commit: 257144c274929f9676a9a53be21fcc6dc4e4bb18
Parents: 9d257a5
Author: Guillaume Nodet <gnodet@gmail.com>
Authored: Thu Mar 20 00:56:29 2014 +0100
Committer: Guillaume Nodet <gnodet@gmail.com>
Committed: Fri Mar 21 13:55:44 2014 +0100

----------------------------------------------------------------------
 assemblies/features/framework/pom.xml           | 35 +++++++-------------
 .../framework/src/main/feature/feature.xml      |  5 +--
 assemblies/features/standard/pom.xml            |  2 ++
 .../standard/src/main/feature/feature.xml       |  6 +---
 pom.xml                                         |  3 ++
 tooling/karaf-maven-plugin/pom.xml              |  1 +
 6 files changed, 20 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/257144c2/assemblies/features/framework/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml
index bd5e800..f4ed5a6 100644
--- a/assemblies/features/framework/pom.xml
+++ b/assemblies/features/framework/pom.xml
@@ -82,16 +82,6 @@
 
         <!-- listed in source feature.xml with explicit startlevel -->
         <dependency>
-            <groupId>biz.aQute.bnd</groupId>
-            <artifactId>bndlib</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
         </dependency>
@@ -100,16 +90,12 @@
             <artifactId>pax-logging-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.base</groupId>
-            <artifactId>ops4j-base-lang</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-aether</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.ops4j.pax.url</groupId>
-                    <artifactId>pax-url-maven-commons</artifactId>
+                    <artifactId>pax-url-commons</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -156,20 +142,23 @@
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-wrap</artifactId>
+            <classifier>uber</classifier>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.swissbox</groupId>
-            <artifactId>pax-swissbox-bnd</artifactId>
-            <exclusions>
                 <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.ops4j.base</groupId>
+                    <artifactId>ops4j-base-net</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ops4j.pax.swissbox</groupId>
+                    <artifactId>pax-swissbox-bnd</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ops4j.pax.url</groupId>
+                    <artifactId>pax-url-commons</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

http://git-wip-us.apache.org/repos/asf/karaf/blob/257144c2/assemblies/features/framework/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml
index 018959c..8234708 100644
--- a/assemblies/features/framework/src/main/feature/feature.xml
+++ b/assemblies/features/framework/src/main/feature/feature.xml
@@ -22,11 +22,8 @@
               including the correct start-level for the generation of the startup.propertie
file -->
 
     <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: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-aether/${pax.url.version}</bundle>
-        <bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}</bundle>
+        <bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}/jar/uber</bundle>
         <bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
         <bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/${pax.logging.version}</bundle>
         <bundle start="true" start-level="10">mvn:org.apache.karaf.service/org.apache.karaf.service.guard/${project.version}</bundle>

http://git-wip-us.apache.org/repos/asf/karaf/blob/257144c2/assemblies/features/standard/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index 9f2b96a..458d51c 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -184,6 +184,7 @@
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-obr</artifactId>
+            <classifier>uber</classifier>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -323,6 +324,7 @@
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-war</artifactId>
+            <classifier>uber</classifier>
             <scope>provided</scope>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/karaf/blob/257144c2/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 243ab52..7b7ccbe 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -71,15 +71,11 @@
     </feature>
 
     <feature name="obr" description="Provide OSGi Bundle Repository (OBR) support" version="${project.version}">
-        <bundle dependency="true" start-level="30">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
-        <bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
         <bundle start-level="30">mvn:org.apache.felix/org.osgi.service.obr/${felix.obr.version}</bundle>
         <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
         <bundle start-level="30">mvn:org.apache.karaf.obr/org.apache.karaf.obr.core/${project.version}</bundle>
         <bundle start-level="30">mvn:org.apache.karaf.obr/org.apache.karaf.obr.command/${project.version}</bundle>
-        <bundle start-level="30">mvn:org.ops4j.pax.swissbox/pax-swissbox-lifecycle/${pax.swissbox.version}</bundle>
-        <bundle start-level="30">mvn:org.ops4j.pax.swissbox/pax-swissbox-tracker/${pax.swissbox.version}</bundle>
-        <bundle start-level="30">mvn:org.ops4j.pax.url/pax-url-obr/${pax.url.version}</bundle>
+        <bundle start-level="30">mvn:org.ops4j.pax.url/pax-url-obr/${pax.url.version}/jar/uber</bundle>
         <bundle start-level="31">mvn:org.apache.karaf.features/org.apache.karaf.features.obr/${project.version}</bundle>
     </feature>
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/257144c2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9cb9ba5..60fd604 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1354,11 +1354,13 @@
                 <groupId>org.ops4j.pax.url</groupId>
                 <artifactId>pax-url-obr</artifactId>
                 <version>${pax.url.version}</version>
+                <classifier>uber</classifier>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.url</groupId>
                 <artifactId>pax-url-war</artifactId>
                 <version>${pax.url.version}</version>
+                <classifier>uber</classifier>
             </dependency>
 
             <dependency>
@@ -1425,6 +1427,7 @@
                 <groupId>org.ops4j.pax.url</groupId>
                 <artifactId>pax-url-wrap</artifactId>
                 <version>${pax.url.version}</version>
+                <classifier>uber</classifier>
             </dependency>
             <dependency>
                 <groupId>${servlet.spec.groupId}</groupId>

http://git-wip-us.apache.org/repos/asf/karaf/blob/257144c2/tooling/karaf-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index 9f6906b..4a47f8e 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -122,6 +122,7 @@
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-wrap</artifactId>
+            <classifier>uber</classifier>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>


Mime
View raw message