[7.17] Actualize libs versions. Move tests to junit jupiter (#284)

java-client/build.gradle.kts

@@ -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.4"
+    val jacksonVersion = "2.13.3"
 
     // Apache 2.0
     // https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/java-rest-low.html
@@ -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.147")
 
     // MIT
     // https://www.testcontainers.org/
-    testImplementation("org.testcontainers", "testcontainers", "1.16.3")
-    testImplementation("org.testcontainers", "elasticsearch", "1.16.3")
+    testImplementation("org.testcontainers", "testcontainers", "1.17.2")
+    testImplementation("org.testcontainers", "elasticsearch", "1.17.2")
 }
 
 
@@ -238,6 +239,7 @@ class SpdxReporter(val dest: File) : ReportRenderer {
         "BSD Zero Clause License" to "0BSD",
         "Eclipse Public License 2.0" to "EPL-2.0",
         "Eclipse Public License v. 2.0" to "EPL-2.0",
+        "Eclipse Public License - v 2.0" to "EPL-2.0",
         "GNU General Public License, version 2 with the GNU Classpath Exception" to "GPL-2.0 WITH Classpath-exception-2.0",
         "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0" to "CDDL-1.0"
     )

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

@@ -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/LoadingJsonTest.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/getting_started/ConnectingTest.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/MigrateHlrcTest.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/usage/AggregationsTest.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/IndexingBulkTest.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/IndexingTest.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/ReadingTest.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/SearchingTest.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/elasticsearch/ElasticsearchTestServer.java

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

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

@@ -44,9 +44,9 @@
 import co.elastic.clients.elasticsearch.indices.IndexState;
 import co.elastic.clients.elasticsearch.model.ModelTestCase;
 import co.elastic.clients.transport.endpoints.BooleanResponse;
-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.util.Collections;
@@ -55,11 +55,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/experiments/ClientTests.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/ParsingTests.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/api/query2/QueryTest.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/containers/SomeUnionTest.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;

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

@@ -26,13 +26,13 @@
 import jakarta.json.spi.JsonProvider;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.StringReader;
 
-public class InheritanceTest extends Assert {
+public class InheritanceTest extends Assertions {
 
     @Test
     public void testSerialization() {

java-client/src/test/java/co/elastic/clients/elasticsearch/json/JsonDataTest.java

@@ -34,14 +34,14 @@
 import jakarta.json.JsonValue;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
 
-public class JsonDataTest extends Assert {
+public class JsonDataTest extends Assertions {
 
 
     public static <T, B extends ObjectBuilder<T>> B withJson(B builder, Reader json, ElasticsearchClient client) {

java-client/src/test/java/co/elastic/clients/elasticsearch/json/JsonpMapperTest.java

@@ -27,15 +27,15 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Collections;
 import java.util.List;
 
-public class JsonpMapperTest extends Assert {
+public class JsonpMapperTest extends Assertions {
 
     String json = "{\"children\":[{\"doubleValue\":3.2,\"intValue\":2}],\"doubleValue\":2.1,\"intValue\":1," +
         "\"stringValue\":\"foo\"}";

java-client/src/test/java/co/elastic/clients/elasticsearch/json/JsonpUtilsTest.java

@@ -25,16 +25,16 @@
 import jakarta.json.JsonException;
 import jakarta.json.spi.JsonProvider;
 import jakarta.json.stream.JsonGenerator;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringWriter;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.function.Consumer;
 
-public class JsonpUtilsTest extends Assert {
+public class JsonpUtilsTest extends Assertions {
 
     @Test
     @AllowForbiddenApis("Testing JsonpUtil.provider()")

java-client/src/test/java/co/elastic/clients/elasticsearch/json/jackson/JacksonJsonpParserTest.java

@@ -22,12 +22,12 @@
 import co.elastic.clients.json.jackson.JacksonJsonProvider;
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParser.Event;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;
 
-public class JacksonJsonpParserTest extends Assert {
+public class JacksonJsonpParserTest extends Assertions {
 
     private static final String json = "{ 'foo': 'fooValue', 'bar': { 'baz': 1}, 'quux': [true] }".replace('\'', '"');
 

java-client/src/test/java/co/elastic/clients/elasticsearch/json/jackson/JacksonMapperTest.java

@@ -29,7 +29,7 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 

java-client/src/test/java/co/elastic/clients/elasticsearch/json/jackson/JsonValueParserTest.java

@@ -25,13 +25,14 @@
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;
 import jakarta.json.stream.JsonParser;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.io.StringReader;
 import java.util.Map;
 
-public class JsonValueParserTest extends Assert {
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class JsonValueParserTest extends Assertions {
 
     public static class Data {
         public Map<String, Object> data;

java-client/src/test/java/co/elastic/clients/elasticsearch/model/BehaviorsTest.java

@@ -31,7 +31,7 @@
 import co.elastic.clients.elasticsearch._types.query_dsl.TermQuery;
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.util.MapBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BehaviorsTest extends ModelTestCase {
 

java-client/src/test/java/co/elastic/clients/elasticsearch/model/BuiltinTypesTest.java

@@ -30,7 +30,7 @@
 import co.elastic.clients.elasticsearch.indices.IndexRoutingAllocationDisk;
 import co.elastic.clients.json.JsonpDeserializer;
 import jakarta.json.stream.JsonParser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;
 import java.util.List;