svn commit: r1840240 - in /jackrabbit/oak/branches/1.8: ./ oak-examples/webapp/ oak-examples/webapp/pom.xml oak-parent/pom.xml oak-run/pom.xml oak-solr-osgi/pom.xml
Author: reschke Date: Thu Sep 6 17:26:57 2018 New Revision: 1840240 URL: http://svn.apache.org/viewvc?rev=1840240=rev Log: OAK-7622: Update httpcomponent dependencies to 4.4.10/4.5.6 (and declare the versions globally) (ported to 1.8) Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-examples/webapp/ (props changed) jackrabbit/oak/branches/1.8/oak-examples/webapp/pom.xml jackrabbit/oak/branches/1.8/oak-parent/pom.xml jackrabbit/oak/branches/1.8/oak-run/pom.xml jackrabbit/oak/branches/1.8/oak-solr-osgi/pom.xml Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 6 17:26:57 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,1835635,1835642,1835780,1835819,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,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,1835521,1835635,1835642,1835780,1835819,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024 /jackrabbit/trunk:1345480 Propchange: jackrabbit/oak/branches/1.8/oak-examples/webapp/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 6 17:26:57 2018 @@ -1,3 +1,3 @@ /jackrabbit/branches/JCR-2272/jackrabbit-webapp:1173165-1176545 -/jackrabbit/oak/trunk/oak-examples/webapp:1823669,1825561,1834291,1837657 +/jackrabbit/oak/trunk/oak-examples/webapp:1823669,1825561,1834291,1835521,1837657 /jackrabbit/sandbox/JCR-2415-lucene-3.0/jackrabbit-webapp:1060860-1064038 Modified: jackrabbit/oak/branches/1.8/oak-examples/webapp/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-examples/webapp/pom.xml?rev=1840240=1840239=1840240=diff == --- jackrabbit/oak/branches/1.8/oak-examples/webapp/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-examples/webapp/pom.xml Thu Sep 6 17:26:57 2018 @@ -187,7 +187,6 @@ org.apache.httpcomponents httpclient - 4.5.4 test Modified: jackrabbit/oak/branches/1.8/oak-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-parent/pom.xml?rev=1840240=1840239=1840240=diff
svn commit: r1840234 - in /jackrabbit/oak/branches/1.8: ./ oak-parent/pom.xml
Author: reschke Date: Thu Sep 6 16:09:01 2018 New Revision: 1840234 URL: http://svn.apache.org/viewvc?rev=1840234=rev Log: OAK-7624: Add org.apache.jackrabbit.oak.plugins.document.spi to package export filter (ported to 1.8) Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-parent/pom.xml Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 6 16:09:01 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,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,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,1835635,1835642,1835780,1835819,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.8/oak-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-parent/pom.xml?rev=1840234=1840233=1840234=diff == --- jackrabbit/oak/branches/1.8/oak-parent/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-parent/pom.xml Thu Sep 6 16:09:01 2018 @@ -228,6 +228,7 @@ !org.apache.jackrabbit.oak.spi.lifecycle !org.apache.jackrabbit.oak.spi.state !org.apache.jackrabbit.oak.jcr + !org.apache.jackrabbit.oak.plugins.document.spi !org.apache.jackrabbit.oak.plugins.index.lucene !org.apache.jackrabbit.oak.plugins.index.lucene.util !org.apache.jackrabbit.oak.plugins.index.solr
svn commit: r1840227 - in /jackrabbit/oak/branches/1.8: ./ oak-parent/pom.xml
Author: reschke Date: Thu Sep 6 14:52:01 2018 New Revision: 1840227 URL: http://svn.apache.org/viewvc?rev=1840227=rev Log: OAK-7641: various internal APIs missing in package export filter (ported to 1.8) Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-parent/pom.xml Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 6 14:52:01 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,1837503,1837547,1837569,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,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.8/oak-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-parent/pom.xml?rev=1840227=1840226=1840227=diff == --- jackrabbit/oak/branches/1.8/oak-parent/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-parent/pom.xml Thu Sep 6 14:52:01 2018 @@ -196,6 +196,7 @@ !org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage !org.apache.jackrabbit.oak !org.apache.jackrabbit.oak.json + !org.apache.jackrabbit.oak.namepath.impl !org.apache.jackrabbit.oak.plugins.blob !org.apache.jackrabbit.oak.plugins.blob.datastore !org.apache.jackrabbit.oak.plugins.commit @@ -204,10 +205,12 @@ !org.apache.jackrabbit.oak.plugins.index.aggregate !org.apache.jackrabbit.oak.plugins.index.fulltext !org.apache.jackrabbit.oak.plugins.index.property + !org.apache.jackrabbit.oak.plugins.index.property.strategy !org.apache.jackrabbit.oak.plugins.index.reference !org.apache.jackrabbit.oak.plugins.lock !org.apache.jackrabbit.oak.plugins.memory !org.apache.jackrabbit.oak.plugins.migration + !org.apache.jackrabbit.oak.plugins.migration.report !org.apache.jackrabbit.oak.plugins.name !org.apache.jackrabbit.oak.plugins.nodetype
svn commit: r1840226 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/ oak-core/src/test/java/org/apache/jackrabbit/oak/security/authenticatio
Author: stillalex
Date: Thu Sep 6 14:45:42 2018
New Revision: 1840226
URL: http://svn.apache.org/viewvc?rev=1840226=rev
Log:
OAK-7741 Token LoginModule flag to skip refreshing the token expiration
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthentication.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthenticationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenConstants.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/package-info.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthentication.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthentication.java?rev=1840226=1840225=1840226=diff
==
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthentication.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthentication.java
Thu Sep 6 14:45:42 2018
@@ -23,6 +23,7 @@ import javax.security.auth.login.LoginEx
import
org.apache.jackrabbit.api.security.authentication.token.TokenCredentials;
import org.apache.jackrabbit.oak.spi.security.authentication.Authentication;
+import
org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConstants;
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenInfo;
import
org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider;
import org.jetbrains.annotations.NotNull;
@@ -116,7 +117,12 @@ class TokenAuthentication implements Aut
}
if (tokenInfo.matches(tokenCredentials)) {
-tokenInfo.resetExpiration(loginTime);
+if
(tokenCredentials.getAttribute(TokenConstants.TOKEN_SKIP_REFRESH) == null) {
+boolean reset = tokenInfo.resetExpiration(loginTime);
+log.debug("Token reset={}", reset);
+} else {
+log.debug("Token reset skipped.");
+}
return true;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthenticationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthenticationTest.java?rev=1840226=1840225=1840226=diff
==
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthenticationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthenticationTest.java
Thu Sep 6 14:45:42 2018
@@ -36,6 +36,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Mockito;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -177,4 +178,65 @@ public class TokenAuthenticationTest ext
assertTrue(authentication.authenticate(new
TokenCredentials(info.getToken(;
assertEquals(getTestUser().getPrincipal(),
authentication.getUserPrincipal());
}
+
+@Test
+public void testAuthenticateRefreshToken() throws Exception {
+TokenCredentials tc = new TokenCredentials("token");
+TokenProvider tp = Mockito.mock(TokenProvider.class);
+TokenInfo ti = Mockito.mock(TokenInfo.class);
+
+Mockito.when(tp.getTokenInfo(Mockito.anyString())).thenReturn(ti);
+Mockito.when(ti.isExpired(Mockito.anyLong())).thenReturn(false);
+Mockito.when(ti.matches(tc)).thenReturn(true);
+
+TokenAuthentication auth = new TokenAuthentication(tp);
+try {
+assertTrue(auth.authenticate(tc));
+Mockito.verify(ti).resetExpiration(Mockito.anyLong());
+} catch (LoginException e) {
+fail(e.getMessage());
+}
+}
+
+@Test
+public void testAuthenticateSkipRefreshToken() throws Exception {
+TokenCredentials tc = new TokenCredentials("token");
+tc.setAttribute(TokenConstants.TOKEN_SKIP_REFRESH, "");
+
+TokenProvider tp = Mockito.mock(TokenProvider.class);
+TokenInfo ti = Mockito.mock(TokenInfo.class);
+
+Mockito.when(tp.getTokenInfo(Mockito.anyString())).thenReturn(ti);
+Mockito.when(ti.isExpired(Mockito.anyLong())).thenReturn(false);
+
svn commit: r1840222 - in /jackrabbit/oak/trunk/oak-lucene/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/
Author: thomasm
Date: Thu Sep 6 13:30:19 2018
New Revision: 1840222
URL: http://svn.apache.org/viewvc?rev=1840222=rev
Log:
OAK-7739: Use an index only if a certain node or property exists
Added:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDisabledTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1840222=1840221=1840222=diff
==
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
Thu Sep 6 13:30:19 2018
@@ -270,6 +270,8 @@ public final class IndexDefinition imple
private final boolean syncPropertyIndexes;
+private final String useIfExists;
+
//~< Builder >
public static Builder newBuilder(NodeState root, NodeState defn, String
indexPath){
@@ -408,6 +410,7 @@ public final class IndexDefinition imple
this.nrtIndexMode = supportsNRTIndexing(defn);
this.syncIndexMode = supportsSyncIndexing(defn);
this.syncPropertyIndexes = definedRules.stream().anyMatch(ir ->
!ir.syncProps.isEmpty());
+this.useIfExists = getOptionalValue(defn,
IndexConstants.USE_IF_EXISTS, null);
}
public NodeState getDefinitionNodeState() {
@@ -1640,6 +1643,23 @@ public final class IndexDefinition imple
return mergePolicy;
}
+public boolean isEnabled() {
+if (useIfExists == null) {
+return true;
+}
+NodeState nodeState = root;
+for (String element : PathUtils.elements(useIfExists)) {
+if (element.startsWith("@")) {
+return nodeState.hasProperty(element.substring(1));
+}
+nodeState = nodeState.getChildNode(element);
+if (!nodeState.exists()) {
+return false;
+}
+}
+return true;
+}
+
private static Set getMultiProperty(NodeState definition, String
propName){
PropertyState pse = definition.getProperty(propName);
return pse != null ? ImmutableSet.copyOf(pse.getValue(Type.STRINGS)) :
Collections.emptySet();
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java?rev=1840222=1840221=1840222=diff
==
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
Thu Sep 6 13:30:19 2018
@@ -333,6 +333,9 @@ class IndexPlanner {
private boolean wrongIndex() {
// REMARK: similar code is used in oak-core, PropertyIndex
// skip index if "option(index ...)" doesn't match
+if (!definition.isEnabled()) {
+return true;
+}
PropertyRestriction indexName =
filter.getPropertyRestriction(IndexConstants.INDEX_NAME_OPTION);
boolean wrong = false;
if (indexName != null && indexName.first != null) {
Added:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDisabledTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDisabledTest.java?rev=1840222=auto
==
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDisabledTest.java
(added)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/LuceneIndexDisabledTest.java
Thu Sep 6 13:30:19 2018
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache
svn commit: r1840221 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/index/ main/java/org/apache/jackrabbit/oak/plugins/index/property/ test/java/org/apache/jackra
Author: thomasm
Date: Thu Sep 6 13:30:07 2018
New Revision: 1840221
URL: http://svn.apache.org/viewvc?rev=1840221=rev
Log:
OAK-7739: Use an index only if a certain node or property exists
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexDisabledTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndex.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java?rev=1840221=1840220=1840221=diff
==
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
Thu Sep 6 13:30:07 2018
@@ -139,5 +139,12 @@ public interface IndexConstants {
* Boolean flag indicating that old indexes need to be disabled
*/
String DISABLE_INDEXES_ON_NEXT_CYCLE = ":disableIndexesOnNextCycle";
+
+/**
+ * The property of an index. If the given node or property exists, then the
+ * index is used for queries; otherwise, it is not used (returns infinite
+ * cost). The value is: nodes, the path. For properties, the path of the
node, then '@' property.
+ */
+String USE_IF_EXISTS = "useIfExists";
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndex.java?rev=1840221=1840220=1840221=diff
==
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndex.java
Thu Sep 6 13:30:07 2018
@@ -21,14 +21,9 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.HashSet;
-import java.util.Set;
-
import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
import org.apache.jackrabbit.oak.spi.query.Cursor;
@@ -40,7 +35,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Charsets;
import com.google.common.collect.Iterables;
/**
@@ -100,7 +94,7 @@ class PropertyIndex implements QueryInde
/**
* Cached property index plan
*/
-private PropertyIndexPlan plan;
+private PropertyIndexPlan cachedPlan;
PropertyIndex(MountInfoProvider mountInfoProvider) {
this.mountInfoProvider = mountInfoProvider;
@@ -111,12 +105,12 @@ class PropertyIndex implements QueryInde
// string because it would not be possible to use its equals method
since the preparing flag would be different
// and creating a separate isSimilar method is not worth the effort
since it would not be used anymore once the
// PropertyIndex has been refactored to an AdvancedQueryIndex (which
will make the plan cache obsolete).
-PropertyIndexPlan plan = this.plan;
+PropertyIndexPlan plan = this.cachedPlan;
if (plan != null &&
plan.getFilter().toString().equals(filter.toString())) {
return plan;
} else {
plan = createPlan(root, filter, mountInfoProvider);
-this.plan = plan;
+this.cachedPlan = plan;
return plan;
}
}
@@ -130,7 +124,7 @@ class PropertyIndex implements QueryInde
NodeState state = root.getChildNode(INDEX_DEFINITIONS_NAME);
for (ChildNodeEntry entry : state.getChildNodeEntries()) {
NodeState definition = entry.getNodeState();
-if (wrongIndex(entry, filter)) {
+if (wrongIndex(entry, filter, root)) {
continue;
}
if (PROPERTY.equals(definition.getString(TYPE_PROPERTY_NAME))
@@ -154,9 +148,13 @@ class PropertyIndex
svn commit: r1840216 - in /jackrabbit/oak/branches/1.8: ./ oak-parent/pom.xml
Author: reschke Date: Thu Sep 6 12:29:25 2018 New Revision: 1840216 URL: http://svn.apache.org/viewvc?rev=1840216=rev Log: OAK-7685: Update easymock dependency to 3.6 (ported to 1.8) Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-parent/pom.xml Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 6 12:29:25 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,1837503,1837569,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,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.8/oak-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-parent/pom.xml?rev=1840216=1840215=1840216=diff == --- jackrabbit/oak/branches/1.8/oak-parent/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-parent/pom.xml Thu Sep 6 12:29:25 2018 @@ -540,7 +540,7 @@ org.easymock easymock -3.4 +3.6 org.mockito
svn commit: r1840211 - in /jackrabbit/oak/branches/1.8: ./ oak-core/pom.xml oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java
Author: reschke
Date: Thu Sep 6 11:11:03 2018
New Revision: 1840211
URL: http://svn.apache.org/viewvc?rev=1840211=rev
Log:
OAK-7679: oak-core: update Mockito version and fix test case to be compatible
with it (ported to 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-core/pom.xml
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java
Propchange: jackrabbit/oak/branches/1.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 6 11:11:03 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,1837503,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,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840024
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-core/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/pom.xml?rev=1840211=1840210=1840211=diff
==
--- jackrabbit/oak/branches/1.8/oak-core/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-core/pom.xml Thu Sep 6 11:11:03 2018
@@ -246,7 +246,6 @@
org.mockito
mockito-core
- 1.10.19
test
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java?rev=1840211=1840210=1840211=diff
==
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java
Thu Sep 6 11:11:03 2018
@@ -74,7 +74,7 @@ public class NodeCounterMBeanEstimatorTe
when(counter.getEstimatedNodeCount(anyString())).then((invocation -> {
String path = (String) invocation.getArguments()[0];
if (counts.containsKey(path))
svn commit: r1840207 - in /jackrabbit/oak/trunk: oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ oak-segment-t
Author: tomekr
Date: Thu Sep 6 10:31:52 2018
New Revision: 1840207
URL: http://svn.apache.org/viewvc?rev=1840207=rev
Log:
OAK-7735: Support the split persistence in the SegmentNodeStoreService.
Added:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/split/
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/split/SplitPersistence.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/split/SplitSegmentArchiveManager.java
Modified:
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarManager.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveManager.java
Modified:
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java?rev=1840207=1840206=1840207=diff
==
---
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java
Thu Sep 6 10:31:52 2018
@@ -98,6 +98,12 @@ public class AzureArchiveManager impleme
}
@Override
+public SegmentArchiveReader forceOpen(String archiveName) throws
IOException {
+CloudBlobDirectory archiveDirectory = getDirectory(archiveName);
+return new AzureSegmentArchiveReader(archiveDirectory, ioMonitor);
+}
+
+@Override
public SegmentArchiveWriter create(String archiveName) throws IOException {
return new AzureSegmentArchiveWriter(getDirectory(archiveName),
ioMonitor, monitor);
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java?rev=1840207=1840206=1840207=diff
==
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java
Thu Sep 6 10:31:52 2018
@@ -248,6 +248,12 @@ public class SegmentNodeStoreFactory {
boolean customSegmentStore() default false;
@AttributeDefinition(
+name = "Split persistence",
+description = "Boolean value indicating that the writes should
be done locally when using the custom segment store"
+)
+boolean splitPersistence() default false;
+
+@AttributeDefinition(
name = "Backup directory",
description = "Directory (relative to current working directory)
for storing repository backups. " +
"Defaults to 'repository.home/segmentstore-backup'."
@@ -467,6 +473,11 @@ public class SegmentNodeStoreFactory {
}
@Override
+public File getSplitPersistenceDirectory() {
+return new File(getRepositoryHome(),
appendRole("segmentstore-split"));
+}
+
+@Override
public int getSegmentCacheSize() {
return getCacheSize("segmentCache.size",
configuration.segmentCache_size());
}
@@ -517,6 +528,11 @@ public class SegmentNodeStoreFactory {
}
@Override
+public boolean hasSplitPersistence() {
+return configuration.splitPersistence();
+}
+
+@Override
public boolean registerDescriptors() {
return configuration.registerDescriptors();
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java?rev=1840207=1840206=1840207=diff
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/ o
Author: reschke Date: Thu Sep 6 09:55:16 2018 New Revision: 1840202 URL: http://svn.apache.org/viewvc?rev=1840202=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=1840201=1840202=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 @@ org.mockito mockito-core - 1.10.19 test 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=1840201=1840202=diff == --- jackrabbit/oak/branches/1.8/oak-blob-cloud-azure/pom.xml (original) +++
svn commit: r1840193 - in /jackrabbit/oak/branches/1.6: ./ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java
Author: frm Date: Thu Sep 6 08:11:48 2018 New Revision: 1840193 URL: http://svn.apache.org/viewvc?rev=1840193=rev Log: OAK-6890 - Fix SafeRunnable rethrow policy Backport r1814475 from trunk. Modified: jackrabbit/oak/branches/1.6/ (props changed) jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java Propchange: jackrabbit/oak/branches/1.6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 6 08:11:48 2018 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962 -/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785161,1785172,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119 ,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814189,1814332,1814397,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822850,1823172,1823655,1824896,1825471,1825654,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1829527,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830239,1830748,1831190,1831374,1832379,1832535,1833308,1834648-1834649,1834681,1835060,1837475,1837998,1838637,1839746,1840024 +/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785161,1785172,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119 ,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814189,1814332,1814397,1814475,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822850,1823172,1823655,1824896,1825471,1825654,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1829527,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830239,1830748,1831190,1831374,1832379,1832535,1833308,1834648-1834649,1834681,1835060,1837475,1837998,1838637,1839746,1840024 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java?rev=1840193=1840192=1840193=diff == ---
svn commit: r1840186 - /jackrabbit/oak/trunk/oak-parent/pom.xml
Author: reschke Date: Thu Sep 6 06:58:52 2018 New Revision: 1840186 URL: http://svn.apache.org/viewvc?rev=1840186=rev Log: OAK-7736: fix comparisonVersion for baseline check Modified: jackrabbit/oak/trunk/oak-parent/pom.xml Modified: jackrabbit/oak/trunk/oak-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1840186=1840185=1840186=diff == --- jackrabbit/oak/trunk/oak-parent/pom.xml (original) +++ jackrabbit/oak/trunk/oak-parent/pom.xml Thu Sep 6 06:58:52 2018 @@ -185,7 +185,7 @@ false true -1.8.6 +1.8.7 !org.apache.jackrabbit.oak.spi.blob
svn commit: r1840184 - /jackrabbit/oak/branches/1.6/oak-parent/pom.xml
Author: reschke
Date: Thu Sep 6 06:40:57 2018
New Revision: 1840184
URL: http://svn.apache.org/viewvc?rev=1840184=rev
Log:
OAK-7723: Update Oak 1.6 to Jackrabbit 2.14.6
Modified:
jackrabbit/oak/branches/1.6/oak-parent/pom.xml
Modified: jackrabbit/oak/branches/1.6/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-parent/pom.xml?rev=1840184=1840183=1840184=diff
==
--- jackrabbit/oak/branches/1.6/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-parent/pom.xml Thu Sep 6 06:40:57 2018
@@ -42,7 +42,7 @@
${project.build.sourceEncoding}
-2.14.5
+2.14.6
127.0.0.1
27017
MongoMKDB
svn commit: r1840183 - in /jackrabbit/oak/branches/1.8: ./ oak-examples/webapp/ oak-examples/webapp/pom.xml
Author: reschke Date: Thu Sep 6 06:38:02 2018 New Revision: 1840183 URL: http://svn.apache.org/viewvc?rev=1840183=rev Log: OAK-7583: oak-examples/webapp: update jetty-maven-plugin dependency (ported to 1.8) Modified: jackrabbit/oak/branches/1.8/ (props changed) jackrabbit/oak/branches/1.8/oak-examples/webapp/ (props changed) jackrabbit/oak/branches/1.8/oak-examples/webapp/pom.xml Propchange: jackrabbit/oak/branches/1.8/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 6 06:38:02 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,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,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/trunk:1345480 Propchange: jackrabbit/oak/branches/1.8/oak-examples/webapp/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 6 06:38:02 2018 @@ -1,3 +1,3 @@ /jackrabbit/branches/JCR-2272/jackrabbit-webapp:1173165-1176545 -/jackrabbit/oak/trunk/oak-examples/webapp:1823669,1825561,1837657 +/jackrabbit/oak/trunk/oak-examples/webapp:1823669,1825561,1834291,1837657 /jackrabbit/sandbox/JCR-2415-lucene-3.0/jackrabbit-webapp:1060860-1064038 Modified: jackrabbit/oak/branches/1.8/oak-examples/webapp/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-examples/webapp/pom.xml?rev=1840183=1840182=1840183=diff == --- jackrabbit/oak/branches/1.8/oak-examples/webapp/pom.xml (original) +++ jackrabbit/oak/branches/1.8/oak-examples/webapp/pom.xml Thu Sep 6 06:38:02 2018 @@ -212,7 +212,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.4.3.v20170317 + 9.4.11.v20180605 0
