From 2f19bf693f3dc5958e8db97ddbb9a3e3780af18c Mon Sep 17 00:00:00 2001
From: Christoph Pirkl <4711730+kaklakariada@users.noreply.github.com>
Date: Fri, 22 Nov 2024 16:39:40 +0100
Subject: [PATCH] Fix release build (#607)

---
 .github/workflows/ci-build.yml |  9 ++++++++-
 .project-keeper.yml            | 18 ++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 17817712..0e384104 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -167,7 +167,7 @@ jobs:
       - {
         name: Run tests and build with Maven 21,
         id: build-next-java,
-        run: mvn --batch-mode clean test -DtrimStackTrace=false -Djava.version=21
+        run: mvn --batch-mode clean package -DtrimStackTrace=false -Djava.version=21
       }
   build:
     needs: [
@@ -202,6 +202,13 @@ jobs:
             11
             17
           cache: maven
+      - name: Install Project Keeper before check-release
+        id: install-project-keeper
+        run: |
+          mvn --batch-mode --threads 1C install \
+              -Dmaven.test.skip=true -Dproject-keeper.skip=true \
+              -Dossindex.skip=true -Dmaven.javadoc.skip=true \
+              -Derror-code-crawler.skip=true -Dreproducible.skip=true
       - name: Check if release is needed
         id: check-release
         if: ${{ github.ref == 'refs/heads/main' }}
diff --git a/.project-keeper.yml b/.project-keeper.yml
index 926a43e8..97afca2c 100644
--- a/.project-keeper.yml
+++ b/.project-keeper.yml
@@ -133,15 +133,17 @@ build:
               ls -lh coverage-aggregator/target/metrics.json
               cat coverage-aggregator/target/metrics.json
 
-        # Build with Java 21 fails due to missing JavaDoc comments, see https://github.com/exasol/project-keeper/issues/596
-        - action: REPLACE
-          job: next-java-compatibility
-          stepId: build-next-java
+        - action: INSERT_AFTER
+          job: build
+          stepId: setup-java
           content:
-            name: Run tests and build with Maven 21
-            id: build-next-java
-            # Only run tests as javadoc has warnings with Java 21
-            run: mvn --batch-mode clean test -DtrimStackTrace=false -Djava.version=21
+            name: Install Project Keeper before check-release
+            id: install-project-keeper
+            run: |
+              mvn --batch-mode --threads 1C install \
+                  -Dmaven.test.skip=true -Dproject-keeper.skip=true \
+                  -Dossindex.skip=true -Dmaven.javadoc.skip=true \
+                  -Derror-code-crawler.skip=true -Dreproducible.skip=true
 
     # [itest->dsn~customize-build-process.dependency-check~0]
     - name: "dependencies_check.yml"