Repository: karaf Updated Branches: refs/heads/master 75a0c30f9 -> aa90b3900
[KARAF-4774] Remove "gemini-blueprint" feature (and related repositories) Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/560147a7 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/560147a7 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/560147a7 Branch: refs/heads/master Commit: 560147a78c1a3ac3a4f0cd0bd7c59f6429b511b8 Parents: 75a0c30 Author: Grzegorz Grzybek <[email protected]> Authored: Mon Dec 19 16:13:41 2016 +0100 Committer: Grzegorz Grzybek <[email protected]> Committed: Mon Dec 19 16:13:41 2016 +0100 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 24 --------- .../resources/etc/org.ops4j.pax.url.mvn.cfg | 9 +--- assemblies/features/spring/pom.xml | 53 -------------------- .../spring/src/main/feature/feature.xml | 12 ----- .../itests/features/Spring3FeaturesTest.java | 7 --- pom.xml | 40 --------------- 6 files changed, 1 insertion(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/560147a7/archetypes/assembly/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/assembly/src/main/resources/archetype-resources/pom.xml b/archetypes/assembly/src/main/resources/archetype-resources/pom.xml index dd99aa1..4072ed3 100644 --- a/archetypes/assembly/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/assembly/src/main/resources/archetype-resources/pom.xml @@ -41,30 +41,6 @@ <enabled>false</enabled> </snapshots> </repository> - <!-- Gemini Blueprint repository --> - <repository> - <id>zodiac-repository</id> - <name>Zodiac Release Repository</name> - <url>http://repository.springsource.com/maven/bundles/release</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <!-- Spring EBR 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> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> <!-- OPS4J SNAPSHOT repository --> <repository> <id>ops4j.sonatype.snapshots.deploy</id> http://git-wip-us.apache.org/repos/asf/karaf/blob/560147a7/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg index 6fe0368..f8b8ca8 100644 --- a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg +++ b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg @@ -102,9 +102,6 @@ org.ops4j.pax.url.mvn.defaultRepositories=\ # list # The default list includes the following repositories: # http://repo1.maven.org/maven2@id=central -# http://repository.springsource.com/maven/bundles/release@id=spring.ebr -# http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external -# http://zodiac.springsource.com/maven/bundles/release@id=gemini # http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases # https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases # https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases @@ -116,13 +113,9 @@ org.ops4j.pax.url.mvn.defaultRepositories=\ # org.ops4j.pax.url.mvn.repositories= \ http://repo1.maven.org/maven2@id=central, \ - http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, \ - http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, \ - http://zodiac.springsource.com/maven/bundles/release@id=gemini, \ http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \ https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, \ - https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases, \ - http://repository.springsource.com/maven/bundles/external@id=spring-ebr-repository@snapshots@noreleases + https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases # # Global policies override repository-specific settings (@checksum=..., @update=..., @releasesUpdate=..., ...) http://git-wip-us.apache.org/repos/asf/karaf/blob/560147a7/assemblies/features/spring/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml index 3ed9845..885db38 100644 --- a/assemblies/features/spring/pom.xml +++ b/assemblies/features/spring/pom.xml @@ -108,59 +108,6 @@ </exclusion> </exclusions> </dependency> - - <!-- gemini-blueprint deps --> - <dependency> - <groupId>org.eclipse.gemini</groupId> - <artifactId>org.eclipse.gemini.blueprint.io</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.gemini</groupId> - <artifactId>org.eclipse.gemini.blueprint.core</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.core</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.aop</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.beans</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.context</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.gemini</groupId> - <artifactId>org.eclipse.gemini.blueprint.extender</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.core</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.aop</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.beans</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>org.springframework.context</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/karaf/blob/560147a7/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 99a54dd..f4b12ee 100644 --- a/assemblies/features/spring/src/main/feature/feature.xml +++ b/assemblies/features/spring/src/main/feature/feature.xml @@ -435,18 +435,6 @@ <bundle start-level="30">mvn:org.springframework.security/spring-security-taglibs/${spring.security31.version}</bundle> </feature> - <!-- Gemini Blueprint support --> - - <feature name="gemini-blueprint" description="Gemini Blueprint Extender" version="${gemini.blueprint.version}"> - <feature version="[3,4)">spring</feature> - <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> - <capability> - osgi.extender; osgi.extender="osgi.blueprint";uses:="org.osgi.service.blueprint.container,org.osgi.service.blueprint.reflect";version:Version="1.0" - </capability> - </feature> - <!-- Aries Blueprint Spring support --> <feature name="aries-blueprint-spring"> http://git-wip-us.apache.org/repos/asf/karaf/blob/560147a7/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java index 0c1db11..f091b3d 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java @@ -172,11 +172,4 @@ public class Spring3FeaturesTest extends KarafTestSupport { installAssertAndUninstallFeatures("spring-security"); } - // Gemini - - @Test - public void installGeminiBlueprintFeature() throws Exception { - installAssertAndUninstallFeatures("gemini-blueprint"); - } - } http://git-wip-us.apache.org/repos/asf/karaf/blob/560147a7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3ccc836..e05a6bb 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,6 @@ <aries.util.version>1.1.3</aries.util.version> <narayana.version>5.3.5.Final</narayana.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> @@ -357,29 +356,6 @@ <enabled>true</enabled> </snapshots> </repository> - <!-- Gemini Blueprint repository --> - <repository> - <id>zodiac-repository</id> - <name>Zodiac Release Repository</name> - <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> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> <!-- OSSRH snapshots --> <repository> <id>ossrh.sonatype.snapshots.deploy</id> @@ -1188,22 +1164,6 @@ </dependency> <dependency> - <groupId>org.eclipse.gemini</groupId> - <artifactId>org.eclipse.gemini.blueprint.extender</artifactId> - <version>${gemini.blueprint.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.gemini</groupId> - <artifactId>org.eclipse.gemini.blueprint.core</artifactId> - <version>${gemini.blueprint.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.gemini</groupId> - <artifactId>org.eclipse.gemini.blueprint.io</artifactId> - <version>${gemini.blueprint.version}</version> - </dependency> - - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> <version>${geronimo.jms-spec.version}</version>
