From 1472c2d3311601ea3c4eb2bc83716d028dc592d9 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Fri, 4 Jul 2025 08:58:14 +0000 Subject: [PATCH] Update cui-parent to 1.1.0 and baseline to Java 21 - Updated cui-parent to version 1.1.0 in pom.xml. - Updated GitHub workflows to use Java 21 as the baseline. - Removed Java 17 from the build matrix in maven.yml. - Updated maven.compiler.source/target to maven.compiler.release in maven.yml. --- .github/workflows/maven-release.yml | 4 ++-- .github/workflows/maven.yml | 10 +++++----- pom.xml | 2 +- src/main/java/de/cuioss/template/Hello.java | 12 ++++++------ src/main/java/module-info.java | 15 +++++++++++++++ src/test/java/de/cuioss/template/HelloTest.java | 12 ++++++------ 6 files changed, 35 insertions(+), 20 deletions(-) diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 01ae594..c412ea8 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -31,10 +31,10 @@ jobs: metadata-file-path: '.github/project.yml' local-file: true - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 with: - java-version: '17' + java-version: '21' distribution: 'temurin' server-id: central server-username: MAVEN_USERNAME diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 51454d7..48bfb51 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [ 17,21,24 ] + version: [ 21,24 ] steps: - name: Harden the runner (Audit all outbound calls) @@ -28,7 +28,7 @@ jobs: distribution: 'temurin' cache: maven - name: Build with Maven, Java ${{ matrix.version }} - run: ./mvnw --no-transfer-progress verify -Dmaven.compiler.source=${{ matrix.version }} -Dmaven.compiler.target=${{ matrix.version }} + run: ./mvnw --no-transfer-progress verify -Dmaven.compiler.release=${{ matrix.version }} sonar-build: needs: build @@ -44,10 +44,10 @@ jobs: with: fetch-depth: 0 - - name: Set up JDK 17 for Sonar-build + - name: Set up JDK 21 for Sonar-build uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven @@ -86,7 +86,7 @@ jobs: - name: Set up JDK 17 for snapshot release uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 with: - java-version: '17' + java-version: '21' distribution: 'temurin' server-id: central server-username: MAVEN_USERNAME diff --git a/pom.xml b/pom.xml index de9009c..4f8a3e2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.cuioss cui-java-parent - 1.0.2 + 1.1.0 cui-java-module-template diff --git a/src/main/java/de/cuioss/template/Hello.java b/src/main/java/de/cuioss/template/Hello.java index 7ceefce..a400a64 100644 --- a/src/main/java/de/cuioss/template/Hello.java +++ b/src/main/java/de/cuioss/template/Hello.java @@ -1,12 +1,12 @@ -/* - * Copyright 2023 the original author or authors. - *

+/** + * Copyright © 2025 CUI-OpenSource-Software (info@cuioss.de) + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - *

- * https://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 6e4123d..0dd9c05 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2025 CUI-OpenSource-Software (info@cuioss.de) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ module de.cuioss.template { exports de.cuioss.template; diff --git a/src/test/java/de/cuioss/template/HelloTest.java b/src/test/java/de/cuioss/template/HelloTest.java index eeeb39a..7d9fb1f 100644 --- a/src/test/java/de/cuioss/template/HelloTest.java +++ b/src/test/java/de/cuioss/template/HelloTest.java @@ -1,12 +1,12 @@ -/* - * Copyright 2023 the original author or authors. - *

+/** + * Copyright © 2025 CUI-OpenSource-Software (info@cuioss.de) + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - *

- * https://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.