You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jg...@apache.org on 2014/10/11 17:06:22 UTC
git commit: [KARAF-3279] Update Aries SubSystem to use API and Core
bundles
Repository: karaf
Updated Branches:
refs/heads/master 3c381cf80 -> 1ed471c7a
[KARAF-3279] Update Aries SubSystem to use API and Core bundles
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/1ed471c7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1ed471c7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1ed471c7
Branch: refs/heads/master
Commit: 1ed471c7a109b4a0b38d05592bb277470a904801
Parents: 3c381cf
Author: jgoodyear <jg...@apache.org>
Authored: Sat Oct 11 12:36:06 2014 -0230
Committer: jgoodyear <jg...@apache.org>
Committed: Sat Oct 11 12:36:06 2014 -0230
----------------------------------------------------------------------
.../features/enterprise/src/main/feature/feature.xml | 3 ++-
pom.xml | 13 ++++++++++---
subsystem/pom.xml | 9 ++++++++-
3 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/1ed471c7/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 b833c19..c5bd60c 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -300,7 +300,8 @@
<details>Support for Aries OSGi subsystems</details>
<bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.karaf.services/org.apache.karaf.services.coordinator/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.subsystem/org.apache.aries.subsystem/${aries.subsystem.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.subsystem/org.apache.aries.subsystem.api/${aries.subsystem.api.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.subsystem/org.apache.aries.subsystem.core/${aries.subsystem.core.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.subsystem/org.apache.karaf.subsystem.core/${project.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/karaf/blob/1ed471c7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 900ab36..0af6c41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,7 +201,8 @@
<aries.jndi.api.version>1.0.0</aries.jndi.api.version>
<aries.proxy.version>1.0.3</aries.proxy.version>
<aries.proxy.api.version>1.0.1</aries.proxy.api.version>
- <aries.subsystem.version>1.0.1-SNAPSHOT</aries.subsystem.version>
+ <aries.subsystem.api.version>1.0.0</aries.subsystem.api.version>
+ <aries.subsystem.core.version>1.1.0</aries.subsystem.core.version>
<aries.transaction.manager.version>1.1.0</aries.transaction.manager.version>
<aries.transaction.blueprint.version>1.0.1</aries.transaction.blueprint.version>
<aries.transaction.jdbc.version>2.0.0</aries.transaction.jdbc.version>
@@ -1657,8 +1658,14 @@
<dependency>
<groupId>org.apache.aries.subsystem</groupId>
- <artifactId>org.apache.aries.subsystem</artifactId>
- <version>${aries.subsystem.version}</version>
+ <artifactId>org.apache.aries.subsystem.api</artifactId>
+ <version>${aries.subsystem.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>org.apache.aries.subsystem.core</artifactId>
+ <version>${aries.subsystem.core.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/1ed471c7/subsystem/pom.xml
----------------------------------------------------------------------
diff --git a/subsystem/pom.xml b/subsystem/pom.xml
index 6dd6579..67cf4da 100644
--- a/subsystem/pom.xml
+++ b/subsystem/pom.xml
@@ -69,7 +69,14 @@
<dependency>
<groupId>org.apache.aries.subsystem</groupId>
- <artifactId>org.apache.aries.subsystem</artifactId>
+ <artifactId>org.apache.aries.subsystem.api</artifactId>
+ <version>${aries.subsystem.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.subsystem</groupId>
+ <artifactId>org.apache.aries.subsystem.core</artifactId>
+ <version>${aries.subsystem.core.version}</version>
</dependency>
<dependency>