You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/03/06 21:31:14 UTC
svn commit: r1297694 - in /karaf/trunk: assemblies/features/framework/pom.xml
assemblies/features/framework/src/main/feature/feature.xml pom.xml
shell/dev/pom.xml
shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java
Author: jbonofre
Date: Tue Mar 6 20:31:13 2012
New Revision: 1297694
URL: http://svn.apache.org/viewvc?rev=1297694&view=rev
Log:
Upgrade to pax-url 1.4-SNAPSHOT in order to import pax-url-aether in shell dev
Modified:
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
karaf/trunk/pom.xml
karaf/trunk/shell/dev/pom.xml
karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1297694&r1=1297693&r2=1297694&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Tue Mar 6 20:31:13 2012
@@ -95,6 +95,16 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-maven-commons</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<exclusions>
<exclusion>
Modified: karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml?rev=1297694&r1=1297693&r2=1297694&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Tue Mar 6 20:31:13 2012
@@ -26,6 +26,7 @@
<bundle start="true" start-level="5">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit3.bundle.version}</bundle>
<bundle start="true" start-level="5">mvn:biz.aQute/bndlib/${bndlib.version}</bundle>
<bundle start="true" start-level="5">mvn:org.ops4j.pax.swissbox/pax-swissbox-bnd/${pax.swissbox.version}</bundle>
+ <bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-maven-commons/${pax.url.version}</bundle>
<bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
<bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}</bundle>
<bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1297694&r1=1297693&r2=1297694&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Mar 6 20:31:13 2012
@@ -186,7 +186,7 @@
<pax.logging.version>1.6.5</pax.logging.version>
<pax.runner.version>1.7.5</pax.runner.version>
<pax.base.version>1.3.0</pax.base.version>
- <pax.url.version>1.4.0.RC1</pax.url.version>
+ <pax.url.version>1.4-SNAPSHOT</pax.url.version>
<pax.web.version>2.0.0-SNAPSHOT</pax.web.version>
<pax.swissbox.version>1.5.0</pax.swissbox.version>
<pax.tinybundle.version>1.0.0</pax.tinybundle.version>
@@ -1075,6 +1075,11 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-maven-commons</artifactId>
+ <version>${pax.url.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>${pax.url.version}</version>
<exclusions>
@@ -1129,16 +1134,16 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${servlet.spec.groupId}</groupId>
- <artifactId>${servlet.spec.artifactId}</artifactId>
- <version>${servlet.spec.version}</version>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<version>${pax.url.version}</version>
</dependency>
<dependency>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <version>${servlet.spec.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easymock.version}</version>
Modified: karaf/trunk/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1297694&r1=1297693&r2=1297694&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Tue Mar 6 20:31:13 2012
@@ -98,7 +98,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Embed-Dependency>pax-url-aether</Embed-Dependency>
<Import-Package>
!${project.artifactId}.*,
!junit.framework,
@@ -119,13 +118,15 @@
org.apache.felix.service.command,
org.apache.karaf.shell.commands,
org.apache.karaf.shell.console,
+ org.ops4j.pax.url.mvn,
+ org.ops4j.pax.url.maven.commons,
+ org.ops4j.util.property,
*
</Import-Package>
<Private-Package>
org.apache.felix.utils.manifest,
org.apache.felix.utils.version,
org.apache.felix.utils.properties,
- org.ops4j.pax.url.mvn,
!*
</Private-Package>
</instructions>
Modified: karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java?rev=1297694&r1=1297693&r2=1297694&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java (original)
+++ karaf/trunk/shell/dev/src/main/java/org/apache/karaf/shell/dev/watch/BundleWatcher.java Tue Mar 6 20:31:13 2012
@@ -34,7 +34,7 @@ import org.ops4j.pax.url.maven.commons.M
import org.ops4j.pax.url.maven.commons.MavenConfigurationImpl;
import org.ops4j.pax.url.maven.commons.MavenRepositoryURL;
import org.ops4j.pax.url.mvn.ServiceConstants;
-import org.ops4j.pax.url.mvn.internal.Parser;
+import org.ops4j.pax.url.mvn.Parser;
import org.ops4j.util.property.DictionaryPropertyResolver;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;