Repository: karaf Updated Branches: refs/heads/karaf-3.0.x a560a0bbb -> 4a3d1b0da
[KARAF-3198] Remove pax-swissbox-* dependencies (no more required with pax-url uber bundles) Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4a3d1b0d Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4a3d1b0d Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4a3d1b0d Branch: refs/heads/karaf-3.0.x Commit: 4a3d1b0daea4a709fbaa55103041bf61be6f7841 Parents: a560a0b Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Sep 2 11:55:57 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Sep 2 11:55:57 2014 +0200 ---------------------------------------------------------------------- assemblies/features/standard/pom.xml | 20 -------------------- kar/core/pom.xml | 6 +----- pom.xml | 22 ---------------------- 3 files changed, 1 insertion(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/4a3d1b0d/assemblies/features/standard/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index 71058ed..c4e636e 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -172,16 +172,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-lifecycle</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-tracker</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-obr</artifactId> <classifier>uber</classifier> @@ -333,16 +323,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-bnd</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-property</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>bndlib</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/karaf/blob/4a3d1b0d/kar/core/pom.xml ---------------------------------------------------------------------- diff --git a/kar/core/pom.xml b/kar/core/pom.xml index ea9d6fe..976a08b 100644 --- a/kar/core/pom.xml +++ b/kar/core/pom.xml @@ -61,10 +61,6 @@ <artifactId>pax-url-aether</artifactId> </dependency> <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-property</artifactId> - </dependency> - <dependency> <groupId>org.apache.karaf.features</groupId> <artifactId>org.apache.karaf.features.core</artifactId> <scope>provided</scope> @@ -112,4 +108,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/karaf/blob/4a3d1b0d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c7ee7e2..bf55442 100644 --- a/pom.xml +++ b/pom.xml @@ -228,7 +228,6 @@ <pax.base.version>1.4.0</pax.base.version> <pax.url.version>2.1.0</pax.url.version> <pax.web.version>3.1.2-SNAPSHOT</pax.web.version> - <pax.swissbox.version>1.7.0</pax.swissbox.version> <pax.tinybundle.version>2.0.0</pax.tinybundle.version> <portlet-api.version>2.0</portlet-api.version> <slf4j.version>1.7.7</slf4j.version> @@ -1301,27 +1300,6 @@ </dependency> <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.url</groupId> <artifactId>pax-url-commons</artifactId> <version>${pax.url.version}</version>
