You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/03/24 07:46:20 UTC
[4/4] karaf git commit: [KARAF-5037] to Aries Blueprint Core 1.8.0,
Aries Blueprint CM 1.1.0 and Aries Proxy 1.1.0
[KARAF-5037] to Aries Blueprint Core 1.8.0, Aries Blueprint CM 1.1.0 and Aries Proxy 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/21f5ddeb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/21f5ddeb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/21f5ddeb
Branch: refs/heads/master
Commit: 21f5ddebaed69b65bfd3fc1d0e2b99fb385552df
Parents: dc80e9c
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Mar 24 08:14:48 2017 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Mar 24 08:46:01 2017 +0100
----------------------------------------------------------------------
.../features/enterprise/src/main/feature/feature.xml | 3 +++
assemblies/features/standard/src/main/feature/feature.xml | 8 ++------
jaas/blueprint/jasypt/pom.xml | 2 +-
jaas/jasypt/pom.xml | 2 +-
pom.xml | 10 +++++-----
service/guard/pom.xml | 2 +-
6 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/21f5ddeb/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 9550d5c..90a7c5c 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -91,6 +91,7 @@
<details>JPA implementation provided by Apache Aries JPA 2.x. NB: this feature doesn't provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details>
<feature version="[1.1,2)">transaction-api</feature>
<feature dependency="true">openjpa</feature>
+ <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.jpa/${org.osgi.service.jpa.version}</bundle>
@@ -154,6 +155,7 @@
<feature name="jndi" description="OSGi Service Registry JNDI access" version="${project.version}">
<details>JNDI support provided by Apache Aries JNDI ${aries.jndi.version}, including additional service, commands, and MBean.</details>
<feature>aries-proxy</feature>
+ <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.xbean/xbean-naming/${xbean.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.jndi.api.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.core/${aries.jndi.core.version}</bundle>
@@ -193,6 +195,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/21f5ddeb/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 83af996..2ed1a56 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -32,16 +32,12 @@
<feature name="aries-proxy" description="Aries Proxy" version="${project.version}">
<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
- <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.proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}</bundle>
- <bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/${aries.proxy.version}</bundle>
- <capability>
- osgi.service;effective:=active;objectClass=org.apache.aries.proxy.ProxyManager
- </capability>
+ <bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries.proxy.version}</bundle>
</feature>
<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/21f5ddeb/jaas/blueprint/jasypt/pom.xml
----------------------------------------------------------------------
diff --git a/jaas/blueprint/jasypt/pom.xml b/jaas/blueprint/jasypt/pom.xml
index b87fd68..b132fdb 100644
--- a/jaas/blueprint/jasypt/pom.xml
+++ b/jaas/blueprint/jasypt/pom.xml
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <artifactId>org.apache.aries.proxy</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/21f5ddeb/jaas/jasypt/pom.xml
----------------------------------------------------------------------
diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml
index 8131cba..d9efbab 100644
--- a/jaas/jasypt/pom.xml
+++ b/jaas/jasypt/pom.xml
@@ -101,7 +101,7 @@
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <artifactId>org.apache.aries.proxy</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/21f5ddeb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d6d2f93..dcdef93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,9 +209,9 @@
<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.version>1.8.0</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.cm.version>1.1.0</aries.blueprint.cm.version>
<aries.blueprint.web.version>1.0.1</aries.blueprint.web.version>
<aries.blueprint.spring.version>0.3.0</aries.blueprint.spring.version>
<aries.blueprint.spring.extender.version>0.3.0</aries.blueprint.spring.extender.version>
@@ -229,8 +229,8 @@
<aries.jndi.api.version>1.1.0</aries.jndi.api.version>
<aries.jndi.core.version>1.0.2</aries.jndi.core.version>
<aries.jndi.url.version>1.1.0</aries.jndi.url.version>
- <aries.proxy.version>1.0.6</aries.proxy.version>
- <aries.proxy.api.version>1.0.1</aries.proxy.api.version>
+ <aries.proxy.version>1.1.0</aries.proxy.version>
+ <aries.proxy.api.version>1.1.0</aries.proxy.api.version>
<aries.subsystem.api.version>2.0.8</aries.subsystem.api.version>
<aries.subsystem.core.version>2.0.8</aries.subsystem.core.version>
<aries.transaction.manager.version>1.3.2</aries.transaction.manager.version>
@@ -1478,7 +1478,7 @@
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <artifactId>org.apache.aries.proxy</artifactId>
<version>${aries.proxy.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/21f5ddeb/service/guard/pom.xml
----------------------------------------------------------------------
diff --git a/service/guard/pom.xml b/service/guard/pom.xml
index aad0ab2..3f29cf4 100644
--- a/service/guard/pom.xml
+++ b/service/guard/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <artifactId>org.apache.aries.proxy</artifactId>
<scope>test</scope>
</dependency>
<dependency>