diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41e829422..57333f89c 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 @@ -41,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 @@ -52,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 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/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/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..2b3886d03 --- /dev/null +++ b/api/src/main/java/module-info.java @@ -0,0 +1,8 @@ +module ds2.core.api { + requires kotlin.stdlib; + requires lombok; + requires java.xml.bind; +// requires jakarta.jakartaee.api; + exports ds2.core.api; + exports ds2.oss.core.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/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() { 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 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