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/05/12 20:09:51 UTC
svn commit: r1831494 - in /jackrabbit/branches/2.10: ./
jackrabbit-core/pom.xml jackrabbit-parent/pom.xml
Author: reschke
Date: Sat May 12 20:09:51 2018
New Revision: 1831494
URL: http://svn.apache.org/viewvc?rev=1831494&view=rev
Log:
JCR-4205: Upgrade JTA dependency to javax.transaction-api 1.2 (ported to 2.10)
Modified:
jackrabbit/branches/2.10/ (props changed)
jackrabbit/branches/2.10/jackrabbit-core/pom.xml
jackrabbit/branches/2.10/jackrabbit-parent/pom.xml
Propchange: jackrabbit/branches/2.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 12 20:09:51 2018
@@ -1,4 +1,4 @@
/jackrabbit/branches/2.12:1776442,1776451,1776500,1776524
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1709811,1717599,1729382,1732436,1740814-1740815,1751279,1752165,1753226,1757322,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775123,1775132,1775315,1775384,1775414,1775419,1775437,1775444,1775463,1775472-1775473,1775481,1775485,1775496,1775509,1775514,1775613,1775617,1775621,1775624,1775629,1775631-1775632,1775634-1775635,1775637,1775657,1776410,1776414,1776416-1776417,1776421,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1809149,1809329,1810108,1811667,1814831,1817097,1821597,1826230,1826647,1826940,1826964
+/jackrabbit/trunk:1709811,1717599,1729382,1732436,1740814-1740815,1751279,1752165,1753226,1757322,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775123,1775132,1775315,1775384,1775414,1775419,1775437,1775444,1775463,1775472-1775473,1775481,1775485,1775496,1775509,1775514,1775613,1775617,1775621,1775624,1775629,1775631-1775632,1775634-1775635,1775637,1775657,1776410,1776414,1776416-1776417,1776421,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1809149,1809329,1810108,1811667,1812994,1814831,1817097,1821597,1826230,1826647,1826940,1826964
Modified: jackrabbit/branches/2.10/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/pom.xml?rev=1831494&r1=1831493&r2=1831494&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/2.10/jackrabbit-core/pom.xml Sat May 12 20:09:51 2018
@@ -330,8 +330,8 @@ org.apache.jackrabbit.core.security.user
<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.10/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-parent/pom.xml?rev=1831494&r1=1831493&r2=1831494&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.10/jackrabbit-parent/pom.xml Sat May 12 20:09:51 2018
@@ -358,9 +358,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>