OLGH20804: Review comments updates OpenLiberty#2

Signed-off-by: Joe Grassel <jgrassel@us.ibm.com>
jgrassel · Apr 27, 2022 · aa8d2b4 · aa8d2b4
1 parent a896864
commit aa8d2b4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/dev/com.ibm.ws.jpa.container.v31/bnd.bnd b/dev/com.ibm.ws.jpa.container.v31/bnd.bnd
@@ -15,6 +15,11 @@ Bundle-Name: JPA 3.1 Container Runtime
 Bundle-SymbolicName: com.ibm.ws.jpa.container.v31
 Bundle-Description: JPA 3.1 Container Runtime; version=${bVersion}
 
+javac.source: 11
+javac.target: 11
+
+Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=11))"
+
 WS-TraceGroup: JPA
 
 Private-Package: \
@@ -29,8 +34,7 @@ Private-Package: \
 	io.openliberty.jakarta.persistence.3.1;version=latest,\
 	com.ibm.wsspi.org.osgi.core;version=latest,\
 	com.ibm.wsspi.org.osgi.service.component.annotations;version=latest,\
-	com.ibm.tx.core;version=latest,\
-	com.ibm.ws.tx.embeddable;version=latest,\
+	com.ibm.tx.jta.jakarta;version=latest,\
 	com.ibm.ws.logging.core;version=latest,\
 	com.ibm.ws.container.service;version=latest,\
 	io.openliberty.jakarta.transaction.2.0;version=latest
diff --git a/dev/io.openliberty.jakarta.persistence.api.3.1/bnd.bnd b/dev/io.openliberty.jakarta.persistence.api.3.1/bnd.bnd
@@ -20,3 +20,8 @@ Require-Bundle: io.openliberty.org.eclipse.persistence-3.1
  jakarta.persistence.spi; \
    jpa="3.1"; version="3.1.0"
 
+javac.source: 11
+javac.target: 11
+
+Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=11))"
+
diff --git a/dev/io.openliberty.org.eclipse.persistence-3.1/bnd.bnd b/dev/io.openliberty.org.eclipse.persistence-3.1/bnd.bnd
@@ -15,6 +15,11 @@ Bundle-SymbolicName: io.openliberty.org.eclipse.persistence-3.1; singleton:=true
 
 Bundle-Activator: io.openliberty.jakarta.persistence.internal.JakartaPersistenceActivator
 
+javac.source: 11
+javac.target: 11
+
+Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=11))"
+
 Import-Package: \
   com.ibm.ws.threadContext, \
   com.ibm.ws.runtime.metadata, \

diff --git a/dev/io.openliberty.persistence.3.1.thirdparty/bnd.bnd b/dev/io.openliberty.persistence.3.1.thirdparty/bnd.bnd
@@ -30,6 +30,7 @@ Specification-Version: ${eclVersion}
 
 javac.source: 11
 javac.target: 11
+Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=11))"
 
 Export-Package: \
             org.eclipse.persistence.javax.persistence.osgi;version="${eclPackageVersion}", \