Repository: karaf Updated Branches: refs/heads/karaf-3.0.x f4c76ae3d -> 57c60c211
[KARAF-2889] Downgrade to Equinox 3.8.2 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/57c60c21 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/57c60c21 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/57c60c21 Branch: refs/heads/karaf-3.0.x Commit: 57c60c211faf6cceacd7da0fe44380c6873438c7 Parents: f4c76ae Author: Jean-Baptiste Onofré <jbono...@apache.org> Authored: Thu Jul 3 07:53:09 2014 +0200 Committer: Jean-Baptiste Onofré <jbono...@apache.org> Committed: Thu Jul 3 07:53:09 2014 +0200 ---------------------------------------------------------------------- assemblies/features/framework/pom.xml | 6 +++--- .../main/filtered-resources/resources/etc/config.properties | 2 +- pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/57c60c21/assemblies/features/framework/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml index dc649d7..1622ac7 100644 --- a/assemblies/features/framework/pom.xml +++ b/assemblies/features/framework/pom.xml @@ -61,7 +61,7 @@ </dependency> <dependency> <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> + <artifactId>org.eclipse.osgi</artifactId> <scope>runtime</scope> </dependency> <dependency> @@ -369,8 +369,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> http://git-wip-us.apache.org/repos/asf/karaf/blob/57c60c21/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties index 26c98de..4452247 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties +++ b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties @@ -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} # http://git-wip-us.apache.org/repos/asf/karaf/blob/57c60c21/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c6ef522..f9f6bcb 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ <geronimo.annotation-spec.version>1.0.1</geronimo.annotation-spec.version> <geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version> <easymock.version>3.2</easymock.version> - <equinox.version>3.9.1-v20140110-1610</equinox.version> + <equinox.version>3.8.2.v20130124-134944</equinox.version> <bndlib.version>2.2.0</bndlib.version> <equinox.region.version>1.0.0.v20110506</equinox.region.version> <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version> @@ -1486,7 +1486,7 @@ </dependency> <dependency> <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> + <artifactId>org.eclipse.osgi</artifactId> <version>${equinox.version}</version> </dependency>
