You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2011/04/09 23:42:14 UTC
svn commit: r1090691 - in /karaf/trunk: ./ assemblies/apache-karaf/
assemblies/apache-karaf/src/main/descriptors/
assemblies/apache-karaf/src/main/filtered-resources/etc/
assemblies/features/framework/
assemblies/features/framework/src/main/feature/ sh...
Author: anierbeck
Date: Sat Apr 9 21:42:13 2011
New Revision: 1090691
URL: http://svn.apache.org/viewvc?rev=1090691&view=rev
Log:
[KARAF-529] - Upgrade to Pax URL 1.3.2 using pax-ur-aether for mvn: urls
Modified:
karaf/trunk/assemblies/apache-karaf/pom.xml
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
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
Modified: karaf/trunk/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/pom.xml?rev=1090691&r1=1090690&r2=1090691&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/pom.xml Sat Apr 9 21:42:13 2011
@@ -262,7 +262,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>
Modified: karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml?rev=1090691&r1=1090690&r2=1090691&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml Sat Apr 9 21:42:13 2011
@@ -153,7 +153,7 @@
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>
</includes>
</dependencySet>
Modified: karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml?rev=1090691&r1=1090690&r2=1090691&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml Sat Apr 9 21:42:13 2011
@@ -150,7 +150,7 @@
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>
</includes>
</dependencySet>
Modified: karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml?rev=1090691&r1=1090690&r2=1090691&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml Sat Apr 9 21:42:13 2011
@@ -144,7 +144,7 @@
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>
</includes>
</dependencySet>
Modified: karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml?rev=1090691&r1=1090690&r2=1090691&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml Sat Apr 9 21:42:13 2011
@@ -138,7 +138,7 @@
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>
</includes>
</dependencySet>
Modified: karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties?rev=1090691&r1=1090690&r2=1090691&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties Sat Apr 9 21:42:13 2011
@@ -23,7 +23,7 @@
#
# 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/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
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1090691&r1=1090690&r2=1090691&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Sat Apr 9 21:42:13 2011
@@ -33,7 +33,7 @@
<name>Apache Karaf :: Assemblies :: Framework KAR</name>
<properties>
- <appendedResourcesDirectory>$basedir}/../../../etc/appended-resources</appendedResourcesDirectory>
+ <appendedResourcesDirectory>${basedir}/../../../etc/appended-resources</appendedResourcesDirectory>
</properties>
<dependencies>
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
+ <artifactId>pax-url-aether</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
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=1090691&r1=1090690&r2=1090691&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Sat Apr 9 21:42:13 2011
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="framework">
<feature version="2.99.99-SNAPSHOT" name="karaf-framework">
- <bundle dependency="false" start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-mvn/${pax.url.version}</bundle>
+ <bundle dependency="false" start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
<bundle dependency="false" start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}</bundle>
<bundle dependency="false" start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
<bundle dependency="false" start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/${pax.logging.version}</bundle>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1090691&r1=1090690&r2=1090691&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sat Apr 9 21:42:13 2011
@@ -148,7 +148,7 @@
<pax.exam.version>1.2.4</pax.exam.version>
<pax.logging.version>1.6.1</pax.logging.version>
<pax.runner.version>1.6.1</pax.runner.version>
- <pax.url.version>1.3.2-RC2</pax.url.version>
+ <pax.url.version>1.3.2</pax.url.version>
<pax.web.version>1.1.0-SNAPSHOT</pax.web.version>
<pax.tinybundles.version>1.3.0</pax.tinybundles.version>
<servlet.api.version>2.5</servlet.api.version>
@@ -900,12 +900,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-wrap</artifactId>
<version>${pax.url.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-war</artifactId>
+ <artifactId>pax-url-aether</artifactId>
<version>${pax.url.version}</version>
</dependency>
<dependency>
Modified: karaf/trunk/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1090691&r1=1090690&r2=1090691&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Sat Apr 9 21:42:13 2011
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
+ <artifactId>pax-url-aether</artifactId>
<scope>provided</scope>
</dependency>
@@ -97,7 +97,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Embed-Dependency>pax-url-mvn</Embed-Dependency>
+ <Embed-Dependency>pax-url-aether</Embed-Dependency>
<Import-Package>
!${project.artifactId}*,
org.apache.felix.service.command,