From b60ee436dba628a798c4d6f176e1e9d7ed12432a Mon Sep 17 00:00:00 2001 From: ebocher Date: Fri, 8 Nov 2024 14:31:48 +0100 Subject: [PATCH 1/2] Fix release --- .github/workflows/CI release.yml | 22 +++++++++++-------- .../java/org/cts/IdentifiableComponent.java | 6 ----- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/CI release.yml b/.github/workflows/CI release.yml index 3d3318fa..a66dd319 100644 --- a/.github/workflows/CI release.yml +++ b/.github/workflows/CI release.yml @@ -16,6 +16,15 @@ jobs: - name: Checkout uses: actions/checkout@v2 + # Install the GPG secret key + - name: Step 2 - Import GPG Key + run: | + echo "${{ secrets.GPG_PUBLIC_KEY }}" | gpg --import + echo "${{ secrets.GPG_SECRET_KEY }}" | gpg --import --no-tty --batch --yes + env: + GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} + GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} + # Set up the jdk using version 11 of Adoptium Temurin - name: Setup java 11 using Adoptium Temurin uses: actions/setup-java@v2 @@ -25,7 +34,7 @@ jobs: server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }} + gpg-private-key: ${{ secrets.GPG_SECRET_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE # Configure git user in order to sign release with OrbisGIS user. @@ -34,11 +43,6 @@ jobs: git config user.email "info@orbisgis.org" git config user.name OrbisGIS - #Install the GPG secret key - - name: Install gpg secret key - run: | - cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import - gpg --list-secret-keys --keyid-format LONG # Test build - name: Build test @@ -60,9 +64,9 @@ jobs: release:prepare release:perform \ -Dusername=$GITHUB_ACTOR -Dpassword=$GITHUB_TOKEN ${VERSION:+"-DdevelopmentVersion="$VERSION"-SNAPSHOT"} env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.MVN_CENTRAL_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MVN_CENTRAL_PASSWORD }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} # Export the last git tag into env. - name: Export env values diff --git a/src/main/java/org/cts/IdentifiableComponent.java b/src/main/java/org/cts/IdentifiableComponent.java index 88e461a8..67999b56 100644 --- a/src/main/java/org/cts/IdentifiableComponent.java +++ b/src/main/java/org/cts/IdentifiableComponent.java @@ -23,9 +23,6 @@ */ package org.cts; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,7 +39,6 @@ public class IdentifiableComponent implements Identifiable { private Identifier identifier; - static final Logger LOGGER = LoggerFactory.getLogger(CRSHelper.class); private static Map registry = new HashMap(); /** @@ -191,8 +187,6 @@ public IdentifiableComponent(Identifier identifier) { private void registerComponent() { if (!registry.containsKey(getIdentifier())) { registry.put(getIdentifier(), this); - } else { - LOGGER.debug("A component has already been registered for key " + getAuthorityName() + ":" + getAuthorityKey() + "."); } } From de0c8ce26b4393dfe4dbb6b18d8854d4a3023991 Mon Sep 17 00:00:00 2001 From: ebocher Date: Fri, 8 Nov 2024 14:32:51 +0100 Subject: [PATCH 2/2] Fix release --- docs/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 118c5703..f09e5358 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,3 +1,5 @@ ## Changelog for v1.7.2 - Use junit-jupiter-api in test scope only #160 +- Remove unnecessary logger +- Update github actions