From e33a59d646101cca2c825f0e6d79800bc36eacd9 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 28 May 2025 18:41:03 -0700 Subject: [PATCH 1/2] Switch publishing to use Central Portal --- .github/workflows/main.yml | 11 +++++++---- .mvn/wrapper/maven-wrapper.properties | 4 ++-- pom.xml | 7 ++++++- release-notes/VERSION | 1 + 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c6c0b24..7a89087 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ permissions: contents: read jobs: build: - runs-on: 'ubuntu-22.04' + runs-on: 'ubuntu-latest' strategy: fail-fast: false matrix: @@ -30,15 +30,18 @@ jobs: distribution: "temurin" java-version: ${{ matrix.java_version }} cache: 'maven' + server-id: central-snapshots + server-username: CI_DEPLOY_USERNAME + server-password: CI_DEPLOY_PASSWORD - name: Build run: ./mvnw -B -q -ff -ntp verify - name: Generate code coverage - if: github.event_name != 'pull_request' && matrix.java_version == '8' + if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' }} run: ./mvnw -B -q -ff -ntp test - name: Publish code coverage - if: github.event_name != 'pull_request' && matrix.java_version == '8' + if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' }} uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} - file: ./target/site/jacoco/jacoco.xml + files: ./target/site/jacoco/jacoco.xml flags: unittests diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 5366408..b9b1153 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/pom.xml b/pom.xml index 178b340..7d2af65 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.fasterxml oss-parent - 58 + 68 com.fasterxml.uuid java-uuid-generator @@ -199,6 +199,11 @@ https://stackoverflow.com/questions/37958104/maven-javadoc-no-source-files-for-p + + + org.sonatype.central + central-publishing-maven-plugin + diff --git a/release-notes/VERSION b/release-notes/VERSION index 63e0c96..07335fb 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -8,6 +8,7 @@ Releases #122: RFC-4122 Obsoleted by RFC-9562 (document change) (pointed out by @akefirad) +- Update to `oss-parent` v68 to switch to Central Portal publishing 5.1.0 (02-Jun-2024) From eb5c440e18b844c8ea735088db375a882a4cc7b2 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 28 May 2025 18:42:13 -0700 Subject: [PATCH 2/2] Fix yaml/tab --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7a89087..f1f3d5e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: distribution: "temurin" java-version: ${{ matrix.java_version }} cache: 'maven' - server-id: central-snapshots + server-id: central-snapshots server-username: CI_DEPLOY_USERNAME server-password: CI_DEPLOY_PASSWORD - name: Build