This is an automated email from the ASF dual-hosted git repository. ggrzybek pushed a commit to branch KARAF-6715 in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 1d64a8e58d85f495b9ee038892a56d2820e28afd Author: Grzegorz Grzybek <[email protected]> AuthorDate: Tue May 12 07:27:54 2020 +0200 [KARAF-6715] Set version 1.1 for javax.transaction.* packages for JRE 1.7 and newer --- .../base/src/main/filtered-resources/resources/etc/jre.properties | 6 +++--- main/src/test/resources/test-karaf-home/etc/jre.properties | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties index 82345dc..2bf255f 100644 --- a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties +++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties @@ -266,7 +266,7 @@ jre-1.7= \ javax.swing.tree, \ javax.swing.undo, \ javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.transaction; javax.transaction.xa; version="1.1"; partial=true; mandatory:=partial, \ javax.xml, \ javax.xml.bind;version="2.2.1", \ javax.xml.bind.annotation;version="2.2.1", \ @@ -419,7 +419,7 @@ jre-1.8= \ javax.swing.tree, \ javax.swing.undo, \ javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.transaction; javax.transaction.xa; version="1.1"; partial=true; mandatory:=partial, \ javax.xml, \ javax.xml.bind;version="2.2.8", \ javax.xml.bind.annotation;version="2.2.8", \ @@ -612,7 +612,7 @@ jre-9= \ javax.swing.tree, \ javax.swing.undo, \ javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.transaction; javax.transaction.xa; version="1.1"; partial=true; mandatory:=partial, \ javax.xml, \ javax.xml.bind;version="2.3.0", \ javax.xml.bind.annotation;version="2.3.0", \ diff --git a/main/src/test/resources/test-karaf-home/etc/jre.properties b/main/src/test/resources/test-karaf-home/etc/jre.properties index c0ec626..ad51100 100644 --- a/main/src/test/resources/test-karaf-home/etc/jre.properties +++ b/main/src/test/resources/test-karaf-home/etc/jre.properties @@ -266,7 +266,7 @@ jre-1.7= \ javax.swing.tree, \ javax.swing.undo, \ javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.transaction; javax.transaction.xa; version="1.1"; partial=true; mandatory:=partial, \ javax.xml, \ javax.xml.bind;version="2.2.1", \ javax.xml.bind.annotation;version="2.2.1", \ @@ -428,7 +428,7 @@ jre-1.8= \ javax.swing.tree, \ javax.swing.undo, \ javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.transaction; javax.transaction.xa; version="1.1"; partial=true; mandatory:=partial, \ javax.xml, \ javax.xml.bind;version="2.2.8", \ javax.xml.bind.annotation;version="2.2.8", \ @@ -621,7 +621,7 @@ jre-9= \ javax.swing.tree, \ javax.swing.undo, \ javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.transaction; javax.transaction.xa; version="1.1"; partial=true; mandatory:=partial, \ javax.xml, \ javax.xml.bind;version="2.3.0", \ javax.xml.bind.annotation;version="2.3.0", \
