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 2017/10/11 04:44:05 UTC
svn commit: r1811790 - in /jackrabbit/branches/2.10: ./
jackrabbit-core/pom.xml jackrabbit-parent/pom.xml
Author: reschke
Date: Wed Oct 11 04:44:05 2017
New Revision: 1811790
URL: http://svn.apache.org/viewvc?rev=1811790&view=rev
Log:
JCR-4177: move Mockito version to parent pom (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 Wed Oct 11 04:44:05 2017
@@ -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,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,1811667
+/jackrabbit/trunk:1709811,1717599,1729382,1732436,1740814-1740815,1751279,1752165,1753226,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,1811667
Modified: jackrabbit/branches/2.10/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/pom.xml?rev=1811790&r1=1811789&r2=1811790&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/2.10/jackrabbit-core/pom.xml Wed Oct 11 04:44:05 2017
@@ -343,7 +343,6 @@ org.apache.jackrabbit.core.security.user
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: jackrabbit/branches/2.10/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-parent/pom.xml?rev=1811790&r1=1811789&r2=1811790&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.10/jackrabbit-parent/pom.xml Wed Oct 11 04:44:05 2017
@@ -504,6 +504,11 @@
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
+ </dependency>
</dependencies>
</dependencyManagement>