You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2016/02/24 10:47:30 UTC
[1/2] karaf git commit: [KARAF-4358] Use dependency true for spec
bundles
Repository: karaf
Updated Branches:
refs/heads/master 57f398276 -> 47273fad9
[KARAF-4358] Use dependency true for spec bundles
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/26fa826b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/26fa826b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/26fa826b
Branch: refs/heads/master
Commit: 26fa826b426b05533e4a97322b122fc47c6d1e15
Parents: 57f3982
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Feb 24 10:30:26 2016 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Feb 24 10:30:26 2016 +0100
----------------------------------------------------------------------
.../spring/src/main/feature/feature.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/26fa826b/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 5980630..c5f0d40 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -78,8 +78,8 @@
<feature name="spring-jms" description="Spring 3.1.x JMS support" version="${spring31.version}">
<feature version="[${spring31.version},3.2)">spring-tx</feature>
- <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
<bundle start-level="30">mvn:org.springframework/spring-jms/${spring31.version}</bundle>
</feature>
@@ -155,8 +155,8 @@
<feature name="spring-jms" description="Spring 3.2.x JMS support" version="${spring32.version}">
<feature version="[${spring32.version},3.3)">spring-tx</feature>
- <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring32.version}</bundle>
</feature>
@@ -232,8 +232,8 @@
<feature name="spring-jms" description="Spring 4.0.x JMS support" version="${spring40.version}">
<feature version="[${spring40.version},4.1)">spring-tx</feature>
- <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring40.version}</bundle>
</feature>
@@ -305,8 +305,8 @@
<feature name="spring-jms" description="Spring 4.1.x JMS support" version="${spring41.version}">
<feature version="[${spring41.version},4.2)">spring-tx</feature>
- <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring41.version}</bundle>
</feature>
@@ -378,8 +378,8 @@
<feature name="spring-jms" description="Spring 4.2.x JMS support" version="${spring42.version}">
<feature version="[${spring42.version},4.3)">spring-tx</feature>
- <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring42.version}</bundle>
</feature>
[2/2] karaf git commit: [KARAF-4359] Update to openjpa 2.4.1
Posted by cs...@apache.org.
[KARAF-4359] Update to openjpa 2.4.1
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/47273fad
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/47273fad
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/47273fad
Branch: refs/heads/master
Commit: 47273fad9972f93c94b1d7b243446800e7f88bf2
Parents: 26fa826
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Feb 24 10:47:17 2016 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Feb 24 10:47:17 2016 +0100
----------------------------------------------------------------------
.../org/apache/karaf/itests/features/EnterpriseFeaturesTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/47273fad/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
index c6ad7cd..8af2904 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
@@ -63,7 +63,7 @@ public class EnterpriseFeaturesTest extends KarafTestSupport {
@Test
public void installOpenJpa240Feature() throws Exception {
- installAssertAndUninstallFeature("openjpa", "2.4.0");
+ installAssertAndUninstallFeature("openjpa", "2.4.1");
}
@Test