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 <[email protected]> Authored: Tue Jun 17 12:21:31 2014 -0230 Committer: Jonathan Anstey <[email protected]> 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>
