Repository: karaf Updated Branches: refs/heads/karaf-2.3.x 1ff763635 -> 5d634aae7
[KARAF-3063] Fix equinox mvn URL Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5d634aae Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5d634aae Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5d634aae Branch: refs/heads/karaf-2.3.x Commit: 5d634aae76dbac983ba16231eca3930114489e3a Parents: 1ff7636 Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Jun 20 17:53:37 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Jun 20 17:53:37 2014 +0200 ---------------------------------------------------------------------- assemblies/apache-karaf/pom.xml | 2 +- assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml | 2 +- assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml | 2 +- .../apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml | 2 +- .../src/main/descriptors/unix-minimal-bin-snapshot.xml | 2 +- .../apache-karaf/src/main/descriptors/windows-bin-release.xml | 2 +- .../apache-karaf/src/main/descriptors/windows-bin-snapshot.xml | 2 +- .../src/main/descriptors/windows-minimal-bin-release.xml | 2 +- .../src/main/descriptors/windows-minimal-bin-snapshot.xml | 2 +- .../apache-karaf/src/main/filtered-resources/etc/config.properties | 2 +- main/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/assemblies/apache-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index b4d2c94..a2a2166 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -280,7 +280,7 @@ </dependency> <dependency> <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> + <artifactId>org.eclipse.osgi</artifactId> </dependency> <dependency> <groupId>org.apache.felix</groupId> http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml index 48ca81f..baf0f57 100644 --- a/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml +++ b/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml @@ -254,7 +254,7 @@ org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} </outputFileNameMapping> <includes> - <include>org.eclipse:osgi</include> + <include>org.eclipse:org.eclipse.osgi</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml index 51d6579..e3b0096 100644 --- a/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml +++ b/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml @@ -254,7 +254,7 @@ org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} </outputFileNameMapping> <includes> - <include>org.eclipse:osgi</include> + <include>org.eclipse:org.eclipse.osgi</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml index 0292ced..caee69e 100644 --- a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml +++ b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml @@ -224,7 +224,7 @@ org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} </outputFileNameMapping> <includes> - <include>org.eclipse:osgi</include> + <include>org.eclipse:org.eclipse.osgi</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml index b6baf0a..2c4365b 100644 --- a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml +++ b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml @@ -224,7 +224,7 @@ org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} </outputFileNameMapping> <includes> - <include>org.eclipse:osgi</include> + <include>org.eclipse:org.eclipse.osgi</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml index f50894f..c29ff03 100644 --- a/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml +++ b/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml @@ -262,7 +262,7 @@ org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} </outputFileNameMapping> <includes> - <include>org.eclipse:osgi</include> + <include>org.eclipse:org.eclipse.osgi</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml index d7ae76a..4a2675c 100644 --- a/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml +++ b/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml @@ -262,7 +262,7 @@ org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} </outputFileNameMapping> <includes> - <include>org.eclipse:osgi</include> + <include>org.eclipse:org.eclipse.osgi</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml index 2fa7a83..3c64f93 100644 --- a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml +++ b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml @@ -232,7 +232,7 @@ org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} </outputFileNameMapping> <includes> - <include>org.eclipse:osgi</include> + <include>org.eclipse:org.eclipse.osgi</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml index 2de2aeb..e2b1fbc 100644 --- a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml +++ b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml @@ -232,7 +232,7 @@ org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} </outputFileNameMapping> <includes> - <include>org.eclipse:osgi</include> + <include>org.eclipse:org.eclipse.osgi</include> </includes> </dependencySet> <dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties b/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties index 43a767e..80237f7 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties +++ b/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties @@ -50,7 +50,7 @@ karaf.framework=felix # # Location of the OSGi frameworks # -karaf.framework.equinox=${karaf.default.repository}/org/eclipse/osgi/${equinox.version}/osgi-${equinox.version}.jar +karaf.framework.equinox=${karaf.default.repository}/org/eclipse/org.eclipse.osgi/${equinox.version}/org.eclipse.osgi-${equinox.version}.jar karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar # http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/main/pom.xml ---------------------------------------------------------------------- diff --git a/main/pom.xml b/main/pom.xml index 8b27cc7..80a03f1 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -40,7 +40,7 @@ <dependencies> <dependency> <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> + <artifactId>org.eclipse.osgi</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/karaf/blob/5d634aae/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0c42653..52d0cb9 100644 --- a/pom.xml +++ b/pom.xml @@ -1078,7 +1078,7 @@ <dependency> <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> + <artifactId>org.eclipse.osgi</artifactId> <version>${equinox.version}</version> </dependency> <dependency>
