From c9db87a992aa7911e809ee84455073508cecabe8 Mon Sep 17 00:00:00 2001 From: Aliaksej Mialeshka Date: Tue, 15 Jul 2025 21:59:13 +0200 Subject: [PATCH 1/2] Update Selenium to 4.34.0 +semver:feature Sonatype deploy: publish with central-publishing-maven-plugin, use maven versions plugin --- .github/workflows/release-maven-central.yml | 7 ++- pom.xml | 50 +++++++++------------ 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/.github/workflows/release-maven-central.yml b/.github/workflows/release-maven-central.yml index 1a2dc87..22cfbab 100644 --- a/.github/workflows/release-maven-central.yml +++ b/.github/workflows/release-maven-central.yml @@ -54,7 +54,12 @@ jobs: - name: Step 6 - Publish package run: | - mvn -Dmaven.test.skip=true -P release -Drevision=${{ steps.gitversion.outputs.semVer }} deploy + mvn -B --no-transfer-progress \ + versions:set \ + -DnewVersion=${{ steps.gitversion.outputs.semVer }} \ + -DgenerateBackupPoms=false \ + -DprocessAllModules + mvn -B --no-transfer-progress -Dmaven.test.skip=true deploy env: MVN_CENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }} MVN_CENTRAL_PASSWORD: ${{ secrets.OSSRH_TOKEN }} diff --git a/pom.xml b/pom.xml index e1b8435..a6fb55b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.github.aquality-automation aquality-selenium-core - ${revision} + 4.0.0 jar Aquality Selenium Core @@ -16,21 +16,9 @@ UTF-8 UTF-8 - 4.0.0-SNAPSHOT - 2.24.3 + 2.25.1 - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - scm:git:git@github.com:aquality-automation/aquality-selenium-core-java.git scm:git:git@github.com:aquality-automation/aquality-selenium-core-java.git @@ -131,18 +119,18 @@ org.seleniumhq.selenium selenium-java - 4.33.0 + 4.34.0 io.appium java-client - 9.4.0 + 9.5.0 test org.apache.commons commons-lang3 - 3.17.0 + 3.18.0 test @@ -152,7 +140,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 11 11 @@ -161,7 +149,7 @@ org.jacoco jacoco-maven-plugin - 0.8.12 + 0.8.13 pre-unit-test @@ -189,7 +177,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 + 3.5.3 ${surefireArgLine} -Dfile.encoding=UTF-8 false @@ -201,6 +189,7 @@ org.apache.maven.plugins maven-assembly-plugin + 3.7.1 @@ -231,7 +220,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.1 + 3.11.2 11 @@ -247,7 +236,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.7 + 3.2.8 sign-artifacts @@ -265,16 +254,21 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 true - ossrh - https://s01.oss.sonatype.org/ - true + central + true + published + + org.codehaus.mojo + versions-maven-plugin + 2.18.0 + From 5491c751f7578b57af12ad5dc834fc9eb5aab7ee Mon Sep 17 00:00:00 2001 From: Aliaksej Mialeshka Date: Tue, 15 Jul 2025 22:30:57 +0200 Subject: [PATCH 2/2] fix server id, update sonar task versions --- .github/workflows/release-maven-central.yml | 2 +- azure-pipelines.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-maven-central.yml b/.github/workflows/release-maven-central.yml index 22cfbab..bef67f9 100644 --- a/.github/workflows/release-maven-central.yml +++ b/.github/workflows/release-maven-central.yml @@ -20,7 +20,7 @@ jobs: with: java-version: "11" distribution: "adopt" - server-id: ossrh + server-id: central server-username: MVN_CENTRAL_USERNAME server-password: MVN_CENTRAL_PASSWORD gpg-private-key: ${{ secrets.GPG_SECRET_KEY }} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c0a8b6e..e01e942 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,7 +9,7 @@ jobs: displayName: Analyse code with SonarQube steps: - - task: SonarCloudPrepare@2 + - task: SonarCloudPrepare@3 displayName: 'Prepare SonarCloud analysis' inputs: SonarCloud: 'SonarCloud' @@ -32,13 +32,13 @@ jobs: effectivePomSkip: false sonarQubeRunAnalysis: false - - task: SonarCloudAnalyze@2 + - task: SonarCloudAnalyze@3 inputs: jdkversion: 'JAVA_HOME_21_X64' displayName: 'Run SonarCloud code analysis' continueOnError: true - - task: SonarCloudPublish@2 + - task: SonarCloudPublish@3 displayName: 'Publish SonarCloud quality gate results' inputs: pollingTimeoutSec: '300'