From 5cf51f7bd21fc4d5b80e00ea60d83a93a795dda3 Mon Sep 17 00:00:00 2001
From: Dirk <472167-dstrauss@users.noreply.gitlab.com>
Date: Wed, 20 Dec 2023 14:00:15 +0100
Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=94=A8=20enable=20java=2017?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue: CORE-9
---
 .circleci/config.yml        | 2 +-
 .github/workflows/build.yml | 3 +--
 build.gradle                | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4806d93bf..4f7179ce3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:17.0
     working_directory: ~/repo
 
     environment:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 41e829422..98601613f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,10 +24,9 @@ jobs:
     env:
       JVM_OPTS: "-Xmx3200m"
       GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
-      CI: true
     strategy:
       matrix:
-        java: [ '8', '17' ]
+        java: [ '17' ]
     name: Java ${{ matrix.Java }} sample
     steps:
       - uses: actions/checkout@v4.1.1
diff --git a/build.gradle b/build.gradle
index f1dc8d887..8821475fd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ allprojects {
     ext.jacksonVersion = '2.16.0'
 
     baseConfig {
-        javaVersion = JavaVersion.VERSION_1_8
+        javaVersion = JavaVersion.VERSION_17
         //useToolchain = false
     }
     gitInfo() {

From 1040701c1fa1df6ad1ac388f973fae9656677e03 Mon Sep 17 00:00:00 2001
From: Dirk <472167-dstrauss@users.noreply.gitlab.com>
Date: Wed, 10 Jan 2024 10:58:26 +0100
Subject: [PATCH 2/6] wip

Issue: CORE-9
---
 api/build.gradle.kts                   | 12 +++++-------
 api/src/main/java/module-info.java     |  5 +++++
 base/build.gradle                      |  2 +-
 codec-boon/build.gradle                |  8 +++++---
 codec-fastxml/build.gradle             |  1 +
 codec-genson/build.gradle              |  1 +
 codec-gson/build.gradle                |  1 +
 crypto-bc/build.gradle                 |  1 +
 settings.gradle.kts                    |  2 --
 shiro-jee/build.gradle                 |  2 +-
 statics/src/main/java/module-info.java |  2 ++
 11 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 api/src/main/java/module-info.java
 create mode 100644 statics/src/main/java/module-info.java

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index c64f631f3..c2bd8ecbf 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -8,16 +8,14 @@ description = "DS/2 OSS Core API"
 val logbackVersion: String by project
 
 dependencies {
-    //compileOnly(group: 'javax.enterprise', name: 'cdi-api', version:'1.2')
-    //compileOnly(group: 'javax.validation', name: 'validation-api', version:'1.1.0.Final')
-    annotationProcessor("org.projectlombok:lombok:1.18.30")
+    implementation(platform("ds2.bom:jee-common:2.1.0-alpha.2"))
+    implementation("org.projectlombok:lombok")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
-    compileOnly("org.projectlombok:lombok:1.18.30")
     implementation("javax.xml.bind:jaxb-api:2.3.1")
     compileOnly("jakarta.platform", "jakarta.jakartaee-api", "8.0.0")
     testImplementation("jakarta.platform", "jakarta.jakartaee-api", "8.0.0")
-    testImplementation("org.testng:testng:7.4.0")
-    testImplementation("org.slf4j:jul-to-slf4j:1.7.36")
+    testImplementation("org.testng:testng")
+    testImplementation("org.slf4j:jul-to-slf4j")
     testRuntimeOnly("ch.qos.logback", "logback-classic", logbackVersion)
 }
 
@@ -27,6 +25,6 @@ tasks.test {
 
 kotlin {
     jvmToolchain {
-        (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of("8")) // "8"
+        (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of("17"))
     }
 }
diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java
new file mode 100644
index 000000000..4e30a89b0
--- /dev/null
+++ b/api/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module ds2.oss.core.project.ds2.oss.core.api.main {
+    requires kotlin.stdlib;
+    requires lombok;
+    requires jakarta.jakartaee.api;
+}
\ No newline at end of file
diff --git a/base/build.gradle b/base/build.gradle
index 657dd5d7e..5aab979ac 100644
--- a/base/build.gradle
+++ b/base/build.gradle
@@ -64,7 +64,7 @@ test {
     useTestNG()
     maxParallelForks = 1
     //maxHeapSize="1024m"
-    //jvmArgs '-XX:MaxPermSize=256m'
+    jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
     testLogging.showStandardStreams = true
     onOutput { descriptor, event ->
         logger.lifecycle("Test: " + descriptor + " produced standard out/err: " + event.message)
diff --git a/codec-boon/build.gradle b/codec-boon/build.gradle
index 14fb43a19..bd720ab9c 100644
--- a/codec-boon/build.gradle
+++ b/codec-boon/build.gradle
@@ -36,6 +36,8 @@ task copyTestResources(type: Copy) {
 processResources.dependsOn copyResources
 processTestResources.dependsOn copyTestResources, copyResources
 
-test.dependsOn copyTestStuffToResources
-
-test.useTestNG()
+test {
+    useTestNG()
+    jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+    dependsOn(copyTestStuffToResources)
+}
\ No newline at end of file
diff --git a/codec-fastxml/build.gradle b/codec-fastxml/build.gradle
index 0b588055e..4c6cc12a0 100644
--- a/codec-fastxml/build.gradle
+++ b/codec-fastxml/build.gradle
@@ -15,6 +15,7 @@ dependencies {
         This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency.
         Please review and delete this closure when resolved. */
     }
+    compileOnly 'jakarta.platform:jakarta.jakartaee-web-api:8.0.0'
     compileOnly 'org.slf4j:slf4j-api:2.0.9'
 }
 
diff --git a/codec-genson/build.gradle b/codec-genson/build.gradle
index 8e637adca..100d28254 100644
--- a/codec-genson/build.gradle
+++ b/codec-genson/build.gradle
@@ -15,6 +15,7 @@ dependencies {
         This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency.
         Please review and delete this closure when resolved. */
     }
+    compileOnly 'jakarta.platform:jakarta.jakartaee-web-api:8.0.0'
     compileOnly 'org.slf4j:slf4j-api:2.0.9'
 }
 
diff --git a/codec-gson/build.gradle b/codec-gson/build.gradle
index 1af4bf5f2..102c78b5f 100644
--- a/codec-gson/build.gradle
+++ b/codec-gson/build.gradle
@@ -15,6 +15,7 @@ dependencies {
     testImplementation group: 'org.jboss', name: 'jandex', version: '3.1.5'
     compileOnly(group: 'javax.enterprise', name: 'cdi-api', version: '2.0')
     compileOnly 'org.slf4j:slf4j-api:2.0.9'
+    compileOnly 'jakarta.platform:jakarta.jakartaee-web-api:8.0.0'
 }
 
 task copyMainStuffToResources(type: Copy) {
diff --git a/crypto-bc/build.gradle b/crypto-bc/build.gradle
index 96d100279..900027f4c 100644
--- a/crypto-bc/build.gradle
+++ b/crypto-bc/build.gradle
@@ -15,6 +15,7 @@ dependencies {
         This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency.
         Please review and delete this closure when resolved. */
     }
+    compileOnly 'jakarta.platform:jakarta.jakartaee-web-api:8.0.0'
 }
 
 task copyMainStuffToResources(type: Copy) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index fa6c0b9f1..1b56ac2d5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,6 @@ include("base")
 include("interceptors")
 include("options")
 include("crypto")
-include("codec-boon")
 include("codec-gson")
 include("codec-fastxml")
 include("webtools")
@@ -34,7 +33,6 @@ project(":base").name = "ds2-oss-core-base"
 project(":interceptors").name = "ds2-oss-core-interceptors"
 project(":options").name = "ds2-oss-core-options"
 project(":crypto").name = "ds2-oss-core-crypto"
-project(":codec-boon").name = "ds2-oss-core-codec-boon"
 project(":codec-gson").name = "ds2-oss-core-codec-gson"
 project(":codec-fastxml").name = "ds2-oss-core-codec-fastxml"
 project(":webtools").name = "ds2-oss-core-webtools"
diff --git a/shiro-jee/build.gradle b/shiro-jee/build.gradle
index 352fbaee6..f31195807 100644
--- a/shiro-jee/build.gradle
+++ b/shiro-jee/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation project(path: ':ds2-oss-core-testutils')
     testImplementation group: 'org.testng', name: 'testng', version: '7.4.0'
     testImplementation 'org.slf4j:slf4j-api'
-    testImplementation group: 'org.jboss.weld.se', name: 'weld-se', version:'2.4.+'
+    testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version:'2.4.+'
     testRuntimeOnly group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion
 }
 
diff --git a/statics/src/main/java/module-info.java b/statics/src/main/java/module-info.java
new file mode 100644
index 000000000..2fe0092b1
--- /dev/null
+++ b/statics/src/main/java/module-info.java
@@ -0,0 +1,2 @@
+module ds2.oss.core.project.ds2.oss.core.statics.main {
+}
\ No newline at end of file

From cd82ebc3bbc8f83428931499c27ff5f46a4fe6b4 Mon Sep 17 00:00:00 2001
From: Lexxy <472167-dstrauss@users.noreply.gitlab.com>
Date: Wed, 10 Jan 2024 11:43:20 +0100
Subject: [PATCH 3/6] update Jenkins and Dockerfile

---
 Jenkinsfile     | 2 +-
 zulu.Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7bb514f6d..6ba78aeab 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline { 
     agent any
     tools { 
-        jdk 'jdk8'
+        jdk 'jdk17'
     }
     options {
             disableConcurrentBuilds()
diff --git a/zulu.Dockerfile b/zulu.Dockerfile
index 92f00fc9b..46c501bdf 100644
--- a/zulu.Dockerfile
+++ b/zulu.Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:8
+FROM docker.io/azul/zulu-openjdk:17
 WORKDIR /core
 COPY . .
 RUN ./gradlew clean build --info --stacktrace

From a44957de7dd27d91131f9f266a2b21e4109be361 Mon Sep 17 00:00:00 2001
From: Lexxy <472167-dstrauss@users.noreply.gitlab.com>
Date: Wed, 10 Jan 2024 16:01:35 +0100
Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=9A=A7=20wip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                          | 9 ++-------
 api/src/main/java/module-info.java | 7 +++++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index f943a4d3c..5680b836d 100644
--- a/README.md
+++ b/README.md
@@ -17,15 +17,10 @@ Simply run:
 
 ### Via dedicated Docker image
 
-Run
 
-    docker run -it --rm -v $(pwd):/src dcr.ds-2.de/buildslave:0.1 ./gradlew clean build
+    podman build -f zulu.Dockerfile .
 
-or
-
-    docker build -f zulu.Dockerfile .
-
-##Layers
+## Layers
 
 DS/2 OSS Core uses a kind of layer architecture and provides some sample implementations
 for each of the layers:
diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java
index 4e30a89b0..2b3886d03 100644
--- a/api/src/main/java/module-info.java
+++ b/api/src/main/java/module-info.java
@@ -1,5 +1,8 @@
-module ds2.oss.core.project.ds2.oss.core.api.main {
+module ds2.core.api {
     requires kotlin.stdlib;
     requires lombok;
-    requires jakarta.jakartaee.api;
+    requires java.xml.bind;
+//    requires jakarta.jakartaee.api;
+    exports ds2.core.api;
+    exports ds2.oss.core.api;
 }
\ No newline at end of file

From 90d4ba880a425096fa5c3d7ec7576372fca08b8b Mon Sep 17 00:00:00 2001
From: Lexxy <472167-dstrauss@users.noreply.gitlab.com>
Date: Wed, 10 Jan 2024 16:08:13 +0100
Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=91=B7=20add=20container=20build=20te?=
 =?UTF-8?q?st?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 98601613f..0eac87736 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,3 +51,20 @@ jobs:
             **/build/test-results/test/*.xml
             **/build/test-results/**/*.trx
             **/build/test-results/**/*.json
+
+
+  build-via-buildah:
+    name: Build in container
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - name: Buildah Action
+        uses: redhat-actions/buildah-build@v2
+        with:
+          image: my-new-image
+          tags: v1 ${{ github.sha }}
+          containerfiles: |
+            ./zulu.Dockerfile
+#          build-args: |
+#            some_arg=some_value
\ No newline at end of file

From 574898eedf0623a28af869e9c0383e643016a18a Mon Sep 17 00:00:00 2001
From: Lexxy <472167-dstrauss@users.noreply.gitlab.com>
Date: Wed, 10 Jan 2024 16:15:54 +0100
Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=91=B7=20change=20tasks=20for=20build?=
 =?UTF-8?q?ing=20the=20project?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue: CORE-9
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0eac87736..57333f89c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
           java -version
           ./gradlew -version
       - name: compile it
-        run: ./gradlew compileJava compileTestJava
+        run: ./gradlew clean assemble
       - name: run tests
         run: ./gradlew test
       - name: Publish Test Results