Merge pull request #368 from hazendaz/master

Update maven wraper / Update github actions
mybatis · May 27, 2024 · 0f22e93 · 0f22e93
2 parents 038d179 + d9b0ae0
commit 0f22e93
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 24 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,9 +7,10 @@ jobs:
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
+ cache: [maven]
+ distribution: [temurin]
+ java: [11, 17, 21, 22, 23-ea]
  os: [ubuntu-latest, macos-latest, windows-latest]
- java: [11, 17, 21, 22-ea]
- distribution: ['temurin']
  fail-fast: false
  max-parallel: 4
  name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
@@ -21,5 +22,6 @@ jobs:
  with:
  java-version: ${{ matrix.java }}
  distribution: ${{ matrix.distribution }}
+ cache: ${{ matrix.cache }}
  - name: Test with Maven
  run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true"
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
@@ -11,8 +11,9 @@ jobs:
  - name: Set up JDK
  uses: actions/setup-java@v4
  with:
+ cache: maven
+ distribution: temurin
  java-version: 21
- distribution: zulu
  - name: Report Coverage to Coveralls for Pull Requests
  if: github.event_name == 'pull_request'
  run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress

diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml
@@ -14,21 +14,18 @@ jobs:
  - name: Set up JDK
  uses: actions/setup-java@v4
  with:
+ cache: maven
+ distribution: temurin
  java-version: 21
- distribution: zulu
- - uses: webfactory/ssh-agent@master
- with:
- ssh-private-key: ${{ secrets.DEPLOY_KEY }}
  - name: Build site
- run: ./mvnw site site:stage -DskipTests -B -V --no-transfer-progress -Dlicense.skip=true
+ run: ./mvnw site site:stage -DskipTests -Dlicense.skip=true -B -V --no-transfer-progress --settings ./.mvn/settings.xml
  env:
  CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
  - name: Deploy Site to gh-pages
- uses: JamesIves/github-pages-deploy-action@v4.6.1
+ uses: JamesIves/github-pages-deploy-action@v4
  with:
- ssh-key: true
  branch: gh-pages
  folder: target/staging
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ ssh-key: ${{ secrets.DEPLOY_KEY }}
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
@@ -17,10 +17,11 @@ jobs:
  - name: Set up JDK
  uses: actions/setup-java@v4
  with:
+ cache: maven
+ distribution: temurin
  java-version: 21
- distribution: zulu
  - name: Analyze with SonarCloud
- run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_migrations -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress
+ run: ./mvnw verify jacoco:report sonar:sonar -B -V -Dsonar.projectKey=mybatis_migrations -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
@@ -14,8 +14,9 @@ jobs:
  - name: Set up JDK
  uses: actions/setup-java@v4
  with:
+ cache: maven
+ distribution: temurin
  java-version: 21
- distribution: zulu
  - name: Deploy to Sonatype
  run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true
  env:

diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -30,7 +30,7 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 public final class MavenWrapperDownloader {
- private static final String WRAPPER_VERSION = "3.3.1";
+ private static final String WRAPPER_VERSION = "3.3.2";
 
  private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("MVNW_VERBOSE"));
 

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,6 +14,7 @@
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-wrapperVersion=3.3.1
+wrapperVersion=3.3.2
+distributionType=source
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
diff --git a/mvnw b/mvnw
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.3.1
+# Apache Maven Wrapper startup batch script, version 3.3.2
 #
 # Required ENV vars:
 # ------------------
@@ -212,9 +212,9 @@ else
  log "Couldn't find $wrapperJarPath, downloading it ..."
 
  if [ -n "$MVNW_REPOURL" ]; then
- wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar"
+ wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
  else
- wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar"
+ wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
  fi
  while IFS="=" read -r key value; do
  # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )

diff --git a/mvnw.cmd b/mvnw.cmd
@@ -18,7 +18,7 @@
 @REM ----------------------------------------------------------------------------
 
 @REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.3.1
+@REM Apache Maven Wrapper startup batch script, version 3.3.2
 @REM
 @REM Required ENV vars:
 @REM JAVA_HOME - location of a JDK home dir
@@ -119,7 +119,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar"
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
 
 FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
  IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
@@ -133,7 +133,7 @@ if exist %WRAPPER_JAR% (
  )
 ) else (
  if not "%MVNW_REPOURL%" == "" (
- SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar"
+ SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
  )
  if "%MVNW_VERBOSE%" == "true" (
  echo Couldn't find %WRAPPER_JAR%, downloading it ...