Add some dependencies in the dependencyManagement section
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c67b1ea7 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c67b1ea7 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c67b1ea7 Branch: refs/heads/master Commit: c67b1ea75eb377a957c8131d332cc197e299cbe3 Parents: c13c502 Author: Guillaume Nodet <[email protected]> Authored: Mon Apr 27 10:54:23 2015 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Mon Apr 27 11:18:03 2015 +0200 ---------------------------------------------------------------------- jaas/blueprint/jasypt/pom.xml | 6 +----- jaas/jasypt/pom.xml | 7 ++----- pom.xml | 17 +++++++++++++++++ services/maven-proxy/pom.xml | 2 -- 4 files changed, 20 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/c67b1ea7/jaas/blueprint/jasypt/pom.xml ---------------------------------------------------------------------- diff --git a/jaas/blueprint/jasypt/pom.xml b/jaas/blueprint/jasypt/pom.xml index 1dadac6..b3fc836 100644 --- a/jaas/blueprint/jasypt/pom.xml +++ b/jaas/blueprint/jasypt/pom.xml @@ -81,7 +81,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.connect</artifactId> - <version>0.1.0-SNAPSHOT</version> <scope>test</scope> </dependency> @@ -99,22 +98,19 @@ <dependency> <groupId>org.ow2.asm</groupId> - <artifactId>asm-debug-all</artifactId> - <version>5.0.3</version> + <artifactId>asm-all</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/karaf/blob/c67b1ea7/jaas/jasypt/pom.xml ---------------------------------------------------------------------- diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml index 8dfbe3b..f854acf 100644 --- a/jaas/jasypt/pom.xml +++ b/jaas/jasypt/pom.xml @@ -83,9 +83,8 @@ </dependency> <dependency> - <groupId>com.googlecode.pojosr</groupId> - <artifactId>de.kalpatec.pojosr.framework</artifactId> - <version>0.1.6</version> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.connect</artifactId> <scope>test</scope> </dependency> @@ -114,14 +113,12 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/karaf/blob/c67b1ea7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7b0f306..56b06bb 100644 --- a/pom.xml +++ b/pom.xml @@ -160,6 +160,7 @@ <equinox.coordinator.version>1.1.0.v20120522-1841</equinox.coordinator.version> <felix.bundlerepository.version>2.0.4</felix.bundlerepository.version> <felix.configadmin.version>1.8.3-SNAPSHOT</felix.configadmin.version> + <felix.connect.version>0.1.0-SNAPSHOT</felix.connect.version> <felix.fileinstall.version>3.5.0</felix.fileinstall.version> <felix.framework.version>4.9.0-SNAPSHOT</felix.framework.version> <felix.framework.security.version>2.4.0</felix.framework.security.version> @@ -987,6 +988,12 @@ <artifactId>org.apache.felix.resolver</artifactId> <version>${felix.resolver.version}</version> </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.connect</artifactId> + <version>${felix.connect.version}</version> + </dependency> + <dependency> <groupId>org.ow2.asm</groupId> @@ -1193,6 +1200,11 @@ <artifactId>jcl-over-slf4j</artifactId> <version>${slf4j.version}</version> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j.version}</version> + </dependency> <dependency> <groupId>org.ops4j.pax.logging</groupId> @@ -1624,6 +1636,11 @@ </dependency> <dependency> <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-jetty-bundle</artifactId> + <version>${pax.web.version}</version> + </dependency> + <dependency> + <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-jsp</artifactId> <version>${pax.web.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/karaf/blob/c67b1ea7/services/maven-proxy/pom.xml ---------------------------------------------------------------------- diff --git a/services/maven-proxy/pom.xml b/services/maven-proxy/pom.xml index 3ed1902..4c171a3 100644 --- a/services/maven-proxy/pom.xml +++ b/services/maven-proxy/pom.xml @@ -90,7 +90,6 @@ <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-jetty-bundle</artifactId> - <version>${pax.web.version}</version> <scope>test</scope> </dependency> <dependency> @@ -101,7 +100,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> <scope>test</scope> </dependency> </dependencies>
