[KARAF-2903] Upgrade to gemini blueprint 1.0.2 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ce0f75d3 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ce0f75d3 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ce0f75d3
Branch: refs/heads/master Commit: ce0f75d30e5c214a03e3195fb01c48c5219ede1b Parents: bf00db9 Author: Guillaume Nodet <gno...@gmail.com> Authored: Mon Apr 14 11:03:48 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Mon Apr 14 11:03:48 2014 +0200 ---------------------------------------------------------------------- assemblies/features/spring/pom.xml | 12 ++++----- .../spring/src/main/feature/feature.xml | 6 ++--- pom.xml | 27 ++++++++++++++------ 3 files changed, 28 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/ce0f75d3/assemblies/features/spring/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml index a37137e..2112070 100644 --- a/assemblies/features/spring/pom.xml +++ b/assemblies/features/spring/pom.xml @@ -255,13 +255,13 @@ <!-- gemini-blueprint deps --> <dependency> - <groupId>org.eclipse.gemini.blueprint</groupId> - <artifactId>gemini-blueprint-io</artifactId> + <groupId>org.eclipse.gemini</groupId> + <artifactId>org.eclipse.gemini.blueprint.io</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.gemini.blueprint</groupId> - <artifactId>gemini-blueprint-core</artifactId> + <groupId>org.eclipse.gemini</groupId> + <artifactId>org.eclipse.gemini.blueprint.core</artifactId> <scope>provided</scope> <exclusions> <exclusion> @@ -283,8 +283,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.eclipse.gemini.blueprint</groupId> - <artifactId>gemini-blueprint-extender</artifactId> + <groupId>org.eclipse.gemini</groupId> + <artifactId>org.eclipse.gemini.blueprint.extender</artifactId> <scope>provided</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/karaf/blob/ce0f75d3/assemblies/features/spring/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml index 768d9c3..5917225 100644 --- a/assemblies/features/spring/src/main/feature/feature.xml +++ b/assemblies/features/spring/src/main/feature/feature.xml @@ -284,9 +284,9 @@ <feature name="gemini-blueprint" description="Gemini Blueprint Extender" version="${gemini.blueprint.version}" resolver="(obr)"> <feature version="[3,4)">spring</feature> - <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-io/${gemini.blueprint.version}</bundle> - <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-core/${gemini.blueprint.version}</bundle> - <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-extender/${gemini.blueprint.version}</bundle> + <bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.io/${gemini.blueprint.version}</bundle> + <bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.core/${gemini.blueprint.version}</bundle> + <bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/${gemini.blueprint.version}</bundle> </feature> </features> http://git-wip-us.apache.org/repos/asf/karaf/blob/ce0f75d3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6a0dcb4..c701331 100644 --- a/pom.xml +++ b/pom.xml @@ -206,7 +206,7 @@ <aries.transaction.jdbc.version>1.0.0</aries.transaction.jdbc.version> <aries.util.version>1.1.0</aries.util.version> - <gemini.blueprint.version>1.0.0.RELEASE</gemini.blueprint.version> + <gemini.blueprint.version>1.0.2.RELEASE</gemini.blueprint.version> <hibernate.annotations.common.version>3.3.0.ga</hibernate.annotations.common.version> <hibernate.annotations.version>3.4.0.GA</hibernate.annotations.version> <hibernate.ejb.version>3.4.0.GA</hibernate.ejb.version> @@ -315,7 +315,18 @@ <repository> <id>zodiac-repository</id> <name>Zodiac Release Repository</name> - <url>http://zodiac.springsource.com/maven/bundles/release</url> + <url>http://repository.springsource.com/maven/bundles/release</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>spring-ebr-repository</id> + <name>Spring EBR Repository</name> + <url>http://repository.springsource.com/maven/bundles/external</url> <releases> <enabled>true</enabled> </releases> @@ -1119,18 +1130,18 @@ </dependency> <dependency> - <groupId>org.eclipse.gemini.blueprint</groupId> - <artifactId>gemini-blueprint-io</artifactId> + <groupId>org.eclipse.gemini</groupId> + <artifactId>org.eclipse.gemini.blueprint.extender</artifactId> <version>${gemini.blueprint.version}</version> </dependency> <dependency> - <groupId>org.eclipse.gemini.blueprint</groupId> - <artifactId>gemini-blueprint-core</artifactId> + <groupId>org.eclipse.gemini</groupId> + <artifactId>org.eclipse.gemini.blueprint.core</artifactId> <version>${gemini.blueprint.version}</version> </dependency> <dependency> - <groupId>org.eclipse.gemini.blueprint</groupId> - <artifactId>gemini-blueprint-extender</artifactId> + <groupId>org.eclipse.gemini</groupId> + <artifactId>org.eclipse.gemini.blueprint.io</artifactId> <version>${gemini.blueprint.version}</version> </dependency>
