Gradle 7.4.2

Move tests to junit jupiter
Minor libs upgrade:
elasticsearch 7.17.3
jackson 2.13.2
jakarta.json-api 2.1.0
parsson 1.1.0
yasson 2.0.4
classgraph 4.8.146
testcontainers 1.17.1

Author: altro3

.gitignore

@@ -16,6 +16,7 @@ gradle-app.setting
 # IntelliJ Idea
 .idea
 *.iml
+out
 
 .ci/output
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,24 +1,5 @@
-#
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,24 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
 #
 # Copyright 2015 the original author or authors.
 #
@@ -149,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -26,8 +26,8 @@ plugins {
     `java-library`
     checkstyle
     `maven-publish`
-    id("com.github.jk1.dependency-license-report") version "1.17"
-    id("de.thetaphi.forbiddenapis") version "3.2"
+    id("com.github.jk1.dependency-license-report") version "1.19"
+    id("de.thetaphi.forbiddenapis") version "3.3"
 }
 
 java {
@@ -171,8 +171,8 @@ publishing {
 dependencies {
     // Compile and test with the last 7.x version to make sure transition scenarios where
     // the Java API client coexists with a 7.x HLRC work fine
-    val elasticsearchVersion = "7.17.1"
-    val jacksonVersion = "2.13.1"
+    val elasticsearchVersion = "7.17.3"
+    val jacksonVersion = "2.13.2"
 
     // Apache 2.0
     // https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/java-rest-low.html
@@ -184,12 +184,12 @@ dependencies {
 
     // EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
     // https://github.com/eclipse-ee4j/jsonp
-    api("jakarta.json:jakarta.json-api:2.0.1")
+    api("jakarta.json:jakarta.json-api:2.1.0")
 
     // Needed even if using Jackson to have an implementation of the Jsonp object model
     // EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
     // https://github.com/eclipse-ee4j/parsson
-    api("org.eclipse.parsson:parsson:1.0.0")
+    api("org.eclipse.parsson:parsson:1.1.0")
 
     // EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
     // https://github.com/eclipse-ee4j/jsonb-api
@@ -205,23 +205,24 @@ dependencies {
 
     // EPL-2.0 OR BSD-3-Clause
     // https://eclipse-ee4j.github.io/yasson/
-    testImplementation("org.eclipse", "yasson", "2.0.2") {
+    testImplementation("org.eclipse", "yasson", "2.0.4") {
         // Exclude Glassfish as we use Parsson (basically Glassfish renamed in the Jakarta namespace).
         exclude(group = "org.glassfish", module = "jakarta.json")
     }
 
-    // EPL-1.0
-    // https://junit.org/junit4/
-    testImplementation("junit", "junit" , "4.13.2")
+    // EPL-2.0
+    // https://junit.org/junit5/
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
 
     // MIT
     // https://github.com/classgraph/classgraph
-    testImplementation("io.github.classgraph:classgraph:4.8.116")
+    testImplementation("io.github.classgraph:classgraph:4.8.146")
 
     // MIT
     // https://www.testcontainers.org/
-    testImplementation("org.testcontainers", "testcontainers", "1.15.3")
-    testImplementation("org.testcontainers", "elasticsearch", "1.15.3")
+    testImplementation("org.testcontainers", "testcontainers", "1.17.1")
+    testImplementation("org.testcontainers", "elasticsearch", "1.17.1")
 }
 
 

java-client/build.gradle.kts

@@ -33,8 +33,8 @@
 import co.elastic.clients.elasticsearch.indices.CreateIndexResponse;
 import co.elastic.clients.transport.ElasticsearchTransport;
 import co.elastic.clients.util.ApiTypeHelper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,7 +43,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class ApiConventionsTest extends Assert {
+public class ApiConventionsTest extends Assertions {
 
     private static class SomeApplicationData {}
 

java-client/src/test/java/co/elastic/clients/documentation/api_conventions/ApiConventionsTest.java

@@ -31,8 +31,8 @@
 import co.elastic.clients.elasticsearch.indices.CreateIndexResponse;
 import co.elastic.clients.elasticsearch.model.ModelTestCase;
 import co.elastic.clients.json.JsonData;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.FileReader;
@@ -86,8 +86,8 @@ public void loadIndexDefinition() throws IOException {
         //end::load-index
     }
 
+    @Disabled
     @Test
-    @Ignore
     public void ingestDocument() throws IOException {
 
         File dataDir = null;

java-client/src/test/java/co/elastic/clients/documentation/api_conventions/LoadingJsonTest.java

@@ -28,12 +28,12 @@
 import co.elastic.clients.transport.rest_client.RestClientTransport;
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.RestClient;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class ConnectingTest {
 
-    @Ignore // we don't have a running ES
+    @Disabled // we don't have a running ES
     @Test
     public void createClient() throws Exception {
         //tag::create-client

java-client/src/test/java/co/elastic/clients/documentation/getting_started/ConnectingTest.java

@@ -25,7 +25,7 @@
 import co.elastic.clients.transport.rest_client.RestClientTransport;
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.RestClient;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MigrateHlrcTest {
 

java-client/src/test/java/co/elastic/clients/documentation/getting_started/MigrateHlrcTest.java

@@ -28,7 +28,7 @@
 import co.elastic.clients.elasticsearch.core.search.TotalHitsRelation;
 import co.elastic.clients.elasticsearch.model.ModelTestCase;
 import co.elastic.clients.json.JsonData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

java-client/src/test/java/co/elastic/clients/documentation/usage/AggregationsTest.java

@@ -28,7 +28,7 @@
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.json.JsonpMapper;
 import jakarta.json.spi.JsonProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

java-client/src/test/java/co/elastic/clients/documentation/usage/IndexingBulkTest.java

@@ -27,7 +27,7 @@
 import co.elastic.clients.elasticsearch.core.IndexResponse;
 import co.elastic.clients.elasticsearch.model.ModelTestCase;
 import co.elastic.clients.json.JsonData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

java-client/src/test/java/co/elastic/clients/documentation/usage/IndexingTest.java

@@ -24,7 +24,7 @@
 import co.elastic.clients.elasticsearch.core.GetResponse;
 import co.elastic.clients.elasticsearch.model.ModelTestCase;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

java-client/src/test/java/co/elastic/clients/documentation/usage/ReadingTest.java

@@ -29,7 +29,7 @@
 import co.elastic.clients.elasticsearch.core.search.TotalHits;
 import co.elastic.clients.elasticsearch.core.search.TotalHitsRelation;
 import co.elastic.clients.json.JsonData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

java-client/src/test/java/co/elastic/clients/documentation/usage/SearchingTest.java

@@ -57,7 +57,7 @@ public static synchronized ElasticsearchTestServer global() {
     }
 
     private synchronized void setup() {
-        container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.16.2")
+        container = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.17.3")
             .withEnv("ES_JAVA_OPTS", "-Xms256m -Xmx256m")
             .withEnv("path.repo", "/tmp") // for snapshots
             .withStartupTimeout(Duration.ofSeconds(30))

java-client/src/test/java/co/elastic/clients/elasticsearch/ElasticsearchTestServer.java

@@ -45,9 +45,9 @@
 import co.elastic.clients.elasticsearch.model.ModelTestCase;
 import co.elastic.clients.transport.endpoints.BooleanResponse;
 import co.elastic.clients.util.DateTime;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.time.Instant;
@@ -58,11 +58,11 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-public class RequestTest extends Assert {
+public class RequestTest extends Assertions {
 
     static ElasticsearchClient client;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         client = ElasticsearchTestServer.global().client();
     }

java-client/src/test/java/co/elastic/clients/elasticsearch/end_to_end/RequestTest.java

@@ -26,7 +26,7 @@
 import co.elastic.clients.elasticsearch.experiments.api.query2.TermsQuery;
 import co.elastic.clients.elasticsearch.experiments.base.Client;
 import co.elastic.clients.transport.Endpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.Collections;

java-client/src/test/java/co/elastic/clients/elasticsearch/experiments/ClientTests.java

@@ -26,14 +26,14 @@
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParsingException;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
 
-public class ParsingTests extends Assert {
+public class ParsingTests extends Assertions {
 
   @Test
   public void testFoo() throws Exception {

java-client/src/test/java/co/elastic/clients/elasticsearch/experiments/ParsingTests.java

@@ -19,12 +19,12 @@
 
 package co.elastic.clients.elasticsearch.experiments.api.query2;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collection;
 
-public class QueryTest extends Assert {
+public class QueryTest extends Assertions {
     @Test
     public void testQuery() {
         BoolQuery bq = new BoolQuery.Builder().build();

java-client/src/test/java/co/elastic/clients/elasticsearch/experiments/api/query2/QueryTest.java

@@ -26,7 +26,7 @@
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParsingException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.StringReader;