You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2020/05/12 05:28:11 UTC
[karaf] branch KARAF-6715 created (now 1d64a8e)
This is an automated email from the ASF dual-hosted git repository.
ggrzybek pushed a change to branch KARAF-6715
in repository https://gitbox.apache.org/repos/asf/karaf.git.
at 1d64a8e [KARAF-6715] Set version 1.1 for javax.transaction.* packages for JRE 1.7 and newer
This branch includes the following new commits:
new 1d64a8e [KARAF-6715] Set version 1.1 for javax.transaction.* packages for JRE 1.7 and newer
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[karaf] 01/01: [KARAF-6715] Set version 1.1 for javax.transaction.*
packages for JRE 1.7 and newer
Posted by gg...@apache.org.
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 <gr...@gmail.com>
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", \