svn commit: r1854515 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment: Record.java scheduler/Commit.java scheduler/LockBasedScheduler.java

2019-02-28 Thread mduerig 
Author: mduerig
Date: Thu Feb 28 09:58:13 2019
New Revision: 1854515

URL: http://svn.apache.org/viewvc?rev=1854515=rev
Log:
OAK-8071: Logging to detect commits carrying over from previous GC generation 
can block other threads from committing
Log warnings for commits being blocked on the current commit taking a long time 
or the current commit crossing a gc boundary.

Modified:

jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java

jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java

jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java?rev=1854515=1854514=1854515=diff
==
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java
 Thu Feb 28 09:58:13 2019
@@ -18,6 +18,7 @@
  */
 package org.apache.jackrabbit.oak.segment;
 
+import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -83,6 +84,16 @@ class Record {
 return new RecordId(segmentId, recordNumber);
 }
 
+/**
+ * Get the underlying segment's gc generation. Might cause the segment to
+ * get loaded if the generation info is missing
+ * @return the segment's gc generation
+ */
+@NotNull
+public GCGeneration getGcGeneration() {
+return segmentId.getGcGeneration();
+}
+
 //< Object >--
 
 @Override

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java?rev=1854515=1854514=1854515=diff
==
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java
 Thu Feb 28 09:58:13 2019
@@ -23,12 +23,14 @@ import static com.google.common.base.Pre
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder;
 import org.apache.jackrabbit.oak.segment.SegmentNodeState;
+import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
 import org.apache.jackrabbit.oak.spi.commit.CommitHook;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.state.ConflictAnnotatingRebaseDiff;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A {@code Commit} instance represents a set of related changes, which when
@@ -41,6 +43,8 @@ public class Commit {
 private final CommitHook hook;
 private final CommitInfo info;
 
+private volatile GCGeneration gcGeneration;
+
 public Commit(@NotNull NodeBuilder changes, @NotNull CommitHook hook, 
@NotNull CommitInfo info) {
 checkNotNull(changes);
 checkArgument(changes instanceof SegmentNodeBuilder);
@@ -51,6 +55,30 @@ public class Commit {
 }
 
 /**
+ * This method makes a best effort on getting the gc generation of the 
current commit.
+ * However it avoids causing a write ahead action by calling {@link 
NodeBuilder#getName(String)}
+ * on the changes in this commit.
+ *
+ * @return  the gc generation of this commit or {@code null} if not yet 
available.
+ */
+@Nullable
+public GCGeneration getGCGeneration() {
+return gcGeneration;
+}
+
+@NotNull
+private NodeState getBeforeState() {
+return changes.getBaseState();
+}
+
+@NotNull
+private SegmentNodeState getAfterState() {
+SegmentNodeState after = changes.getNodeState();
+gcGeneration = after.getGcGeneration();
+return after;
+}
+
+/**
  * Apply the changes represented by this commit to the passed {@code base}
  * node state.
  *
@@ -63,19 +91,19 @@ public class Commit {
  */
 public SegmentNodeState apply(SegmentNodeState base) throws 
CommitFailedException {
 SegmentNodeBuilder builder = base.builder();
-if (SegmentNodeState.fastEquals(changes.getBaseState(), 
base.getChildNode(ROOT))) {
+

svn commit: r1854525 - in /jackrabbit/oak/branches/1.8: ./ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/

2019-02-28 Thread reschke 
Author: reschke
Date: Thu Feb 28 13:34:10 2019
New Revision: 1854525

URL: http://svn.apache.org/viewvc?rev=1854525=rev
Log:
OAK-8088: Add refresh head revision time to background update stats (ported to 
1.8)

Modified:
jackrabbit/oak/branches/1.8/   (props changed)

jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java

jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java

Propchange: jackrabbit/oak/branches/1.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 28 13:34:10 2019
@@ -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,1822182,1822201,1822207,1822527,1822642,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,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347
 
,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843652,1843911,1844070,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1850
 
874,1851533-1851535,1851619,1852120,1852451,1852492,1852528,1852582,1852584,1853141,1853229,1853393,1853429,1853433,1853866,1853870,1853893,1853969,1853997,1854044
+/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,1822182,1822201,1822207,1822527,1822642,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,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347
 
,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843652,1843911,1844070,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1850

svn commit: r1854530 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/ oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ oak-core/src/test/

2019-02-28 Thread angela 
Author: angela
Date: Thu Feb 28 14:26:48 2019
New Revision: 1854530

URL: http://svn.apache.org/viewvc?rev=1854530=rev
Log:
OAK-8062 : PrincipalProvider: optional lookup of ItemBasedPrincipal by path

Modified:

jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java

jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java

jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/AbstractPrincipalProviderTest.java

jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java

jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java

jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java

jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java?rev=1854530=1854529=1854530=diff
==
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
 Thu Feb 28 14:26:48 2019
@@ -16,17 +16,11 @@
  */
 package org.apache.jackrabbit.oak.security.principal;
 
-import java.security.Principal;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import javax.jcr.RepositoryException;
-
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterators;
+import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;
 import org.apache.jackrabbit.api.security.principal.PrincipalManager;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Query;
@@ -46,6 +40,13 @@ import org.jetbrains.annotations.Nullabl
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.jcr.RepositoryException;
+import java.security.Principal;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
 /**
  * The {@code PrincipalProviderImpl} is a principal provider implementation
  * that operates on principal information read from user information exposed by
@@ -56,14 +57,17 @@ class PrincipalProviderImpl implements P
 private static final Logger log = 
LoggerFactory.getLogger(PrincipalProviderImpl.class);
 
 private final UserManager userManager;
+private final NamePathMapper namePathMapper;
 
 PrincipalProviderImpl(@NotNull Root root,
   @NotNull UserConfiguration userConfiguration,
   @NotNull NamePathMapper namePathMapper) {
 this.userManager = userConfiguration.getUserManager(root, 
namePathMapper);
+this.namePathMapper = namePathMapper;
 }
 
 //--< PrincipalProvider 
>---
+@Nullable
 @Override
 public Principal getPrincipal(@NotNull String principalName) {
 Authorizable authorizable = getAuthorizable(new 
PrincipalImpl(principalName));
@@ -79,6 +83,23 @@ class PrincipalProviderImpl implements P
 return (EveryonePrincipal.NAME.equals(principalName)) ? 
EveryonePrincipal.getInstance() : null;
 }
 
+@Nullable
+@Override
+public ItemBasedPrincipal getItemBasedPrincipal(@NotNull String 
principalOakPath) {
+try {
+Authorizable authorizable = 
userManager.getAuthorizableByPath(namePathMapper.getJcrPath(principalOakPath));
+if (authorizable != null) {
+Principal principal = authorizable.getPrincipal();
+if (principal instanceof ItemBasedPrincipal) {
+return (ItemBasedPrincipal) principal;
+}
+}
+} catch (RepositoryException e) {
+log.debug(e.getMessage());
+}
+return null;
+}
+
 @NotNull
 @Override
 public Set getMembershipPrincipals(@NotNull Principal 
principal) {

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
URL:

svn commit: r1854524 - in /jackrabbit/oak/branches/1.10: ./ oak-doc/src/site/markdown/nodestore/document/rdb-document-store.md oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/docume

2019-02-28 Thread reschke 
Author: reschke
Date: Thu Feb 28 13:27:37 2019
New Revision: 1854524

URL: http://svn.apache.org/viewvc?rev=1854524=rev
Log:
OAK-8080: RDB*Store: move DB-specific config hints from Javadoc into oak-doc 
(ported to 1.10)

Modified:
jackrabbit/oak/branches/1.10/   (props changed)

jackrabbit/oak/branches/1.10/oak-doc/src/site/markdown/nodestore/document/rdb-document-store.md

jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Propchange: jackrabbit/oak/branches/1.10/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 28 13:27:37 2019
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854462,1854466,1854468
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854462,1854466,1854468
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.10/oak-doc/src/site/markdown/nodestore/document/rdb-document-store.md
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-doc/src/site/markdown/nodestore/document/rdb-document-store.md?rev=1854524=1854523=1854524=diff
==
--- 
jackrabbit/oak/branches/1.10/oak-doc/src/site/markdown/nodestore/document/rdb-document-store.md
 (original)
+++ 
jackrabbit/oak/branches/1.10/oak-doc/src/site/markdown/nodestore/document/rdb-document-store.md
 Thu Feb 28 13:27:37 2019
@@ -57,7 +57,7 @@ will attempt to start anyway):
 ~~~
 
 
-## Database Creation
+##  Database Creation
 
 `RDBDocumentStore` relies on JDBC, and thus, in general, can not create
 database instances (that said, certain DBs such as Apache Derby or H2DB can 
create the
@@ -70,8 +70,62 @@ the correct operation:
 
 - character fields must be able to store any Unicode code point - UTF-8 
encoding is recommended
 - the collation for character fields needs to sort by Unicode code points
+- BLOBs need to support sizes of ~16MB
 
-## Table Creation
+The subsections below give examples that have been found to work during the
+development of `RDBDocumentStore`.
+
+
+###  DB2
+
+Creating a database called `OAK`:
+~~~
+create database oak USING CODESET UTF-8 TERRITORY DEFAULT COLLATE USING 
IDENTITY;
+~~~
+
+To verify, check that INFO level log message written by `RDBDocumentStore`
+upon startup. For example:
+
+~~~
+14:47:20.332 INFO  [main] RDBDocumentStore.java:1065RDBDocumentStore 
(SNAPSHOT) instantiated for database DB2/NT64 SQL11014 (11.1), using driver: 
IBM Data Server Driver for JDBC and SQLJ 4.19.77 (4.19), connecting to: 
jdbc:db2://localhost:50276/OAK, properties: {DB2ADMIN.CODEPAGE=1208, 
DB2ADMIN.COLLATIONSCHEMA=SYSIBM, DB2ADMIN.COLLATIONNAME=IDENTITY}, transaction 
isolation level: TRANSACTION_READ_COMMITTED (2), DB2ADMIN.NODES: ID 
VARCHAR(512), MODIFIED BIGINT, HASBINARY SMALLINT, DELETEDONCE SMALLINT, 
MODCOUNT BIGINT, CMODCOUNT BIGINT, DSIZE BIGINT, VERSION SMALLINT, SDTYPE 
SMALLINT, SDMAXREVTIME BIGINT, DATA VARCHAR(16384), BDATA BLOB(1073741824) /* 
{BIGINT=-5, BLOB=2004, SMALLINT=5, VARCHAR=12} */ /* index DB2ADMIN.NODES_MOD 
on DB2ADMIN.NODES (MODIFIED ASC) other (#0, p0), unique index DB2ADMIN.NODES_PK 
on DB2ADMIN.NODES (ID ASC) clustered (#0, p0), index DB2ADMIN.NODES_SDM on 
DB2ADMIN.NODES (SDMAXREVTIME ASC) other (#0, p0), index DB2ADMIN.NODES_SDT on 
DB2ADMIN.NODES (SDT
 YPE ASC) other (#0, p0), index DB2ADMIN.NODES_VSN on DB2ADMIN.NODES (VERSION 
ASC) other (#0, p0) */
+~~~
+
+
+###  MySQL
+
+Creating a database called `OAK`:
+~~~
+create database oak DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+~~~
+
+Also make sure to configure the `max_allowed_packet` parameter
+for the server (mysqld) to a value greater than 4M (such as 8388608).
+
+To verify, check that INFO level log message written by `RDBDocumentStore`
+upon startup. For example:
+
+~~~
+13:40:46.637 INFO  [main] RDBDocumentStore.java:1065RDBDocumentStore 
(SNAPSHOT) instantiated for database MySQL 8.0.15 (8.0), using driver: MySQL 
Connector/J mysql-connector-java-8.0.15 (Revision: 
79a4336f140499bd22dd07f02b708e163844e3d5) (8.0), connecting to: 
jdbc:mysql://localhost:3306/oak?serverTimezone=UTC, properties: 
{character_set_database=utf8mb4, character_set_client=utf8mb4, 
character_set_connection=utf8mb4, character_set_results=, 
max_allowed_packet=8388608, collation_database=utf8mb4_unicode_ci,

svn commit: r1854516 - in /jackrabbit/oak/branches/1.10: ./ oak-parent/pom.xml

2019-02-28 Thread reschke 
Author: reschke
Date: Thu Feb 28 10:25:26 2019
New Revision: 1854516

URL: http://svn.apache.org/viewvc?rev=1854516=rev
Log:
OAK-8087: RDB*Store: update mssql-jdbc driver reference to 7.2.1.jre8 (ported 
to 1.10)

Modified:
jackrabbit/oak/branches/1.10/   (props changed)
jackrabbit/oak/branches/1.10/oak-parent/pom.xml

Propchange: jackrabbit/oak/branches/1.10/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 28 10:25:26 2019
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854462
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854462,1854468
 /jackrabbit/trunk:1345480

Modified: jackrabbit/oak/branches/1.10/oak-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-parent/pom.xml?rev=1854516=1854515=1854516=diff
==
--- jackrabbit/oak/branches/1.10/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.10/oak-parent/pom.xml Thu Feb 28 10:25:26 2019
@@ -1063,7 +1063,7 @@
 
   com.microsoft.sqlserver
   mssql-jdbc
-  7.0.0.jre8
+  7.2.1.jre8

svn commit: r1854520 - in /jackrabbit/oak/branches/1.10: ./ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/

2019-02-28 Thread reschke 
Author: reschke
Date: Thu Feb 28 12:12:39 2019
New Revision: 1854520

URL: http://svn.apache.org/viewvc?rev=1854520=rev
Log:
OAK-8088: Add refresh head revision time to background update stats (ported to 
1.10)

Modified:
jackrabbit/oak/branches/1.10/   (props changed)

jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java

jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java

Propchange: jackrabbit/oak/branches/1.10/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 28 12:12:39 2019
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854462,1854468
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854462,1854466,1854468
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java?rev=1854520=1854519=1854520=diff
==
--- 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java
 (original)
+++ 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java
 Thu Feb 28 12:12:39 2019
@@ -23,6 +23,7 @@ class BackgroundWriteStats {
 
 long clean;
 long split;
+long refresh;
 long sweep;
 long lock;
 long write;
@@ -34,6 +35,7 @@ class BackgroundWriteStats {
 public String toString() {
 return "clean:" + clean +
 ", split:" + split +
+", refresh:" + refresh +
 ", sweep:" + sweep +
 ", lock:" + lock +
 ", write:" + write +

Modified: 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1854520=1854519=1854520=diff
==
--- 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 (original)
+++ 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 Thu Feb 28 12:12:39 2019
@@ -2036,9 +2036,12 @@ public final class DocumentNodeStore
 // split documents (does not create new revisions)
 backgroundSplit();
 long splitTime = clock.getTime() - time;
+time = clock.getTime();
 maybeRefreshHeadRevision();
+long refreshTime = clock.getTime() - time;
 // write back pending updates to _lastRev
 stats = backgroundWrite();
+stats.refresh = refreshTime;
 stats.split = splitTime;
 stats.clean = cleanTime;
 stats.totalWriteTime = clock.getTime() - start;

svn commit: r1854539 - /jackrabbit/oak/trunk/oak-examples/standalone/pom.xml

2019-02-28 Thread reschke 
Author: reschke
Date: Thu Feb 28 16:57:50 2019
New Revision: 1854539

URL: http://svn.apache.org/viewvc?rev=1854539=rev
Log:
OAK-8098: oak-examples/webapp: update spring boot dependency to 1.5.19

Modified:
jackrabbit/oak/trunk/oak-examples/standalone/pom.xml

Modified: jackrabbit/oak/trunk/oak-examples/standalone/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/pom.xml?rev=1854539=1854538=1854539=diff
==
--- jackrabbit/oak/trunk/oak-examples/standalone/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/standalone/pom.xml Thu Feb 28 16:57:50 
2019
@@ -36,7 +36,7 @@
 
   
 true
-1.5.16.RELEASE
+1.5.19.RELEASE

svn commit: r1854533 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java oak-it/src/test/java/org/apache/jackrabbit/oak/InitialConten

2019-02-28 Thread stillalex 
Author: stillalex
Date: Thu Feb 28 15:14:36 2019
New Revision: 1854533

URL: http://svn.apache.org/viewvc?rev=1854533=rev
Log:
OAK-8095 VersionStorageEditor can prevent upgrade of version store


Modified:

jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java

jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java?rev=1854533=1854532=1854533=diff
==
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
 Thu Feb 28 15:14:36 2019
@@ -54,17 +54,19 @@ class VersionStorageEditor extends Defau
 VersionStorageEditor(@NotNull NodeBuilder versionStorageNode,
  @NotNull NodeBuilder workspaceRoot) {
 this(versionStorageNode, workspaceRoot, versionStorageNode,
-VERSION_STORE_PATH);
+VERSION_STORE_PATH, false);
 }
 
 private VersionStorageEditor(@NotNull NodeBuilder versionStorageNode,
  @NotNull NodeBuilder workspaceRoot,
  @NotNull NodeBuilder builder,
- @NotNull String path) {
+ @NotNull String path,
+ boolean initPhase) {
 this.versionStorageNode = checkNotNull(versionStorageNode);
 this.workspaceRoot = checkNotNull(workspaceRoot);
 this.builder = checkNotNull(builder);
 this.path = checkNotNull(path);
+this.initPhase = initPhase;
 }
 
 @Override
@@ -88,8 +90,7 @@ class VersionStorageEditor extends Defau
 if (d < VERSION_HISTORY_DEPTH && !isVersionStorageNode(after)) {
 return null;
 }
-return new VersionStorageEditor(versionStorageNode, workspaceRoot,
-builder.child(name), p);
+return new VersionStorageEditor(versionStorageNode, workspaceRoot, 
builder.child(name), p, initPhase);
 }
 
 @Override

Modified: 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java?rev=1854533=1854532=1854533=diff
==
--- 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/InitialContentTest.java
 Thu Feb 28 15:14:36 2019
@@ -26,6 +26,7 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
 import org.apache.jackrabbit.oak.spi.version.VersionConstants;
 import org.junit.Test;
 
@@ -77,6 +78,27 @@ public class InitialContentTest implemen
 NodeBuilder builder = before.builder();
 new 
InitialContent().withPrePopulatedVersionStore().initialize(builder);
 NodeState after = builder.getNodeState();
+new VersionHook().processCommit(before, after, CommitInfo.EMPTY);
+}
+
+
+@Test
+public void validatePrePopulatedNonEmpty() throws Exception {
+NodeState init = EMPTY_NODE;
+NodeBuilder builderI = init.builder();
+
+// create a partial version storage structure
+new 
InitialContent().withPrePopulatedVersionStore().initialize(builderI);
+NodeBuilder versionStorage = 
builderI.child(JCR_SYSTEM).child(JCR_VERSIONSTORAGE);
+versionStorage.removeProperty(VERSION_STORE_INIT);
+versionStorage.getChildNode("00").getChildNode("00").remove();
+versionStorage.getChildNode("01").getChildNode("00").remove();
+versionStorage.getChildNode("02").remove();
+
+NodeState before = builderI.getNodeState();
+NodeBuilder builder = before.builder();
+new 
InitialContent().withPrePopulatedVersionStore().initialize(builder);
+NodeState after = builder.getNodeState();
 new VersionHook().processCommit(before, after, CommitInfo.EMPTY);
 }
 }

svn commit: r1854535 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java

2019-02-28 Thread angela 
Author: angela
Date: Thu Feb 28 15:43:04 2019
New Revision: 1854535

URL: http://svn.apache.org/viewvc?rev=1854535=rev
Log:
OAK-8096 : CompositeAccessControlManager: misleading local field name

Modified:

jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java?rev=1854535=1854534=1854535=diff
==
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
 Thu Feb 28 15:43:04 2019
@@ -83,11 +83,11 @@ class CompositeAccessControlManager exte
 
 @Override
 public AccessControlPolicy[] getEffectivePolicies(String absPath) throws 
RepositoryException {
-ImmutableList.Builder privs = 
ImmutableList.builder();
+ImmutableList.Builder policies = 
ImmutableList.builder();
 for (AccessControlManager acMgr : acMgrs) {
-privs.add(acMgr.getEffectivePolicies(absPath));
+policies.add(acMgr.getEffectivePolicies(absPath));
 }
-List l = privs.build();
+List l = policies.build();
 return l.toArray(new AccessControlPolicy[0]);
 }
 
@@ -139,25 +139,25 @@ class CompositeAccessControlManager exte
 
 @Override
 public JackrabbitAccessControlPolicy[] getPolicies(Principal principal) 
throws RepositoryException {
-ImmutableList.Builder privs = 
ImmutableList.builder();
+ImmutableList.Builder policies = 
ImmutableList.builder();
 for (AccessControlManager acMgr : acMgrs) {
 if (acMgr instanceof JackrabbitAccessControlManager) {
-privs.add(((JackrabbitAccessControlManager) 
acMgr).getPolicies(principal));
+policies.add(((JackrabbitAccessControlManager) 
acMgr).getPolicies(principal));
 }
 }
-List l = privs.build();
+List l = policies.build();
 return l.toArray(new JackrabbitAccessControlPolicy[0]);
 }
 
 @Override
 public AccessControlPolicy[] getEffectivePolicies(Set 
principals) throws RepositoryException {
-ImmutableList.Builder privs = 
ImmutableList.builder();
+ImmutableList.Builder policies = 
ImmutableList.builder();
 for (AccessControlManager acMgr : acMgrs) {
 if (acMgr instanceof JackrabbitAccessControlManager) {
-privs.add(((JackrabbitAccessControlManager) 
acMgr).getEffectivePolicies(principals));
+policies.add(((JackrabbitAccessControlManager) 
acMgr).getEffectivePolicies(principals));
 }
 }
-List l = privs.build();
+List l = policies.build();
 return l.toArray(new AccessControlPolicy[0]);
 }
 }

svn commit: r1854559 - in /jackrabbit/oak/branches/1.10: ./ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/

2019-02-28 Thread mduerig 
Author: mduerig
Date: Fri Mar  1 07:20:15 2019
New Revision: 1854559

URL: http://svn.apache.org/viewvc?rev=1854559=rev
Log:
OAK-8071: Logging to detect commits carrying over from previous GC generation 
can block other threads from committing
Merged r1854515

Modified:
jackrabbit/oak/branches/1.10/   (props changed)

jackrabbit/oak/branches/1.10/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java

jackrabbit/oak/branches/1.10/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java

jackrabbit/oak/branches/1.10/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java

Propchange: jackrabbit/oak/branches/1.10/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  1 07:20:15 2019
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854462,1854466,1854468
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854462,1854466,1854468,1854515
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.10/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java?rev=1854559=1854558=1854559=diff
==
--- 
jackrabbit/oak/branches/1.10/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java
 (original)
+++ 
jackrabbit/oak/branches/1.10/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java
 Fri Mar  1 07:20:15 2019
@@ -18,6 +18,7 @@
  */
 package org.apache.jackrabbit.oak.segment;
 
+import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -83,6 +84,16 @@ class Record {
 return new RecordId(segmentId, recordNumber);
 }
 
+/**
+ * Get the underlying segment's gc generation. Might cause the segment to
+ * get loaded if the generation info is missing
+ * @return the segment's gc generation
+ */
+@NotNull
+public GCGeneration getGcGeneration() {
+return segmentId.getGcGeneration();
+}
+
 //< Object >--
 
 @Override

Modified: 
jackrabbit/oak/branches/1.10/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java?rev=1854559=1854558=1854559=diff
==
--- 
jackrabbit/oak/branches/1.10/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java
 (original)
+++ 
jackrabbit/oak/branches/1.10/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java
 Fri Mar  1 07:20:15 2019
@@ -23,12 +23,14 @@ import static com.google.common.base.Pre
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder;
 import org.apache.jackrabbit.oak.segment.SegmentNodeState;
+import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
 import org.apache.jackrabbit.oak.spi.commit.CommitHook;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.state.ConflictAnnotatingRebaseDiff;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A {@code Commit} instance represents a set of related changes, which when
@@ -41,6 +43,8 @@ public class Commit {
 private final CommitHook hook;
 private final CommitInfo info;
 
+private volatile GCGeneration gcGeneration;
+
 public Commit(@NotNull NodeBuilder changes, @NotNull CommitHook hook, 
@NotNull CommitInfo info) {
 checkNotNull(changes);
 checkArgument(changes instanceof SegmentNodeBuilder);
@@ -51,6 +55,30 @@ public class Commit {
 }
 
 /**
+ * This method makes a best effort on getting the gc generation of the 
current commit.
+ * However it avoids causing a write ahead

svn commit: r1854560 - in /jackrabbit/oak/branches/1.8: ./ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/

2019-02-28 Thread mduerig 
Author: mduerig
Date: Fri Mar  1 07:20:30 2019
New Revision: 1854560

URL: http://svn.apache.org/viewvc?rev=1854560=rev
Log:
OAK-8071: Logging to detect commits carrying over from previous GC generation 
can block other threads from committing
> Merged r1854515

Modified:
jackrabbit/oak/branches/1.8/   (props changed)

jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Record.java

jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java

jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java

Propchange: jackrabbit/oak/branches/1.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  1 07:20:30 2019
@@ -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,1822182,1822201,1822207,1822527,1822642,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,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347
 
,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843652,1843911,1844070,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1850
 
874,1851533-1851535,1851619,1852120,1852451,1852492,1852528,1852582,1852584,1853141,1853229,1853393,1853429,1853433,1853866,1853870,1853893,1853969,1853997,1854044,1854466
+/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,1822182,1822201,1822207,1822527,1822642,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,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347

svn commit: r1854508 - in /jackrabbit/oak/branches/1.10: ./ oak-parent/pom.xml

2019-02-28 Thread reschke 
Author: reschke
Date: Thu Feb 28 08:06:54 2019
New Revision: 1854508

URL: http://svn.apache.org/viewvc?rev=1854508=rev
Log:
OAK-8085: Upgrade spotbugs to 3.1.11 (ported to 1.10)

Modified:
jackrabbit/oak/branches/1.10/   (props changed)
jackrabbit/oak/branches/1.10/oak-parent/pom.xml

Propchange: jackrabbit/oak/branches/1.10/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 28 08:06:54 2019
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854462
 /jackrabbit/trunk:1345480

Modified: jackrabbit/oak/branches/1.10/oak-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-parent/pom.xml?rev=1854508=1854507=1854508=diff
==
--- jackrabbit/oak/branches/1.10/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.10/oak-parent/pom.xml Thu Feb 28 08:06:54 2019
@@ -323,7 +323,7 @@
 
   com.github.spotbugs
   spotbugs-maven-plugin
-  3.1.5
+  3.1.11