Repository: karaf Updated Branches: refs/heads/proxy-test a03d2f8b8 -> 342383161
Update to blueprint 1.7.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/34238316 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/34238316 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/34238316 Branch: refs/heads/proxy-test Commit: 3423831611bd2bf1f0b32e94e86bcea549f1eb6f Parents: a03d2f8 Author: Christian Schneider <ch...@die-schneider.net> Authored: Fri Jan 13 15:22:59 2017 +0100 Committer: Christian Schneider <ch...@die-schneider.net> Committed: Fri Jan 13 15:22:59 2017 +0100 ---------------------------------------------------------------------- assemblies/features/enterprise/src/main/feature/feature.xml | 2 +- assemblies/features/standard/src/main/feature/feature.xml | 1 - pom.xml | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/34238316/assemblies/features/enterprise/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml index 4782396..f9df684 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -20,7 +20,6 @@ <!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml --> - <repository>mvn:org.hibernate/hibernate-validator-osgi-karaf-features/${hibernate.validator.version}/xml/features</repository> <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax.cdi.version}/xml/features</repository> <repository>mvn:org.ops4j.pax.jdbc/pax-jdbc-features/${pax.jdbc.version}/xml/features</repository> <repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository> @@ -288,6 +287,7 @@ <feature version="${project.version}">obr</feature> <feature>aries-blueprint</feature> <!-- common --> + <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle> <bundle start-level="30">mvn:org.apache.aries.application/org.apache.aries.application.resolver.obr/${aries.application.version}</bundle> <bundle start-level="30">mvn:org.apache.aries.application/org.apache.aries.application.install/${aries.application.version}</bundle> <bundle start-level="30">mvn:org.apache.aries.application/org.apache.aries.application.api/${aries.application.api.version}</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/34238316/assemblies/features/standard/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index db5e229..b63d747 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -40,7 +40,6 @@ <feature name="aries-blueprint" description="Aries Blueprint" version="${project.version}"> <feature>aries-proxy</feature> - <bundle dependency="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle> <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}</bundle> <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}</bundle> <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/34238316/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1812d85..4a6ebda 100644 --- a/pom.xml +++ b/pom.xml @@ -209,9 +209,8 @@ <aries.application.api.version>1.0.0</aries.application.api.version> <aries.application.management.version>1.0.0</aries.application.management.version> <aries.blueprint.api.version>1.0.1</aries.blueprint.api.version> - <aries.blueprint.core.version>1.7.1</aries.blueprint.core.version> - <aries.blueprint.core.compatibility.version>1.0.0</aries.blueprint.core.compatibility.version> - <aries.blueprint.cm.version>1.0.9</aries.blueprint.cm.version> + <aries.blueprint.core.version>1.7.2-SNAPSHOT</aries.blueprint.core.version> + <aries.blueprint.cm.version>1.0.10-SNAPSHOT</aries.blueprint.cm.version> <aries.blueprint.web.version>1.0.1</aries.blueprint.web.version> <aries.blueprint.spring.version>0.2.0</aries.blueprint.spring.version> <aries.blueprint.spring.extender.version>0.2.0</aries.blueprint.spring.extender.version>
