You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2014/06/20 16:33:19 UTC
[1/5] git commit: Get itests working
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x c8912afb4 -> 1b92d7c78
Get itests working
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/1b92d7c7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1b92d7c7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1b92d7c7
Branch: refs/heads/karaf-2.x
Commit: 1b92d7c789a353612a7965fe34ed00c48400e08e
Parents: 0ad5d9f
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Fri Jun 20 10:02:37 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Jun 20 12:02:58 2014 -0230
----------------------------------------------------------------------
itests/pom.xml | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/1b92d7c7/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 0d67534..99e838d 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -38,7 +38,6 @@
</properties>
<dependencies>
-
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
@@ -47,26 +46,12 @@
<type>tar.gz</type>
<exclusions>
<exclusion>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.client</artifactId>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>zip</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.client</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
</dependency>
@@ -93,7 +78,10 @@
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<version>1.0</version>
</dependency>
-
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -122,6 +110,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
[2/5] git commit: Use uber bundle of pax-url-wrap
Posted by ja...@apache.org.
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 <ja...@gmail.com>
Authored: Tue Jun 17 12:22:39 2014 -0230
Committer: Jonathan Anstey <ja...@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}">
[5/5] git commit: KARAF-3031 - Upgrade to Pax URL 2.1.0
Posted by ja...@apache.org.
KARAF-3031 - Upgrade to Pax URL 2.1.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b95c6502
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b95c6502
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b95c6502
Branch: refs/heads/karaf-2.x
Commit: b95c65029d2c4014dc20ab6006cfd86fc5664770
Parents: e61248e
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Tue Jun 17 12:22:21 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Jun 20 12:02:58 2014 -0230
----------------------------------------------------------------------
pom.xml | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 69 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/b95c6502/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 66d827c..fe6f3fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,7 +202,7 @@
<pax.cdi.version>0.7.0</pax.cdi.version>
<pax.exam.version>3.5.0</pax.exam.version>
<pax.logging.version>1.7.2</pax.logging.version>
- <pax.url.version>2.0.0</pax.url.version>
+ <pax.url.version>2.1.0</pax.url.version>
<pax.swissbox.version>1.7.1</pax.swissbox.version>
<pax.web.version>3.0.7</pax.web.version>
<pax.tinybundles.version>1.3.2</pax.tinybundles.version>
@@ -937,30 +937,93 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-aether</artifactId>
+ <artifactId>pax-url-commons</artifactId>
<version>${pax.url.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
- <version>1.3.7</version>
+ <artifactId>pax-url-obr</artifactId>
+ <version>${pax.url.version}</version>
+ <classifier>uber</classifier>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-maven-commons</artifactId>
+ <artifactId>pax-url-war</artifactId>
<version>${pax.url.version}</version>
+ <classifier>uber</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${pax.url.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>aether-connector-wagon</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-aether-provider</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-file</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<version>${pax.url.version}</version>
+ <classifier>uber</classifier>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-war</artifactId>
+ <artifactId>pax-url-wrap</artifactId>
<version>${pax.url.version}</version>
</dependency>
<dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <version>1.3.7</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${geronimo.jms-spec.version}</version>
[4/5] git commit: Workaround for PAXURL-278
Posted by ja...@apache.org.
Workaround for PAXURL-278
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0ad5d9f6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0ad5d9f6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0ad5d9f6
Branch: refs/heads/karaf-2.x
Commit: 0ad5d9f6b0f6f2fc080e8a6e98da419aa78ab20c
Parents: 96cb761
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Fri Jun 20 10:01:12 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Jun 20 12:02:58 2014 -0230
----------------------------------------------------------------------
main/src/main/java/org/apache/karaf/main/Main.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/0ad5d9f6/main/src/main/java/org/apache/karaf/main/Main.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/Main.java b/main/src/main/java/org/apache/karaf/main/Main.java
index 59b89a4..784b6fd 100644
--- a/main/src/main/java/org/apache/karaf/main/Main.java
+++ b/main/src/main/java/org/apache/karaf/main/Main.java
@@ -766,7 +766,9 @@ public class Main {
location = nextLocation(st);
if (location != null) {
try {
- String[] parts = convertToMavenUrlsIfNeeded(location, convertToMavenUrls);
+ // TODO: Workaround for PAXURL-278
+ String[] parts = location.contains("pax-url-aether") ? convertToMavenUrlsIfNeeded(location, false)
+ : convertToMavenUrlsIfNeeded(location, convertToMavenUrls);
Bundle b = context.installBundle(parts[0], new URL(parts[1]).openStream());
sl.setBundleStartLevel(b, startLevel);
bundles.add(b);
[3/5] git commit: KARAF-3029 - Support encryption of Maven repo
passwords
Posted by ja...@apache.org.
KARAF-3029 - Support encryption of Maven repo passwords
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e61248ea
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e61248ea
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e61248ea
Branch: refs/heads/karaf-2.x
Commit: e61248ea825fa4453a1aaae7a6f1e7e168df792e
Parents: c8912af
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Tue Jun 17 12:21:31 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Jun 20 12:02:58 2014 -0230
----------------------------------------------------------------------
assemblies/apache-karaf/pom.xml | 2 +-
.../src/main/descriptors/unix-bin-release.xml | 33 ++++++++++++++-
.../src/main/descriptors/unix-bin-snapshot.xml | 44 +++++++++++++++++++-
.../descriptors/unix-minimal-bin-release.xml | 44 +++++++++++++++++++-
.../descriptors/unix-minimal-bin-snapshot.xml | 44 +++++++++++++++++++-
.../main/descriptors/windows-bin-release.xml | 44 +++++++++++++++++++-
.../main/descriptors/windows-bin-snapshot.xml | 44 +++++++++++++++++++-
.../descriptors/windows-minimal-bin-release.xml | 44 +++++++++++++++++++-
.../windows-minimal-bin-snapshot.xml | 44 +++++++++++++++++++-
.../release/etc/org.ops4j.pax.url.mvn.cfg | 2 +-
.../snapshot/etc/org.ops4j.pax.url.mvn.cfg | 2 +-
.../filtered-resources/etc/startup.properties | 13 +++++-
.../minimal/startup.properties | 3 +-
.../standard/src/main/resources/features.xml | 2 +-
etc/appended-resources/supplemental-models.xml | 4 +-
.../org/apache/karaf/main/MainStartTest.java | 2 +-
pom.xml | 14 ++++++-
tooling/features-maven-plugin/pom.xml | 2 +-
18 files changed, 367 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/assemblies/apache-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml
index dbb4250..c287222 100644
--- a/assemblies/apache-karaf/pom.xml
+++ b/assemblies/apache-karaf/pom.xml
@@ -277,7 +277,7 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
+ <artifactId>pax-url-aether</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
index 1c4657c..52a4475 100644
--- a/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
@@ -160,8 +160,39 @@
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.ops4j.pax.url:pax-url-mvn</include>
+ <include>org.ops4j.pax.url:pax-url-aether</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
+ <include>org.ops4j.pax.url:pax-url-commons</include>
+ <include>org.ops4j.pax.url:pax-url-maven-commons</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ org/ops4j/pax/swissbox/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-bnd</include>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-property</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ org/ops4j/base/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-util-property</include>
+ <include>org.ops4j.base:ops4j-base-util-xml</include>
+ <include>org.ops4j.base:ops4j-base-util-collections</include>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-net</include>
+ <include>org.ops4j.base:ops4j-base-monitors</include>
</includes>
</dependencySet>
<dependencySet>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
index 27b0142..e27e3c1 100644
--- a/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
@@ -160,8 +160,10 @@
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.ops4j.pax.url:pax-url-mvn</include>
+ <include>org.ops4j.pax.url:pax-url-aether</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
+ <include>org.ops4j.pax.url:pax-url-commons</include>
+ <include>org.ops4j.pax.url:pax-url-maven-commons</include>
</includes>
</dependencySet>
<dependencySet>
@@ -169,6 +171,46 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
+ org/ops4j/pax/swissbox/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-bnd</include>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-property</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ org/ops4j/base/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-util-property</include>
+ <include>org.ops4j.base:ops4j-base-util-xml</include>
+ <include>org.ops4j.base:ops4j-base-util-collections</include>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-net</include>
+ <include>org.ops4j.base:ops4j-base-monitors</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ biz/aQute/bnd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>biz.aQute.bnd:bndlib</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
index 38e94f1..26b1e7c 100644
--- a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
@@ -145,8 +145,10 @@
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.ops4j.pax.url:pax-url-mvn</include>
+ <include>org.ops4j.pax.url:pax-url-aether</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
+ <include>org.ops4j.pax.url:pax-url-commons</include>
+ <include>org.ops4j.pax.url:pax-url-maven-commons</include>
</includes>
</dependencySet>
<dependencySet>
@@ -154,6 +156,46 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
+ org/ops4j/pax/swissbox/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-bnd</include>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-property</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ org/ops4j/base/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-util-property</include>
+ <include>org.ops4j.base:ops4j-base-util-xml</include>
+ <include>org.ops4j.base:ops4j-base-util-collections</include>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-net</include>
+ <include>org.ops4j.base:ops4j-base-monitors</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ biz/aQute/bnd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>biz.aQute.bnd:bndlib</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
org/apache/karaf/management/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
index 2a01b4a..aba6c70 100644
--- a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
@@ -145,8 +145,10 @@
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.ops4j.pax.url:pax-url-mvn</include>
+ <include>org.ops4j.pax.url:pax-url-aether</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
+ <include>org.ops4j.pax.url:pax-url-commons</include>
+ <include>org.ops4j.pax.url:pax-url-maven-commons</include>
</includes>
</dependencySet>
<dependencySet>
@@ -154,6 +156,46 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
+ org/ops4j/pax/swissbox/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-bnd</include>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-property</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ org/ops4j/base/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-util-property</include>
+ <include>org.ops4j.base:ops4j-base-util-xml</include>
+ <include>org.ops4j.base:ops4j-base-util-collections</include>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-net</include>
+ <include>org.ops4j.base:ops4j-base-monitors</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ biz/aQute/bnd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>biz.aQute.bnd:bndlib</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
org/apache/karaf/management/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml
index ce68a81..8e8698d 100644
--- a/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml
@@ -168,8 +168,10 @@
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.ops4j.pax.url:pax-url-mvn</include>
+ <include>org.ops4j.pax.url:pax-url-aether</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
+ <include>org.ops4j.pax.url:pax-url-commons</include>
+ <include>org.ops4j.pax.url:pax-url-maven-commons</include>
</includes>
</dependencySet>
<dependencySet>
@@ -177,6 +179,46 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
+ org/ops4j/pax/swissbox/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-bnd</include>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-property</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ org/ops4j/base/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-util-property</include>
+ <include>org.ops4j.base:ops4j-base-util-xml</include>
+ <include>org.ops4j.base:ops4j-base-util-collections</include>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-net</include>
+ <include>org.ops4j.base:ops4j-base-monitors</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ biz/aQute/bnd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>biz.aQute.bnd:bndlib</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml
index 9b4c0b8..6827159 100644
--- a/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml
@@ -168,8 +168,10 @@
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.ops4j.pax.url:pax-url-mvn</include>
+ <include>org.ops4j.pax.url:pax-url-aether</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
+ <include>org.ops4j.pax.url:pax-url-commons</include>
+ <include>org.ops4j.pax.url:pax-url-maven-commons</include>
</includes>
</dependencySet>
<dependencySet>
@@ -177,6 +179,46 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
+ org/ops4j/pax/swissbox/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-bnd</include>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-property</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ org/ops4j/base/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-util-property</include>
+ <include>org.ops4j.base:ops4j-base-util-xml</include>
+ <include>org.ops4j.base:ops4j-base-util-collections</include>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-net</include>
+ <include>org.ops4j.base:ops4j-base-monitors</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ biz/aQute/bnd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>biz.aQute.bnd:bndlib</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml
index 6fe96bf..48174fc 100644
--- a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml
@@ -152,8 +152,10 @@
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.ops4j.pax.url:pax-url-mvn</include>
+ <include>org.ops4j.pax.url:pax-url-aether</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
+ <include>org.ops4j.pax.url:pax-url-commons</include>
+ <include>org.ops4j.pax.url:pax-url-maven-commons</include>
</includes>
</dependencySet>
<dependencySet>
@@ -161,6 +163,46 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
+ org/ops4j/pax/swissbox/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-bnd</include>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-property</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ org/ops4j/base/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-util-property</include>
+ <include>org.ops4j.base:ops4j-base-util-xml</include>
+ <include>org.ops4j.base:ops4j-base-util-collections</include>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-net</include>
+ <include>org.ops4j.base:ops4j-base-monitors</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ biz/aQute/bnd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>biz.aQute.bnd:bndlib</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
org/apache/karaf/management/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml
index 7114bf1..31a089c 100644
--- a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml
@@ -152,8 +152,10 @@
org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
- <include>org.ops4j.pax.url:pax-url-mvn</include>
+ <include>org.ops4j.pax.url:pax-url-aether</include>
<include>org.ops4j.pax.url:pax-url-wrap</include>
+ <include>org.ops4j.pax.url:pax-url-commons</include>
+ <include>org.ops4j.pax.url:pax-url-maven-commons</include>
</includes>
</dependencySet>
<dependencySet>
@@ -161,6 +163,46 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>
+ org/ops4j/pax/swissbox/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-bnd</include>
+ <include>org.ops4j.pax.swissbox:pax-swissbox-property</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ org/ops4j/base/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-util-property</include>
+ <include>org.ops4j.base:ops4j-base-util-xml</include>
+ <include>org.ops4j.base:ops4j-base-util-collections</include>
+ <include>org.ops4j.base:ops4j-base-lang</include>
+ <include>org.ops4j.base:ops4j-base-net</include>
+ <include>org.ops4j.base:ops4j-base-monitors</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
+ biz/aQute/bnd/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>biz.aQute.bnd:bndlib</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>
org/apache/karaf/management/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<includes>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/assemblies/apache-karaf/src/main/distribution/release/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/distribution/release/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/apache-karaf/src/main/distribution/release/etc/org.ops4j.pax.url.mvn.cfg
index 5a4896c..c47f2d7 100644
--- a/assemblies/apache-karaf/src/main/distribution/release/etc/org.ops4j.pax.url.mvn.cfg
+++ b/assemblies/apache-karaf/src/main/distribution/release/etc/org.ops4j.pax.url.mvn.cfg
@@ -60,7 +60,7 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false
# Disable aether support by default. This ensure that the defaultRepositories
# below will be used
#
-org.ops4j.pax.url.mvn.disableAether=true
+#org.ops4j.pax.url.mvn.disableAether=true
#
# Comma separated list of repositories scanned when resolving an artifact.
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/assemblies/apache-karaf/src/main/distribution/snapshot/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/distribution/snapshot/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/apache-karaf/src/main/distribution/snapshot/etc/org.ops4j.pax.url.mvn.cfg
index ce96091..208ec79 100644
--- a/assemblies/apache-karaf/src/main/distribution/snapshot/etc/org.ops4j.pax.url.mvn.cfg
+++ b/assemblies/apache-karaf/src/main/distribution/snapshot/etc/org.ops4j.pax.url.mvn.cfg
@@ -60,7 +60,7 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false
# Disable aether support by default. This ensure that the defaultRepositories
# below will be used
#
-org.ops4j.pax.url.mvn.disableAether=true
+#org.ops4j.pax.url.mvn.disableAether=true
#
# Comma separated list of repositories scanned when resolving an artifact.
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/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 138a26f..a923e60 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
+++ b/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
@@ -28,7 +28,10 @@
#
# Startup core services like logging
#
-org/ops4j/pax/url/pax-url-mvn/${pax.url.version}/pax-url-mvn-${pax.url.version}.jar=5
+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/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
@@ -36,6 +39,14 @@ org/apache/karaf/service/org.apache.karaf.service.guard/${project.version}/org.a
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/e61248ea/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 6a69fc1..9325121 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
+++ b/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
@@ -23,7 +23,8 @@
#
# Startup core services like logging
#
-org/ops4j/pax/url/pax-url-mvn/${pax.url.version}/pax-url-mvn-${pax.url.version}.jar=5
+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/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
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/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 9eabb7b..9c931eb 100644
--- a/assemblies/features/standard/src/main/resources/features.xml
+++ b/assemblies/features/standard/src/main/resources/features.xml
@@ -21,7 +21,7 @@
<repository>mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features</repository>
<feature name="karaf-framework" description="Karaf core feature" version="${project.version}" resolver="(obr)">
- <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-mvn/${pax.url.version}</bundle>
+ <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="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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/etc/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/etc/appended-resources/supplemental-models.xml b/etc/appended-resources/supplemental-models.xml
index 383f61d..c860e0d 100644
--- a/etc/appended-resources/supplemental-models.xml
+++ b/etc/appended-resources/supplemental-models.xml
@@ -1157,9 +1157,9 @@
<supplement>
<project>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
+ <artifactId>pax-url-aether</artifactId>
<name>OPS4J Pax Url - mvn:</name>
- <url>http://www.ops4j.org/projects/pax/url/pax-url-mvn</url>
+ <url>http://www.ops4j.org/projects/pax/url/pax-url-aether</url>
<organization>
<name>OPS4J - Open Participation Software for Java</name>
<url>http://www.ops4j.org/</url>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/main/src/test/java/org/apache/karaf/main/MainStartTest.java
----------------------------------------------------------------------
diff --git a/main/src/test/java/org/apache/karaf/main/MainStartTest.java b/main/src/test/java/org/apache/karaf/main/MainStartTest.java
index a5f991b..eb9b956 100644
--- a/main/src/test/java/org/apache/karaf/main/MainStartTest.java
+++ b/main/src/test/java/org/apache/karaf/main/MainStartTest.java
@@ -42,7 +42,7 @@ public class MainStartTest {
File data = new File(home, "data" + System.currentTimeMillis());
String[] args = new String[0];
- String fileMVNbundle = new File(home, "bundles/pax-url-mvn.jar").toURI().toURL().toExternalForm();
+ String fileMVNbundle = new File(home, "bundles/pax-url-aether.jar").toURI().toURL().toExternalForm();
String mvnUrl = "mvn:org.osgi/org.osgi.compendium/4.2.0";
System.setProperty("karaf.home", home.toString());
System.setProperty("karaf.data", data.toString());
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5de6942..66d827c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,9 +200,9 @@
<org.json.version>20131018</org.json.version>
<pax.base.version>1.4.0</pax.base.version>
<pax.cdi.version>0.7.0</pax.cdi.version>
- <pax.exam.version>3.4.0</pax.exam.version>
+ <pax.exam.version>3.5.0</pax.exam.version>
<pax.logging.version>1.7.2</pax.logging.version>
- <pax.url.version>1.3.7</pax.url.version>
+ <pax.url.version>2.0.0</pax.url.version>
<pax.swissbox.version>1.7.1</pax.swissbox.version>
<pax.web.version>3.0.7</pax.web.version>
<pax.tinybundles.version>1.3.2</pax.tinybundles.version>
@@ -937,7 +937,17 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${pax.url.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-mvn</artifactId>
+ <version>1.3.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-maven-commons</artifactId>
<version>${pax.url.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e61248ea/tooling/features-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/features-maven-plugin/pom.xml b/tooling/features-maven-plugin/pom.xml
index c5b297c..59d0ff6 100644
--- a/tooling/features-maven-plugin/pom.xml
+++ b/tooling/features-maven-plugin/pom.xml
@@ -74,7 +74,7 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
+ <artifactId>pax-url-aether</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.deployer</groupId>