diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 32f5dd5..b0a0227 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -19,9 +19,9 @@ jobs: distribution: 'corretto' java-version: 11 cache: 'maven' - server-id: ossrh - server-username: OSSRH_JIRA_USERNAME - server-password: OSSRH_JIRA_PASSWORD + server-id: central + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }} gpg-passphrase: OSSRH_GPG_SECRET_KEY_PASSWORD @@ -32,7 +32,7 @@ jobs: run: mvn -B -DskipTests deploy env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - OSSRH_JIRA_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }} - OSSRH_JIRA_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c654698..c28d7c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,9 +24,9 @@ jobs: distribution: 'corretto' java-version: 11 cache: 'maven' - server-id: ossrh - server-username: OSSRH_JIRA_USERNAME - server-password: OSSRH_JIRA_PASSWORD + server-id: central + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }} gpg-passphrase: OSSRH_GPG_SECRET_KEY_PASSWORD @@ -44,7 +44,7 @@ jobs: @semantic-release/git@10 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - OSSRH_JIRA_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }} - OSSRH_JIRA_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} diff --git a/pom.xml b/pom.xml index e6c7bbd..24773b0 100644 --- a/pom.xml +++ b/pom.xml @@ -46,17 +46,6 @@ https://github.com/openstandia/connector-auth0 - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - jp.openstandia.connector.auth0 Auth0Connector @@ -108,14 +97,14 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 true - ossrh - https://oss.sonatype.org/ - true + true + published + https://central.sonatype.com/repository/maven-snapshots diff --git a/src/main/java/jp/openstandia/connector/auth0/Auth0Connector.java b/src/main/java/jp/openstandia/connector/auth0/Auth0Connector.java index 1d6e927..a721f51 100644 --- a/src/main/java/jp/openstandia/connector/auth0/Auth0Connector.java +++ b/src/main/java/jp/openstandia/connector/auth0/Auth0Connector.java @@ -343,9 +343,11 @@ protected ConnectorException processException(Auth0Exception e) { if (ae.isAccessDenied()) { throw new ConnectorSecurityException(ae); } - if (ae.getError().equals("invalid_query_string")) { + if (ae.getError() != null && ae.getError().equals("invalid_query_string")) { return new InvalidAttributeValueException(e); } + + LOG.warn(ae, "Detected unexpected Auth0 API error. statusCode: {0}, description: {1}", statusCode, ae.getDescription()); } throw new ConnectorIOException(e);