diff --git a/.github/workflows/release_on_pr.yml b/.github/workflows/release_on_pr.yml index 061b52e9..5893bd63 100644 --- a/.github/workflows/release_on_pr.yml +++ b/.github/workflows/release_on_pr.yml @@ -7,10 +7,6 @@ jobs: if: github.event.deployment.environment == 'production' runs-on: ubuntu-latest env: - MAVEN_GPG_SIGN_KEY: '${{ secrets.MAVEN_GPG_SIGN_KEY }}' - username: '${{ secrets.maven_deploy_username }}' - password: '${{ secrets.maven_deploy_password }}' - passphrase: '${{ secrets.gpg_passphrase }}' GITHUB_TOKEN: '${{ secrets.GAUGEBOT_GITHUB_TOKEN }}' CI: true @@ -21,19 +17,11 @@ jobs: with: distribution: 'temurin' java-version: '21' - - - name: Set up Maven - uses: stCarolas/setup-maven@v5 - with: - maven-version: 3.9.9 - - - name: Setup maven - run: | - echo -e "$MAVEN_GPG_SIGN_KEY" | gpg --import --batch - - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys $gpgkey - rm -rf $HOME/.m2 - mkdir -p $HOME/.m2 - echo -e "\n\n\ncentral\n$username\n$password\n\n\n" > $HOME/.m2/settings.xml + cache: maven + server-id: central + server-username: MAVEN_CENTRAL_USERNAME + server-password: MAVEN_CENTRAL_PASSWORD + gpg-private-key: ${{ secrets.MAVEN_GPG_SIGN_KEY }} - name: Setup git run: | @@ -67,8 +55,11 @@ jobs: - name: Deploy on maven central run: | - mvn -q clean deploy -Dgpg.passphrase=$passphrase - + mvn -B "-Dstyle.color=always" clean deploy + env: + MAVEN_CENTRAL_USERNAME: ${{ secrets.maven_deploy_username }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.maven_deploy_password }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.gpg_passphrase }} - name: Update metadata in gauge-repository run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6aaa425e..dc361d07 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,14 +25,10 @@ jobs: with: distribution: 'temurin' java-version: ${{ matrix.java_version }} - - - name: Set up Maven - uses: stCarolas/setup-maven@v5 - with: - maven-version: 3.9.9 + cache: maven - name: Run test - run: mvn -q clean test + run: mvn -B "-Dstyle.color=always" clean test functional_tests: name: FTs - java ${{ matrix.java_version }} ${{ matrix.os }} @@ -58,11 +54,7 @@ jobs: with: distribution: 'temurin' java-version: ${{ matrix.java_version }} - - - name: Set up Maven - uses: stCarolas/setup-maven@v5 - with: - maven-version: 3.9.9 + cache: maven - uses: getgauge/setup-gauge@master with: @@ -75,7 +67,7 @@ jobs: - name: Install Gauge Java maven package locally run: | - mvn -q install -DskipTests -"Dgpg.skip" -D"maven.javadoc.skip=true" + mvn -B "-Dstyle.color=always" -DskipTests "-Dgpg.skip" "-Dmaven.javadoc.skip=true" install - name: Clone gauge-tests run: | @@ -122,11 +114,7 @@ jobs: with: distribution: 'temurin' java-version: ${{ matrix.java_version }} - - - name: Set up Maven - uses: stCarolas/setup-maven@v5 - with: - maven-version: 3.9.9 + cache: maven - uses: getgauge/setup-gauge@master with: diff --git a/java.json b/java.json index 8d8a8378..71df71aa 100644 --- a/java.json +++ b/java.json @@ -1,6 +1,6 @@ { "id": "java", - "version": "1.0.2", + "version": "1.0.3", "description": "Java support for gauge", "install": { "windows": [], diff --git a/pom.xml b/pom.xml index 63abc500..8dd219f8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ gauge-java com.thoughtworks.gauge gauge-java - 1.0.2 + 1.0.3 Java plugin for Gauge https://github.com/getgauge/gauge-java @@ -256,10 +256,7 @@ sign - - --pinentry-mode - loopback - + true @@ -370,7 +367,7 @@ ${java.version} 4.35.1 - 1.83.0 + 1.83.1