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 2014/05/30 08:38:40 UTC

git commit: Forbid installation of OpenJPA features on JDK8 because they use ASM < 5

Repository: karaf
Updated Branches:
  refs/heads/master 984dd301b -> f7bb021c4


Forbid installation of OpenJPA features on JDK8 because they use ASM < 5


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f7bb021c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f7bb021c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f7bb021c

Branch: refs/heads/master
Commit: f7bb021c4d68dfbd3a27d05948d890947754939d
Parents: 984dd30
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed May 28 18:00:50 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri May 30 08:38:23 2014 +0200

----------------------------------------------------------------------
 assemblies/features/enterprise/src/main/feature/feature.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/f7bb021c/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 e38335c..d4b70cc 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -70,6 +70,7 @@
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/3.3_2</bundle>
         <bundle start-level="29">mvn:org.apache.openjpa/openjpa/2.2.2</bundle>
         <feature>jpa</feature>
+        <requirement>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(!(version>=1.8)))"</requirement>
     </feature>
 
     <feature name="openjpa" description="Apache OpenJPA 2.3.x persistence engine support" version="2.3.0">
@@ -89,6 +90,7 @@
         <bundle dependency="true">mvn:org.apache.xbean/xbean-asm4-shaded/${xbean.version}</bundle>
         <bundle start-level="29">mvn:org.apache.openjpa/openjpa/2.3.0</bundle>
         <feature>jpa</feature>
+        <requirement>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(!(version>=1.8)))"</requirement>
     </feature>
 
     <feature name="hibernate" description="Hibernate 3.x JPA persistence engine support" version="${hibernate3.version}">