You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/02/12 10:16:27 UTC
svn commit: r1823935 - in /jackrabbit/branches/2.14: ./
jackrabbit-core/pom.xml jackrabbit-parent/pom.xml
Author: reschke
Date: Mon Feb 12 10:16:26 2018
New Revision: 1823935
URL: http://svn.apache.org/viewvc?rev=1823935&view=rev
Log:
JCR-4205: Upgrade JTA dependency to javax.transaction-api 1.2 (ported to 2.14)
Modified:
jackrabbit/branches/2.14/ (props changed)
jackrabbit/branches/2.14/jackrabbit-core/pom.xml
jackrabbit/branches/2.14/jackrabbit-parent/pom.xml
Propchange: jackrabbit/branches/2.14/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 12 10:16:26 2018
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779614,1779632,1780208,1780220,1780406,1785225,1786325,1786330,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1793339,1796980,1797209,1797917,1798586,1799429,1799538,1799549,1799575,1800359,1800378,1800752,1802925,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1809624,1810108,1811667,1812543,1812634,1814831,1817097,1820119,1821597
+/jackrabbit/trunk:1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779614,1779632,1780208,1780220,1780406,1785225,1786325,1786330,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1793339,1796980,1797209,1797917,1798586,1799429,1799538,1799549,1799575,1800359,1800378,1800752,1802925,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1809624,1810108,1811667,1812543,1812634,1812994,1814831,1817097,1820119,1821597
Modified: jackrabbit/branches/2.14/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-core/pom.xml?rev=1823935&r1=1823934&r2=1823935&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/2.14/jackrabbit-core/pom.xml Mon Feb 12 10:16:26 2018
@@ -334,8 +334,8 @@ org.apache.jackrabbit.test.api.query.qom
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/branches/2.14/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-parent/pom.xml?rev=1823935&r1=1823934&r2=1823935&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.14/jackrabbit-parent/pom.xml Mon Feb 12 10:16:26 2018
@@ -431,9 +431,9 @@
<version>2.5</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0.1</version>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>