Repository: karaf
Updated Branches:
refs/heads/karaf-2.3.x 1484189cd -> 3b6fda21d
[KARAF-3104] Fix transaction features versioning and import range in connector
features
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3b6fda21
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3b6fda21
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3b6fda21
Branch: refs/heads/karaf-2.3.x
Commit: 3b6fda21d31a7df4b490663bbeb6d24484a3e51d
Parents: 1484189
Author: Jean-Baptiste Onofré <[email protected]>
Authored: Sat Jul 12 22:29:38 2014 +0200
Committer: Jean-Baptiste Onofré <[email protected]>
Committed: Sat Jul 12 22:36:09 2014 +0200
----------------------------------------------------------------------
.../features/enterprise/src/main/resources/features.xml | 10 +++++-----
pom.xml | 2 --
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/3b6fda21/assemblies/features/enterprise/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/resources/features.xml
b/assemblies/features/enterprise/src/main/resources/features.xml
index 95d2c82..1e8becc 100644
--- a/assemblies/features/enterprise/src/main/resources/features.xml
+++ b/assemblies/features/enterprise/src/main/resources/features.xml
@@ -22,8 +22,8 @@
<repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax.cdi.version}/xml/features</repository>
- <feature name="transaction" description="OSGi Transaction Manager"
version="${aries.transaction.version}" resolver="(obr)">
- <details>JTA implementation provided by Apache Aries Transaction
${aries.transaction.version}</details>
+ <feature name="transaction" description="OSGi Transaction Manager"
version="1.1.0" resolver="(obr)">
+ <details>JTA implementation provided by Apache Aries Transaction
1.1.0</details>
<config name="org.apache.aries.transaction">
aries.transaction.recoverable = true
aries.transaction.timeout = 600
@@ -34,11 +34,11 @@
</config>
<bundle dependency="true"
start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
<bundle
start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.manager.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.1.0</bundle>
</feature>
<feature name="transaction" description="OSGi Transaction Manager"
version="1.0.1" resolver="(obr)">
- <details>JTA implementation provided by Apache Aries Transaction
${aries.transaction.version}</details>
+ <details>JTA implementation provided by Apache Aries Transaction
1.0.1</details>
<config name="org.apache.aries.transaction">
aries.transaction.recoverable = true
aries.transaction.timeout = 600
@@ -64,7 +64,7 @@
<feature name="connector" description="OSGi support for JCA Connector 1.6"
version="3.1.1" resolver="(obr)">
<details>OSGi support for JCA Connector 1.6</details>
- <feature version="[1.0,1.1)">transaction</feature>
+ <feature version="[1.1,2)">transaction</feature>
<feature version="[3.2,4)">spring-tx</feature>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.6_spec/1.0</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
http://git-wip-us.apache.org/repos/asf/karaf/blob/3b6fda21/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7437845..e32542d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,8 +185,6 @@
<aries.jndi.api.version>1.0.0</aries.jndi.api.version>
<aries.proxy.version>1.0.2</aries.proxy.version>
<aries.proxy.api.version>1.0.0</aries.proxy.api.version>
- <aries.transaction.version>1.0.1</aries.transaction.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>1.0.0</aries.transaction.jdbc.version>
<aries.util.version>1.1.0</aries.util.version>
