Use Maven wrappers to fix version

smallrye · Mar 25, 2022 · 9b1adf8 · 9b1adf8
1 parent 73aad0b
commit 9b1adf8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -63,7 +63,9 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: build with maven
-        run: mvn -B formatter:validate verify --file pom.xml -Djava8.home=$JAVA_HOME_8 -Djava9.home=$JAVA_HOME_9 -Djava10.home=$JAVA_HOME_10
+        run: |
+          mvn -q -N io.takari:maven:0.7.7:wrapper -Dmaven=3.8.3
+          ./mvnw -B formatter:validate verify --file pom.xml -Djava8.home=$JAVA_HOME_8 -Djava9.home=$JAVA_HOME_9 -Djava10.home=$JAVA_HOME_10
 
   build-windows:
     runs-on: windows-latest
@@ -106,7 +108,9 @@ jobs:
 
       - name: build with maven
         shell: bash
-        run: mvn -B formatter:validate verify --file pom.xml -Djava8.home=$JAVA_HOME_8 -Djava9.home=$JAVA_HOME_9 -Djava10.home=$JAVA_HOME_10
+        run: |
+          mvn -q -N io.takari:maven:0.7.7:wrapper -Dmaven=3.8.3
+          ./mvnw -B formatter:validate verify --file pom.xml -Djava8.home=$JAVA_HOME_8 -Djava9.home=$JAVA_HOME_9 -Djava10.home=$JAVA_HOME_10
 
   build-macos:
     runs-on: macos-latest
@@ -148,7 +152,9 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: build with maven
-        run: mvn -B formatter:validate verify --file pom.xml -Djava8.home=$JAVA_HOME_8 -Djava9.home=$JAVA_HOME_9 -Djava10.home=$JAVA_HOME_10
+        run: |
+          mvn -q -N io.takari:maven:0.7.7:wrapper -Dmaven=3.8.3
+          ./mvnw -B formatter:validate verify --file pom.xml -Djava8.home=$JAVA_HOME_8 -Djava9.home=$JAVA_HOME_9 -Djava10.home=$JAVA_HOME_10
 
   quality:
     needs: [build-linux,build-macos,build-windows]
@@ -174,4 +180,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
-        run: mvn -B verify --file pom.xml -Pcoverage javadoc:javadoc sonar:sonar -Dsonar.projectKey=smallrye_smallrye-common -Dsonar.login=$SONAR_TOKEN
+        run: |
+          mvn -q -N io.takari:maven:0.7.7:wrapper -Dmaven=3.8.3
+          ./mvnw -B verify --file pom.xml -Pcoverage javadoc:javadoc sonar:sonar -Dsonar.projectKey=smallrye_smallrye-common -Dsonar.login=$SONAR_TOKEN
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,16 +33,17 @@ jobs:
       - name: maven release ${{steps.metadata.outputs.current-version}}
         run: |
           java -version
+          mvn -q -N io.takari:maven:0.7.7:wrapper -Dmaven=3.8.5 && ./mvnw -v
           gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output smallrye-sign.asc .github/release/smallrye-sign.asc.gpg
           gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg
           gpg --fast-import --no-tty --batch --yes smallrye-sign.asc
           git config --global user.name "SmallRye CI"
           git config --global user.email "[email protected]"
           git checkout -b release
-          mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml
+          ./mvnw -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml
           git checkout ${{github.base_ref}}
           git rebase release
-          mvn -B release:perform -Prelease -s maven-settings.xml
+          ./mvnw -B release:perform -Prelease -s maven-settings.xml
           git push
           git push --tags