You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2018/09/06 09:55:16 UTC
svn commit: r1840202 - in /jackrabbit/oak/branches/1.8: ./
oak-authorization-cug/ oak-blob-cloud-azure/ oak-blob-cloud/
oak-blob-plugins/ oak-core-spi/ oak-it/ oak-lucene/ oak-pojosr/
oak-query-spi/ oak-run-commons/ oak-run/ oak-search-mt/ oak-segment-...
Author: reschke
Date: Thu Sep 6 09:55:16 2018
New Revision: 1840202
URL: http://svn.apache.org/viewvc?rev=1840202&view=rev
Log:
OAK-7678: Update to default mockito version (defined in oak-parent) (ported to 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-authorization-cug/pom.xml
jackrabbit/oak/branches/1.8/oak-blob-cloud-azure/pom.xml
jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml
jackrabbit/oak/branches/1.8/oak-blob-plugins/pom.xml
jackrabbit/oak/branches/1.8/oak-core-spi/pom.xml
jackrabbit/oak/branches/1.8/oak-it/pom.xml
jackrabbit/oak/branches/1.8/oak-lucene/pom.xml
jackrabbit/oak/branches/1.8/oak-pojosr/pom.xml
jackrabbit/oak/branches/1.8/oak-query-spi/pom.xml
jackrabbit/oak/branches/1.8/oak-run-commons/pom.xml
jackrabbit/oak/branches/1.8/oak-run/pom.xml
jackrabbit/oak/branches/1.8/oak-search-mt/pom.xml
jackrabbit/oak/branches/1.8/oak-segment-tar/pom.xml
jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml
jackrabbit/oak/branches/1.8/oak-store-spi/pom.xml
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 6 09:55:16 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1831157-1831158,1831163,1831190
,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834336,1834428,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835642,1835780,1835819,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1831157-1831158,1831163,1831190
,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834336,1834428,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835642,1835780,1835819,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-authorization-cug/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-authorization-cug/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-authorization-cug/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-authorization-cug/pom.xml Thu Sep 6 09:55:16 2018
@@ -169,7 +169,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-blob-cloud-azure/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-cloud-azure/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob-cloud-azure/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-blob-cloud-azure/pom.xml Thu Sep 6 09:55:16 2018
@@ -157,7 +157,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml Thu Sep 6 09:55:16 2018
@@ -214,7 +214,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob-plugins/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-blob-plugins/pom.xml Thu Sep 6 09:55:16 2018
@@ -190,7 +190,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-core-spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core-spi/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core-spi/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-core-spi/pom.xml Thu Sep 6 09:55:16 2018
@@ -164,7 +164,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-it/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-it/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-it/pom.xml Thu Sep 6 09:55:16 2018
@@ -198,7 +198,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-lucene/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/pom.xml Thu Sep 6 09:55:16 2018
@@ -379,7 +379,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-pojosr/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-pojosr/pom.xml Thu Sep 6 09:55:16 2018
@@ -343,7 +343,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-query-spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-query-spi/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-query-spi/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-query-spi/pom.xml Thu Sep 6 09:55:16 2018
@@ -122,7 +122,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/branches/1.8/oak-run-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run-commons/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-run-commons/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-run-commons/pom.xml Thu Sep 6 09:55:16 2018
@@ -130,7 +130,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-run/pom.xml Thu Sep 6 09:55:16 2018
@@ -412,7 +412,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-search-mt/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-search-mt/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-search-mt/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-search-mt/pom.xml Thu Sep 6 09:55:16 2018
@@ -147,7 +147,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-segment-tar/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-segment-tar/pom.xml Thu Sep 6 09:55:16 2018
@@ -355,7 +355,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/pom.xml Thu Sep 6 09:55:16 2018
@@ -182,7 +182,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-store-spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/pom.xml?rev=1840202&r1=1840201&r2=1840202&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-spi/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-store-spi/pom.xml Thu Sep 6 09:55:16 2018
@@ -152,7 +152,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>