[
https://issues.apache.org/jira/browse/OPENJPA-2762?focusedWorklogId=177072&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-177072
]
ASF GitHub Bot logged work on OPENJPA-2762:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 19/Dec/18 16:37
Start Date: 19/Dec/18 16:37
Worklog Time Spent: 10m
Work Description: mattrpav closed pull request #36: [OPENJPA-2762] Update
to JMS Spec v2.0 (v1.1 compat)
URL: https://github.com/apache/openjpa/pull/36
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
b/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
index 9887cf61b..8013f3f98 100644
--- a/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
+++ b/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
@@ -25,7 +25,7 @@ openjpa-all includes software developed by the:
Apache Commons Logging project
Apache Commons Pool project
Apache Geronimo project
- Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
+ Java EE Specs - JMS 2.0, JTA 1.1, Bean Validation 1.0 and JPA 2.0
SERP project
diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index 857c88a6e..d5e15f5fc 100644
--- a/openjpa-kernel/pom.xml
+++ b/openjpa-kernel/pom.xml
@@ -43,7 +43,9 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <version>1.0-alpha-2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-project/NOTICE b/openjpa-project/NOTICE
index 85dae47b2..662dc8b2d 100644
--- a/openjpa-project/NOTICE
+++ b/openjpa-project/NOTICE
@@ -13,7 +13,7 @@ The OpenJPA binary assembly and openjpa-all includes software
developed by the:
Apache Commons Pool project
Apache Derby project
Apache Geronimo project
- Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
+ Java EE Specs - JMS 2.0, JTA 1.1, Bean Validation 1.0 and JPA 2.0
Apache Incubtor - Bean Validation project
SERP project
diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index 32f3c68e0..7560d7195 100644
--- a/openjpa-project/assembly.xml
+++ b/openjpa-project/assembly.xml
@@ -140,7 +140,7 @@
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jpa_2.1_spec</include>
-
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-jms_2.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
<include>org.apache.bval:org.apache.bval.bundle</include>
<include>org.apache.xbean:xbean-asm7-shaded</include>
diff --git a/openjpa-project/bin-assembly.xml b/openjpa-project/bin-assembly.xml
index 927bc5a44..b77a272ff 100644
--- a/openjpa-project/bin-assembly.xml
+++ b/openjpa-project/bin-assembly.xml
@@ -79,7 +79,7 @@
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jpa_2.1_spec</include>
-
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-jms_2.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
<include>org.apache.bval:org.apache.bval.bundle</include>
<include>org.apache.xbean:xbean-asm7-shaded</include>
diff --git a/openjpa-project/src/doc/manual/openjpa_legal.xml
b/openjpa-project/src/doc/manual/openjpa_legal.xml
index 8aa8aef6c..52725023f 100644
--- a/openjpa-project/src/doc/manual/openjpa_legal.xml
+++ b/openjpa-project/src/doc/manual/openjpa_legal.xml
@@ -74,7 +74,7 @@ The openjpa-all aggregate JAR includes software developed by
the:
Apache Commons Pool project
</para></listitem>
<listitem><para>
- Apache Geronimo project (JMS 1.1, JTA 1.1 and JPA 2.0 spec APIs)
+ Apache Geronimo project (JMS 2.0, JTA 1.1 and JPA 2.0 spec APIs)
</para></listitem>
<listitem><para>
JCP JSR-317 JPA 2.0 schemas
diff --git a/openjpa/pom.xml b/openjpa/pom.xml
index 26ec0d044..71b4dd6c1 100644
--- a/openjpa/pom.xml
+++ b/openjpa/pom.xml
@@ -131,7 +131,7 @@
org.slf4j.*;resolution:=optional,
org.apache.commons.logging.*;resolution:=optional,
javax.activation.xa*;resolution:=optional,
-
javax.jms.*;version="[1.1.0,1.2)";resolution:=optional,
+
javax.jms.*;version="[1.1.0,3)";resolution:=optional,
javax.transaction.*;version="[1.1,1.3)";resolution:=optional,
javax.validation.*;version="[1.0.0,1.1)";resolution:=optional,
javax.xml.bind.*;resolution:=optional,
diff --git a/pom.xml b/pom.xml
index c41a274e9..7d41dbb89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1519,8 +1519,9 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <version>1.0-alpha-2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 177072)
Time Spent: 20m (was: 10m)
> Upgrade to JMS 2.0. spec
> ------------------------
>
> Key: OPENJPA-2762
> URL: https://issues.apache.org/jira/browse/OPENJPA-2762
> Project: OpenJPA
> Issue Type: Task
> Components: build / infrastructure
> Affects Versions: 3.0.0
> Reporter: Matt Pavlovich
> Priority: Major
> Time Spent: 20m
> Remaining Estimate: 0h
>
> JMS 2.0 is backwards compatible with JMS v1.1
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
