This is an automated email from the ASF dual-hosted git repository. pdallig pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push: new ee3fe5e ZEPPELIN-5615 Update flapdoodle-mongo to a newer version that supports Linux ARM64 ee3fe5e is described below commit ee3fe5e7e2c8be68213328bf48bb57893caf4e6f Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> AuthorDate: Wed Dec 22 22:36:37 2021 +0200 ZEPPELIN-5615 Update flapdoodle-mongo to a newer version that supports Linux ARM64 ### What is this PR for? Update the version of Embedded Mongo to a new version that supports Linux ARM64. Also update the version of Mongo driver ### What type of PR is it? Improvement ### Todos No, ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-5615 ### How should this be tested? * The build and tests should pass on Linux ARM64 once it is enabled. See https://github.com/apache/zeppelin/pull/4243 ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? - NO * Is there breaking changes for older versions? - NO * Does this needs documentation? - NO Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Closes #4276 from martin-g/update-embedded-mongo and squashes the following commits: 61a98c0f5 [Martin Tzvetanov Grigorov] ZEPPELIN-5615 Update the version of mongo-java-driver in bin_license/LICENSE fd6e5634f [Martin Tzvetanov Grigorov] ZEPPELIN-5615 Update the version of mongo-java-driver in bin_license/LICENSE 17af869f8 [Martin Tzvetanov Grigorov] ZEPPELIN-5615 Fix the build. Use the new APIs 342442f6e [Martin Tzvetanov Grigorov] ZEPPELIN-5615 Update flapdoodle-mongo to a newer version that supports Linux ARM64 --- zeppelin-distribution/src/bin_license/LICENSE | 2 +- zeppelin-plugins/notebookrepo/mongo/pom.xml | 4 ++-- .../org/apache/zeppelin/notebook/repo/MongoNotebookRepoTest.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index 4a7ac72..c956727 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -223,7 +223,7 @@ The following components are provided under Apache License. (Apache 2.0) Scalatest 2.2.4 (org.scalatest:scalatest_2.10:2.2.4 - https://github.com/scalatest/scalatest) (Apache 2.0) frontend-maven-plugin 1.3 (com.github.eirslett:frontend-maven-plugin:1.3 - https://github.com/eirslett/frontend-maven-plugin/blob/frontend-plugins-1.3/LICENSE (Apache 2.0) frontend-plugin-core 1.3 (com.github.eirslett:frontend-plugin-core) - https://github.com/eirslett/frontend-maven-plugin/blob/frontend-plugins-1.3/LICENSE - (Apache 2.0) mongo-java-driver 3.4.1 (org.mongodb:mongo-java-driver:3.4.1) - https://github.com/mongodb/mongo-java-driver/blob/master/LICENSE.txt + (Apache 2.0) mongo-java-driver 3.12.10 (org.mongodb:mongo-java-driver:3.12.10) - https://github.com/mongodb/mongo-java-driver/blob/master/LICENSE.txt (Apache 2.0) Neo4j Java Driver (https://github.com/neo4j/neo4j-java-driver) - https://github.com/neo4j/neo4j-java-driver/blob/1.4.3/LICENSE.txt (Apache 2.0) Hazelcast Jet (http://jet.hazelcast.org) - https://github.com/hazelcast/hazelcast-jet/blob/master/LICENSE (Apache 2.0) RxJava (io.reactivex.rxjava2:rxjava:2.2.17) - https://github.com/ReactiveX/RxJava/blob/2.x/LICENSE diff --git a/zeppelin-plugins/notebookrepo/mongo/pom.xml b/zeppelin-plugins/notebookrepo/mongo/pom.xml index 2ed9179..988348b 100644 --- a/zeppelin-plugins/notebookrepo/mongo/pom.xml +++ b/zeppelin-plugins/notebookrepo/mongo/pom.xml @@ -43,12 +43,12 @@ <dependency> <groupId>org.mongodb</groupId> <artifactId>mongo-java-driver</artifactId> - <version>3.4.1</version> + <version>3.12.10</version> </dependency> <dependency> <groupId>de.flapdoodle.embed</groupId> <artifactId>de.flapdoodle.embed.mongo</artifactId> - <version>2.2.0</version> + <version>3.2.4</version> <scope>test</scope> <exclusions> <exclusion> diff --git a/zeppelin-plugins/notebookrepo/mongo/src/test/java/org/apache/zeppelin/notebook/repo/MongoNotebookRepoTest.java b/zeppelin-plugins/notebookrepo/mongo/src/test/java/org/apache/zeppelin/notebook/repo/MongoNotebookRepoTest.java index 57a5626..9b50736 100644 --- a/zeppelin-plugins/notebookrepo/mongo/src/test/java/org/apache/zeppelin/notebook/repo/MongoNotebookRepoTest.java +++ b/zeppelin-plugins/notebookrepo/mongo/src/test/java/org/apache/zeppelin/notebook/repo/MongoNotebookRepoTest.java @@ -19,6 +19,7 @@ package org.apache.zeppelin.notebook.repo; import static org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars.ZEPPELIN_NOTEBOOK_MONGO_URI; import static org.junit.Assert.assertEquals; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -27,8 +28,7 @@ import java.net.ServerSocket; import java.util.Map; import de.flapdoodle.embed.mongo.MongodExecutable; import de.flapdoodle.embed.mongo.MongodStarter; -import de.flapdoodle.embed.mongo.config.IMongodConfig; -import de.flapdoodle.embed.mongo.config.MongodConfigBuilder; +import de.flapdoodle.embed.mongo.config.MongodConfig; import de.flapdoodle.embed.mongo.config.Net; import de.flapdoodle.embed.mongo.distribution.Version; import de.flapdoodle.embed.process.runtime.Network; @@ -53,7 +53,7 @@ public class MongoNotebookRepoTest { int port = socket.getLocalPort(); socket.close(); - IMongodConfig mongodConfig = new MongodConfigBuilder() + MongodConfig mongodConfig = MongodConfig.builder() .version(Version.Main.PRODUCTION) .net(new Net(bindIp, port, Network.localhostIsIPv6())) .build();