From 2f584f2539ffb34db332c68686b16c6048d92ca4 Mon Sep 17 00:00:00 2001
From: Christoph Pirkl <christoph.pirkl@exasol.com>
Date: Wed, 12 Feb 2025 15:09:05 +0100
Subject: [PATCH] Fix UDF tests

---
 .github/workflows/ci-build.yml |  7 +------
 .project-keeper.yml            | 14 ++------------
 .vscode/settings.json          |  3 ++-
 dependencies.md                |  6 +++---
 doc/changes/changes_0.6.15.md  |  2 ++
 pom.xml                        |  4 ++--
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 062a061..463b863 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -9,7 +9,7 @@ on:
   pull_request: null
 jobs:
   matrix-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     defaults:
       run: {
         shell: bash
@@ -67,11 +67,6 @@ jobs:
         id: enable-testcontainer-reuse,
         run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties"
       }
-      - {
-        name: Fix VM Crash in UDFs,
-        id: fix-vm-crash,
-        run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
-      }
       - name: Run tests and build with Maven
         id: build-pk-verify
         run: |
diff --git a/.project-keeper.yml b/.project-keeper.yml
index e9264e9..850a718 100644
--- a/.project-keeper.yml
+++ b/.project-keeper.yml
@@ -4,19 +4,9 @@ sources:
     modules:
       - maven_central
       - integration_tests
-linkReplacements:
-  - "https://github.com/hamcrest/JavaHamcrest/hamcrest-all|https://github.com/hamcrest/JavaHamcrest"
 build:
+  # UDFs in Exasol 7.1 require Ubuntu 20.04
+  runnerOs: ubuntu-20.04
   exasolDbVersions:
     - "8.32.0"
     - "7.1.30"
-  workflows:
-    - name: ci-build.yml
-      stepCustomizations:
-        - action: INSERT_AFTER
-          job: matrix-build
-          stepId: enable-testcontainer-reuse
-          content:
-            name: Fix VM Crash in UDFs
-            id: fix-vm-crash
-            run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8778700..30f0f3f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,7 +11,8 @@
     "java.sources.organizeImports.staticStarThreshold": 3,
     "java.test.config": {
         "vmArgs": [
-            "-Djava.util.logging.config.file=src/test/resources/logging.properties"
+            "-Djava.util.logging.config.file=src/test/resources/logging.properties",
+            "-Dcom.exasol.dockerdb.image=7.1.30"
         ]
     },
     "sonarlint.connectedMode.project": {
diff --git a/dependencies.md b/dependencies.md
index db51a8a..8e4a0e0 100644
--- a/dependencies.md
+++ b/dependencies.md
@@ -21,7 +21,7 @@
 | [JUnit Jupiter Engine][15]                      | [Eclipse Public License v2.0][16] |
 | [JUnit Jupiter Params][15]                      | [Eclipse Public License v2.0][16] |
 | [mockito-junit-jupiter][17]                     | [MIT][18]                         |
-| [Hamcrest All][19]                              | [New BSD License][20]             |
+| [Hamcrest][19]                                  | [BSD-3-Clause][20]                |
 | [Test containers for Exasol on Docker][21]      | [MIT License][22]                 |
 | [Testcontainers :: JUnit Jupiter Extension][23] | [MIT][24]                         |
 | [Test Database Builder for Java][25]            | [MIT License][26]                 |
@@ -82,8 +82,8 @@
 [16]: https://www.eclipse.org/legal/epl-v20.html
 [17]: https://github.com/mockito/mockito
 [18]: https://opensource.org/licenses/MIT
-[19]: https://github.com/hamcrest/JavaHamcrest
-[20]: http://www.opensource.org/licenses/bsd-license.php
+[19]: http://hamcrest.org/JavaHamcrest/
+[20]: https://raw.githubusercontent.com/hamcrest/JavaHamcrest/master/LICENSE
 [21]: https://github.com/exasol/exasol-testcontainers/
 [22]: https://github.com/exasol/exasol-testcontainers/blob/main/LICENSE
 [23]: https://java.testcontainers.org
diff --git a/doc/changes/changes_0.6.15.md b/doc/changes/changes_0.6.15.md
index 6123997..0e23146 100644
--- a/doc/changes/changes_0.6.15.md
+++ b/doc/changes/changes_0.6.15.md
@@ -23,6 +23,8 @@ This release fixes the following vulnerabilities in test dependencies:
 ### Test Dependency Updates
 
 * Updated `com.exasol:exasol-testcontainers:7.1.1` to `7.1.3`
+* Removed `org.hamcrest:hamcrest-all:1.3`
+* Added `org.hamcrest:hamcrest:3.0`
 * Updated `org.junit.jupiter:junit-jupiter-engine:5.11.3` to `5.11.4`
 * Updated `org.junit.jupiter:junit-jupiter-params:5.11.3` to `5.11.4`
 * Updated `org.mockito:mockito-junit-jupiter:5.14.2` to `5.15.2`
diff --git a/pom.xml b/pom.xml
index 7c43be6..07c4024 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,8 +80,8 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <version>1.3</version>
+            <artifactId>hamcrest</artifactId>
+            <version>3.0</version>
             <scope>test</scope>
         </dependency>
         <!--Integration test dependencies-->