Repository: karaf Updated Branches: refs/heads/karaf-2.x 313324a7a -> d70368b92
[KARAF-3198] Cleanup Pax Swissbox dependencies Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d70368b9 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d70368b9 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d70368b9 Branch: refs/heads/karaf-2.x Commit: d70368b921f6856826608e5fd6154bc6b1ad8b2f Parents: 313324a Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Sep 3 08:38:22 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Sep 3 08:38:22 2014 +0200 ---------------------------------------------------------------------- .../src/main/descriptors/unix-bin-release.xml | 12 --- .../src/main/descriptors/unix-bin-snapshot.xml | 12 --- .../descriptors/unix-minimal-bin-release.xml | 12 --- .../descriptors/unix-minimal-bin-snapshot.xml | 12 --- .../main/descriptors/windows-bin-release.xml | 12 --- .../main/descriptors/windows-bin-snapshot.xml | 12 --- .../descriptors/windows-minimal-bin-release.xml | 12 --- .../windows-minimal-bin-snapshot.xml | 12 --- etc/appended-resources/supplemental-models.xml | 90 -------------------- pom.xml | 21 ----- 10 files changed, 207 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d70368b9/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 52a4475..dde08b2 100644 --- a/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml +++ b/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml @@ -171,18 +171,6 @@ <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> http://git-wip-us.apache.org/repos/asf/karaf/blob/d70368b9/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 e27e3c1..1213fab 100644 --- a/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml +++ b/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml @@ -171,18 +171,6 @@ <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> http://git-wip-us.apache.org/repos/asf/karaf/blob/d70368b9/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 26b1e7c..8396452 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 @@ -156,18 +156,6 @@ <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> http://git-wip-us.apache.org/repos/asf/karaf/blob/d70368b9/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 aba6c70..3e5e7e8 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 @@ -156,18 +156,6 @@ <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> http://git-wip-us.apache.org/repos/asf/karaf/blob/d70368b9/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 8e8698d..52a580e 100644 --- a/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml +++ b/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml @@ -179,18 +179,6 @@ <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> http://git-wip-us.apache.org/repos/asf/karaf/blob/d70368b9/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 6827159..6635b1b 100644 --- a/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml +++ b/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml @@ -179,18 +179,6 @@ <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> http://git-wip-us.apache.org/repos/asf/karaf/blob/d70368b9/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 48174fc..9a7d78d 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 @@ -163,18 +163,6 @@ <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> http://git-wip-us.apache.org/repos/asf/karaf/blob/d70368b9/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 31a089c..857bcad 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 @@ -163,18 +163,6 @@ <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> http://git-wip-us.apache.org/repos/asf/karaf/blob/d70368b9/etc/appended-resources/supplemental-models.xml ---------------------------------------------------------------------- diff --git a/etc/appended-resources/supplemental-models.xml b/etc/appended-resources/supplemental-models.xml index c860e0d..73af7f8 100644 --- a/etc/appended-resources/supplemental-models.xml +++ b/etc/appended-resources/supplemental-models.xml @@ -1066,96 +1066,6 @@ </supplement> <supplement> <project> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-core</artifactId> - <name>OPS4J Pax Swissbox - OSGi Core</name> - <url>http://www.ops4j.org/projects/pax/swissbox/pax-swissbox-core</url> - <organization> - <name>OPS4J - Open Participation Software for Java</name> - <url>http://www.ops4j.org/</url> - </organization> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-extender</artifactId> - <name>OPS4J Pax Swissbox - Extender</name> - <url>http://www.ops4j.org/projects/pax/swissbox/pax-swissbox-extender</url> - <organization> - <name>OPS4J - Open Participation Software for Java</name> - <url>http://www.ops4j.org/</url> - </organization> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-lifecycle</artifactId> - <name>OPS4J Pax Swissbox - Lifecycle</name> - <url>http://www.ops4j.org/projects/pax/swissbox/pax-swissbox-lifecycle</url> - <organization> - <name>OPS4J - Open Participation Software for Java</name> - <url>http://www.ops4j.org/</url> - </organization> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-optional-jcl</artifactId> - <name>OPS4J Pax Swissbox - Optional JCL</name> - <url>http://www.ops4j.org/projects/pax/swissbox/pax-swissbox-optional-jcl</url> - <organization> - <name>OPS4J - Open Participation Software for Java</name> - <url>http://www.ops4j.org/</url> - </organization> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-tracker</artifactId> - <name>OPS4J Pax Swissbox - Tracker</name> - <url>http://www.ops4j.org/projects/pax/swissbox/pax-swissbox-tracker</url> - <organization> - <name>OPS4J - Open Participation Software for Java</name> - <url>http://www.ops4j.org/</url> - </organization> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> <name>OPS4J Pax Url - mvn:</name> http://git-wip-us.apache.org/repos/asf/karaf/blob/d70368b9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 684e795..7e9d9e0 100644 --- a/pom.xml +++ b/pom.xml @@ -1111,27 +1111,6 @@ <dependency> <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-bnd</artifactId> - <version>${pax.swissbox.version}</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-lifecycle</artifactId> - <version>${pax.swissbox.version}</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-property</artifactId> - <version>${pax.swissbox.version}</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-tracker</artifactId> - <version>${pax.swissbox.version}</version> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> <artifactId>pax-swissbox-tinybundles</artifactId> <version>${pax.tinybundles.version}</version> </dependency>
