You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2018/08/13 13:52:41 UTC
svn commit: r1837950 - in /jackrabbit/oak/branches/1.8: ./ oak-parent/
oak-run/ oak-store-document/ oak-store-document/src/test/java/com/mongodb/
oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/
Author: mreutegg
Date: Mon Aug 13 13:52:41 2018
New Revision: 1837950
URL: http://svn.apache.org/viewvc?rev=1837950&view=rev
Log:
OAK-7359: Update to MongoDB Java driver 3.6
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-parent/pom.xml
jackrabbit/oak/branches/1.8/oak-run/pom.xml
jackrabbit/oak/branches/1.8/oak-store-document/pom.xml
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/com/mongodb/OakFongo.java
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 13 13:52:41 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,1828439,1828529,1828948,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830347,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1833347
,1833833,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835642,1835780,1835819,1836487,1836493,1837475,1837657
+/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,1828529,1828948,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830347,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308
,1833347,1833833,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835642,1835780,1835819,1836487,1836493,1837475,1837657
/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=1837950&r1=1837949&r2=1837950&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-parent/pom.xml Mon Aug 13 13:52:41 2018
@@ -51,7 +51,7 @@
<segment.db>SegmentMK</segment.db>
<lucene.version>4.7.1</lucene.version>
<solr.version>5.5.5</solr.version>
- <mongo.driver.version>3.4.0</mongo.driver.version>
+ <mongo.driver.version>3.6.3</mongo.driver.version>
<!-- Note that we're using SLF4J API version 1.7 when compiling -->
<!-- core Oak components but more recent SLF4J and Logback versions -->
<!-- when compiling and running test cases and the oak-run jar. -->
Modified: jackrabbit/oak/branches/1.8/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/pom.xml?rev=1837950&r1=1837949&r2=1837950&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-run/pom.xml Mon Aug 13 13:52:41 2018
@@ -36,6 +36,7 @@
<!--
Size History:
+ 51 MB AWS java sdk update (OAK-7536)
+ + 49 MB MongoDB Java driver 3.6.3 is bigger (OAK-7359)
+ 48 MB Transitive dependencies needed for aws-java-sdk (OAK-6899)
+ 47 MB release profile build slightly bigger jar (OAK-6252)
+ 46 MB re-introduced the ServerCommand and required dependencies (OAK-6252)
Modified: jackrabbit/oak/branches/1.8/oak-store-document/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/pom.xml?rev=1837950&r1=1837949&r2=1837950&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/pom.xml Mon Aug 13 13:52:41 2018
@@ -327,7 +327,7 @@
<dependency>
<groupId>com.github.fakemongo</groupId>
<artifactId>fongo</artifactId>
- <version>2.0.6</version>
+ <version>2.2.0-RC1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/com/mongodb/OakFongo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/com/mongodb/OakFongo.java?rev=1837950&r1=1837949&r2=1837950&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/com/mongodb/OakFongo.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/com/mongodb/OakFongo.java Mon Aug 13 13:52:41 2018
@@ -120,13 +120,14 @@ public class OakFongo extends Fongo {
@Override
public synchronized FongoDBCollection doGetCollection(String name,
- boolean idIsNotUniq) {
+ boolean idIsNotUniq,
+ boolean validateOnInsert) {
if (name.startsWith("system.")) {
- return super.doGetCollection(name, idIsNotUniq);
+ return super.doGetCollection(name, idIsNotUniq, validateOnInsert);
}
FongoDBCollection coll = collMap.get(name);
if (coll == null) {
- coll = new OakFongoDBCollection(this, name, idIsNotUniq);
+ coll = new OakFongoDBCollection(this, name, idIsNotUniq, validateOnInsert);
collMap.put(name, coll);
}
return coll;
@@ -148,8 +149,9 @@ public class OakFongo extends Fongo {
public OakFongoDBCollection(FongoDB db,
String name,
- boolean idIsNotUniq) {
- super(db, name, idIsNotUniq);
+ boolean idIsNotUniq,
+ boolean validateOnInsert) {
+ super(db, name, idIsNotUniq, validateOnInsert);
}
@Override
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java?rev=1837950&r1=1837949&r2=1837950&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoConnectionTest.java Mon Aug 13 13:52:41 2018
@@ -90,17 +90,17 @@ public class MongoConnectionTest {
public void socketKeepAlive() throws Exception {
assumeTrue(MongoUtils.isAvailable());
MongoClientOptions.Builder options = MongoConnection.getDefaultBuilder();
- options.socketKeepAlive(true);
+ options.socketKeepAlive(false);
MongoConnection c = new MongoConnection(MongoUtils.URL, options);
try {
- assertTrue(c.getDB().getMongo().getMongoOptions().isSocketKeepAlive());
+ assertFalse(c.getDB().getMongo().getMongoOptions().isSocketKeepAlive());
} finally {
c.close();
}
- // default is without keep-alive
+ // default is with keep-alive (starting with 3.6 driver)
c = new MongoConnection(MongoUtils.URL);
try {
- assertFalse(c.getDB().getMongo().getMongoOptions().isSocketKeepAlive());
+ assertTrue(c.getDB().getMongo().getMongoOptions().isSocketKeepAlive());
} finally {
c.close();
}