exasol · kaklakariada · Jan 20, 2023 · Jan 20, 2023 · Jan 20, 2023 · Jan 20, 2023
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ pom.xml.versionsBackup
 # Eclipse and Maven
 .classpath
 .project
+/.settings/org.eclipse.jdt.apt.core.prefs
 # .settings : we need Eclipse settings for code formatter and clean-up rules
 target
 .cache

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,5 +13,9 @@
         "vmArgs": [
             "-Djava.util.logging.config.file=src/test/resources/logging.properties"
         ]
+    },
+    "sonarlint.connectedMode.project": {
+        "connectionId": "exasol",
+        "projectKey": "com.exasol:udf-debugging-java"
     }
 }
diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md
diff --git a/doc/changes/changes_0.6.7.md b/doc/changes/changes_0.6.7.md
@@ -0,0 +1,21 @@
+# Udf Debugging Java 0.6.7, released 2023-01-20
+
+Code name: Upgrade dependencies on top of 0.6.6
+
+## Summary
+
+This release upgrades dependencies incl. exasol-test-setup-abstraction-java 2.0.0 to adapt to the updated API.
+
+## Features
+
+* #51: Updated to exasol-test-setup-abstraction-java 2.0.0
+
+## Dependency Updates
+
+### Test Dependency Updates
+
+* Updated `com.exasol:exasol-testcontainers:6.4.1` to `6.5.0`
+* Updated `com.exasol:test-db-builder-java:3.4.1` to `3.4.2`
+* Updated `org.junit.jupiter:junit-jupiter-engine:5.9.1` to `5.9.2`
+* Updated `org.junit.jupiter:junit-jupiter-params:5.9.1` to `5.9.2`
+* Updated `org.mockito:mockito-junit-jupiter:4.10.0` to `5.0.0`
diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom
diff --git a/pom.xml b/pom.xml
@@ -1,32 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>udf-debugging-java</artifactId>
-    <version>0.6.6</version>
+    <version>0.6.7</version>
     <name>udf-debugging-java</name>
     <description>Utilities for debugging, profiling and code coverage measure for UDFs.</description>
     <url>https://github.com/exasol/udf-debugging-java/</url>
     <properties>
-        <junit.version>5.9.1</junit.version>
+        <junit.version>5.9.2</junit.version>
         <vscommon.version>11.0.0</vscommon.version>
         <jacoco.version>0.8.8</jacoco.version>
-        <surefire.and.failsafe.plugin.version>3.0.0-M4</surefire.and.failsafe.plugin.version>
     </properties>
-    <licenses>
-        <license>
-            <name>MIT</name>
-            <url>https://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <developers>
-        <developer>
-            <name>Exasol</name>
-            <email>[email protected]</email>
-            <organization>Exasol AG</organization>
-            <organizationUrl>https://www.exasol.com/</organizationUrl>
-        </developer>
-    </developers>
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
@@ -37,11 +23,6 @@
             <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
-    <scm>
-        <connection>scm:git:https://github.com/exasol/udf-debugging-java.git</connection>
-        <developerConnection>scm:git:https://github.com/exasol/udf-debugging-java.git</developerConnection>
-        <url>https://github.com/exasol/udf-debugging-java/tree/master</url>
-    </scm>
     <dependencies>
         <dependency>
             <groupId>jakarta.json</groupId>
@@ -79,10 +60,13 @@
         <dependency>
             <groupId>com.exasol</groupId>
             <artifactId>exasol-test-setup-abstraction-java</artifactId>
-            <version>1.1.1</version>
-            <!-- This is not a compile-dependency since it would pull a lot of transitive dependencies (like the AWS
-            SDK) into project where it's absolutely not needed. That's possible since we only use the classes from this
-            dependencies in methods that are ment to be used with the exasol-test-setup-abstraction-java. -->
+            <version>2.0.0</version>
+            <!-- This is not a compile-dependency since it would pull a lot of transitive
+            dependencies (like the AWS
+            SDK) into project where it's absolutely not
+            needed. That's possible since we only use the classes from this
+            dependencies
+            in methods that are ment to be used with the exasol-test-setup-abstraction-java. -->
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -111,7 +95,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>4.10.0</version>
+            <version>5.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -124,7 +108,7 @@
         <dependency>
             <groupId>com.exasol</groupId>
             <artifactId>exasol-testcontainers</artifactId>
-            <version>6.4.1</version>
+            <version>6.5.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -136,7 +120,7 @@
         <dependency>
             <groupId>com.exasol</groupId>
             <artifactId>test-db-builder-java</artifactId>
-            <version>3.4.1</version>
+            <version>3.4.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -181,11 +165,20 @@
             <plugin>
                 <groupId>org.sonatype.ossindex.maven</groupId>
                 <artifactId>ossindex-maven-plugin</artifactId>
-                <!-- io.netty:netty-handler:
-                Not a vulnerability in netty but how it is configured by the client software.amazon.awssdk:netty-nio-client. -->
                 <configuration>
                     <excludeVulnerabilityIds>
+                        <!-- io.netty:netty-handler: Not a vulnerability in netty but how it
+                        is
+                        configured by the client software.amazon.awssdk:netty-nio-client. We are not
+                        affected, see https://github.com/aws/aws-sdk-java-v2/issues/3263 for details -->
                         <exclude>sonatype-2020-0026</exclude>
+                        <!-- Transitive dependency fr.turri:aXMLRPC used by
+                        com.exasol:bucketfs-java.
+                        CVE-2020-36641 is reported
+                        to be fixed in aXMLRPC 1.12.1. We use version 1.13.0,
+                        so
+                        this is a false positive. -->
+                        <exclude>CVE-2020-36641</exclude>
                     </excludeVulnerabilityIds>
                 </configuration>
             </plugin>
@@ -194,7 +187,7 @@
     <parent>
         <artifactId>udf-debugging-java-generated-parent</artifactId>
         <groupId>com.exasol</groupId>
-        <version>0.6.6</version>
+        <version>0.6.7</version>
         <relativePath>pk_generated_parent.pom</relativePath>
     </parent>
 </project>
diff --git a/src/main/java/com/exasol/udfdebugging/UdfTestSetup.java b/src/main/java/com/exasol/udfdebugging/UdfTestSetup.java
@@ -10,7 +10,6 @@
 
 import com.exasol.bucketfs.Bucket;
 import com.exasol.exasoltestsetup.ExasolTestSetup;
-import com.exasol.exasoltestsetup.ServiceAddress;
 import com.exasol.udfdebugging.modules.coverage.CoverageModuleFactory;
 import com.exasol.udfdebugging.modules.debugging.DebuggingModuleFactory;
 import com.exasol.udfdebugging.modules.jprofiler.JProfilerModuleFactory;
@@ -59,7 +58,7 @@ private UdfTestSetup(final LocalServiceExposer localServiceExposer, final Bucket
      */
     public UdfTestSetup(final ExasolTestSetup testSetup, final Connection exasolConnection) {
         this(port -> {
-            final ServiceAddress serviceAddress = testSetup.makeLocalTcpServiceAccessibleFromDatabase(port);
+            final InetSocketAddress serviceAddress = testSetup.makeLocalTcpServiceAccessibleFromDatabase(port);
             return new InetSocketAddress(serviceAddress.getHostName(), serviceAddress.getPort());
         }, testSetup.getDefaultBucket(), exasolConnection);
     }

diff --git a/src/test/java/com/exasol/udfdebugging/UdfTestSetupTest.java b/src/test/java/com/exasol/udfdebugging/UdfTestSetupTest.java
@@ -2,8 +2,10 @@
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.*;
 
+import java.net.InetSocketAddress;
 import java.sql.*;
 import java.util.List;
 
@@ -17,7 +19,6 @@
 
 import com.exasol.bucketfs.Bucket;
 import com.exasol.exasoltestsetup.ExasolTestSetup;
-import com.exasol.exasoltestsetup.ServiceAddress;
 
 @ExtendWith(MockitoExtension.class)
 @ExtendWith(SystemOutGuard.class)
@@ -56,7 +57,7 @@ void testGetTestSetupForETAJ() {
         final Bucket bucket = mock(Bucket.class);
         when(testSetup.getDefaultBucket()).thenReturn(bucket);
         when(testSetup.makeLocalTcpServiceAccessibleFromDatabase(anyInt()))
-                .thenReturn(new ServiceAddress("4.3.2.1", 123));
+                .thenReturn(new InetSocketAddress("4.3.2.1", 123));
         try (final UdfTestSetup udfTestSetup = new UdfTestSetup(testSetup, this.connection)) {
             final List<String> jvmOptions = List.of(udfTestSetup.getJvmOptions());
             assertThat(jvmOptions, hasItem(

diff --git a/src/test/java/com/exasol/udfdebugging/modules/coverage/CoverageModuleIT.java b/src/test/java/com/exasol/udfdebugging/modules/coverage/CoverageModuleIT.java
@@ -18,9 +18,9 @@ class CoverageModuleIT {
     @Test
     void testCoverageReportIsWritten() throws SQLException, IOException {
         deleteExecutionFile();
-        final TestSetup udfSetup = new TestSetup();
-        try (final CoverageModule coverageModule = new CoverageModule(udfSetup.getHostPortProxy(),
-                udfSetup.getDefaultBucket())) {
+        try (final TestSetup udfSetup = new TestSetup();
+                final CoverageModule coverageModule = new CoverageModule(udfSetup.getHostPortProxy(),
+                        udfSetup.getDefaultBucket())) {
             udfSetup.runJavaUdf(coverageModule.getJvmOptions(), "");
             assertThat(countReportedJacocoSessions(), equalTo(1));
         }

diff --git a/src/test/java/com/exasol/udfdebugging/modules/udflogs/UdfLogsModuleIT.java b/src/test/java/com/exasol/udfdebugging/modules/udflogs/UdfLogsModuleIT.java
@@ -13,6 +13,7 @@
 
 class UdfLogsModuleIT {
 
+    // This will fail when the test does not run on Docker host, e.g. on Windows or macOS.
     @Test
     void testGetLog() throws SQLException, IOException {
         try (final TestSetup testSetup = new TestSetup();