diff --git a/.gitignore b/.gitignore
index 88ee192..cbd2afe 100644
--- 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
index f938933..f1a4c2c 100644
--- 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
index 8872a21..1676ebf 100644
--- a/doc/changes/changelog.md
+++ b/doc/changes/changelog.md
@@ -1,5 +1,6 @@
# Changes
+* [0.6.7](changes_0.6.7.md)
* [0.6.6](changes_0.6.6.md)
* [0.6.5](changes_0.6.5.md)
* [0.6.4](changes_0.6.4.md)
diff --git a/doc/changes/changes_0.6.7.md b/doc/changes/changes_0.6.7.md
new file mode 100644
index 0000000..68e5b2a
--- /dev/null
+++ 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
index f851b3b..37b33db 100644
--- a/pk_generated_parent.pom
+++ b/pk_generated_parent.pom
@@ -3,7 +3,7 @@
4.0.0
com.exasol
udf-debugging-java-generated-parent
- 0.6.6
+ 0.6.7
pom
UTF-8
diff --git a/pom.xml b/pom.xml
index e3db353..1b52eec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,32 +1,18 @@
-
+
4.0.0
udf-debugging-java
- 0.6.6
+ 0.6.7
udf-debugging-java
Utilities for debugging, profiling and code coverage measure for UDFs.
https://github.com/exasol/udf-debugging-java/
- 5.9.1
+ 5.9.2
11.0.0
0.8.8
- 3.0.0-M4
-
-
- MIT
- https://opensource.org/licenses/MIT
- repo
-
-
-
-
- Exasol
- opensource@exasol.com
- Exasol AG
- https://www.exasol.com/
-
-
ossrh
@@ -37,11 +23,6 @@
https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
- scm:git:https://github.com/exasol/udf-debugging-java.git
- scm:git:https://github.com/exasol/udf-debugging-java.git
- https://github.com/exasol/udf-debugging-java/tree/master
-
jakarta.json
@@ -79,10 +60,13 @@
com.exasol
exasol-test-setup-abstraction-java
- 1.1.1
-
+ 2.0.0
+
provided
@@ -111,7 +95,7 @@
org.mockito
mockito-junit-jupiter
- 4.10.0
+ 5.0.0
test
@@ -124,7 +108,7 @@
com.exasol
exasol-testcontainers
- 6.4.1
+ 6.5.0
test
@@ -136,7 +120,7 @@
com.exasol
test-db-builder-java
- 3.4.1
+ 3.4.2
test
@@ -181,11 +165,20 @@
org.sonatype.ossindex.maven
ossindex-maven-plugin
-
+
sonatype-2020-0026
+
+ CVE-2020-36641
@@ -194,7 +187,7 @@
udf-debugging-java-generated-parent
com.exasol
- 0.6.6
+ 0.6.7
pk_generated_parent.pom
diff --git a/src/main/java/com/exasol/udfdebugging/UdfTestSetup.java b/src/main/java/com/exasol/udfdebugging/UdfTestSetup.java
index 194b351..14aacd1 100644
--- 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
index 02d7081..ff22f50 100644
--- 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 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
index 9fd2698..d3233e6 100644
--- 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
index 8b23977..4cb0cc4 100644
--- 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();