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 2015/04/02 22:03:26 UTC
[1/2] karaf git commit: [KARAF-3643] Only load jpa spec with
persistence providers
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x d5b0f4afd -> 5340c128e
[KARAF-3643] Only load jpa spec with persistence providers
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/df83b98d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/df83b98d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/df83b98d
Branch: refs/heads/karaf-3.0.x
Commit: df83b98dbeb27918b2aaac56d05040608b994aec
Parents: d5b0f4a
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Apr 2 16:08:50 2015 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Apr 2 16:12:39 2015 +0200
----------------------------------------------------------------------
.../features/enterprise/src/main/feature/feature.xml | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/df83b98d/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 919b2fa..5a45add 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -107,7 +107,8 @@
<feature name="openjpa" description="Apache OpenJPA 2.2.x persistence engine support" version="2.2.2" resolver="(obr)">
<details>Enable Apache OpenJPA as persistence engine.</details>
- <feature version="2.0.0">jpa</feature>
+ <feature version="[1.1,2)">transaction</feature>
+ <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
@@ -124,7 +125,8 @@
<feature name="openjpa" description="Apache OpenJPA 2.3.x persistence engine support" version="2.3.0" resolver="(obr)">
<details>Enable Apache OpenJPA as persistence engine.</details>
- <feature version="2.0.0">jpa</feature>
+ <feature version="[1.1,2)">transaction</feature>
+ <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
@@ -141,7 +143,7 @@
<feature name="hibernate" description="Hibernate 3.x JPA persistence engine support" version="${hibernate3.version}" resolver="(obr)">
<details>Enable Hibernate 3.x as persistence engine.</details>
- <feature version="2.0.0">jpa</feature>
+ <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
<bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
<bundle dependency="true">mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
@@ -158,7 +160,7 @@
<feature name="hibernate" description="Hibernate 4.2.x JPA persistence engine support" version="${hibernate42.version}" resolver="(obr)">
<details>Enable Hibernate 4.2.x as persistence engine.</details>
- <feature version="2.0.0">jpa</feature>
+ <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<feature>http</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
@@ -183,8 +185,8 @@
<feature name="hibernate" description="Hibernate 4.3.x JPA persistence engine support" version="${hibernate43.version}" resolver="(obr)">
<details>Enable Hibernate 4.3.x as persistence engine.</details>
- <feature version="2.1.0">jpa</feature>
<feature>http</feature>
+ <bundle dependency="true" start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
[2/2] karaf git commit: Fix test problem
Posted by cs...@apache.org.
Fix test problem
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5340c128
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5340c128
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5340c128
Branch: refs/heads/karaf-3.0.x
Commit: 5340c128e3952592ba022ac0e7a5436d8e3675bb
Parents: df83b98
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Apr 2 17:27:17 2015 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Apr 2 17:27:17 2015 +0200
----------------------------------------------------------------------
assemblies/features/framework/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/5340c128/assemblies/features/framework/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml
index 98847da..84abac1 100644
--- a/assemblies/features/framework/pom.xml
+++ b/assemblies/features/framework/pom.xml
@@ -108,6 +108,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>