You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2013/07/17 11:27:15 UTC
svn commit: r1504062 - in /karaf/trunk: assemblies/features/framework/pom.xml
assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
pom.xml
Author: ffang
Date: Wed Jul 17 09:27:14 2013
New Revision: 1504062
URL: http://svn.apache.org/r1504062
Log:
[KARAF-2397]Replace usages of non-standard org.eclipse:osgi with org.eclipse:org.eclipse.osgi
Modified:
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1504062&r1=1504061&r2=1504062&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Wed Jul 17 09:27:14 2013
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
+ <artifactId>org.eclipse.osgi</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -362,8 +362,8 @@
</artifactItem>
<artifactItem>
<groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <outputDirectory>target/classes/resources/system/org/eclipse/osgi/${equinox.version}</outputDirectory>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <outputDirectory>target/classes/resources/system/org/eclipse/org.eclipse.osgi/${equinox.version}</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix</groupId>
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties?rev=1504062&r1=1504061&r2=1504062&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties Wed Jul 17 09:27:14 2013
@@ -50,7 +50,7 @@ karaf.framework=felix
#
# Location of the OSGi frameworks
#
-karaf.framework.equinox=mvn\:org.eclipse/osgi/${equinox.version}
+karaf.framework.equinox=mvn\:org.eclipse/org.eclipse.osgi/${equinox.version}
karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/${felix.framework.version}
#
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1504062&r1=1504061&r2=1504062&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Jul 17 09:27:14 2013
@@ -1479,7 +1479,7 @@
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
+ <artifactId>org.eclipse.osgi</artifactId>
<version>${equinox.version}</version>
</dependency>
<dependency>