Use uber bundle of pax-url-wrap
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/96cb761b Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/96cb761b Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/96cb761b Branch: refs/heads/karaf-2.x Commit: 96cb761b0e8ff52f2275067a4659333c58c993d6 Parents: b95c650 Author: Jonathan Anstey <jans...@gmail.com> Authored: Tue Jun 17 12:22:39 2014 -0230 Committer: Jonathan Anstey <jans...@gmail.com> Committed: Fri Jun 20 12:02:58 2014 -0230 ---------------------------------------------------------------------- assemblies/apache-karaf/pom.xml | 1 + .../src/main/filtered-resources/etc/startup.properties | 13 +------------ .../main/filtered-resources/minimal/startup.properties | 3 +-- .../features/standard/src/main/resources/features.xml | 4 ++-- 4 files changed, 5 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/96cb761b/assemblies/apache-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index c287222..ddc428b 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -282,6 +282,7 @@ <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-wrap</artifactId> + <classifier>uber</classifier> </dependency> <dependency> <groupId>org.apache.sshd</groupId> http://git-wip-us.apache.org/repos/asf/karaf/blob/96cb761b/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties b/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties index a923e60..45a4bac 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties +++ b/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties @@ -28,25 +28,14 @@ # # Startup core services like logging # -org/ops4j/base/ops4j-base-lang/${pax.base.version}/ops4j-base-lang-${pax.base.version}.jar=5 -biz/aQute/bnd/bndlib/${bndlib.version}/bndlib-${bndlib.version}.jar=5 -org/ops4j/pax/swissbox/pax-swissbox-bnd/${pax.swissbox.version}/pax-swissbox-bnd-${pax.swissbox.version}.jar=5 org/ops4j/pax/url/pax-url-aether/${pax.url.version}/pax-url-aether-${pax.url.version}.jar=5 -org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}.jar=5 +org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}-uber.jar=5 org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar=8 org/ops4j/pax/logging/pax-logging-service/${pax.logging.version}/pax-logging-service-${pax.logging.version}.jar=8 org/apache/karaf/service/org.apache.karaf.service.guard/${project.version}/org.apache.karaf.service.guard-${project.version}.jar=10 org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10 org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=11 -org/ops4j/base/ops4j-base-util-property/${pax.base.version}/ops4j-base-util-property-${pax.base.version}.jar=20 -org/ops4j/base/ops4j-base-util-xml/${pax.base.version}/ops4j-base-util-xml-${pax.base.version}.jar=20 -org/ops4j/base/ops4j-base-util-collections/${pax.base.version}/ops4j-base-util-collections-${pax.base.version}.jar=20 -org/ops4j/pax/url/pax-url-commons/${pax.url.version}/pax-url-commons-${pax.url.version}.jar=20 -org/ops4j/pax/swissbox/pax-swissbox-property/${pax.swissbox.version}/pax-swissbox-property-${pax.swissbox.version}.jar=20 -org/ops4j/base/ops4j-base-net/${pax.base.version}/ops4j-base-net-${pax.base.version}.jar=20 -org/ops4j/base/ops4j-base-monitors/${pax.base.version}/ops4j-base-monitors-${pax.base.version}.jar=20 - # # The rest of the services.. # http://git-wip-us.apache.org/repos/asf/karaf/blob/96cb761b/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties b/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties index 9325121..fd4ef83 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties +++ b/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties @@ -23,9 +23,8 @@ # # Startup core services like logging # -org/ops4j/base/ops4j-base-lang/${pax.base.version}/ops4j-base-lang-${pax.base.version}.jar=5 org/ops4j/pax/url/pax-url-aether/${pax.url.version}/pax-url-aether-${pax.url.version}.jar=5 -org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}.jar=5 +org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}-uber.jar=5 org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar=8 org/ops4j/pax/logging/pax-logging-service/${pax.logging.version}/pax-logging-service-${pax.logging.version}.jar=8 org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10 http://git-wip-us.apache.org/repos/asf/karaf/blob/96cb761b/assemblies/features/standard/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/src/main/resources/features.xml b/assemblies/features/standard/src/main/resources/features.xml index 9c931eb..287b98a 100644 --- a/assemblies/features/standard/src/main/resources/features.xml +++ b/assemblies/features/standard/src/main/resources/features.xml @@ -22,7 +22,7 @@ <feature name="karaf-framework" description="Karaf core feature" version="${project.version}" resolver="(obr)"> <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle> - <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}</bundle> + <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}/jar/uber</bundle> <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle> <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/${pax.logging.version}</bundle> <bundle start-level="10">mvn:org.apache.karaf.service/org.apache.karaf.service.guard/${project.version}</bundle> @@ -68,7 +68,7 @@ <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/${project.version}</bundle> <bundle start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.obr/${project.version}</bundle> <bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.obr/${project.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> </feature> <feature name="config" description="Provide OSGi ConfigAdmin support" version="${project.version}">
