diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 1dd5902e..e595a139 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -18,7 +18,7 @@ jobs: with: maven-version: 3.9.0 - name: Generate Readme+action.yml - run: mvn resources:copy-resources -q + run: mvn generate-resources resources:copy-resources -q - name: commit doc changes uses: EndBug/add-and-commit@61a88be553afe4206585b31aa72387c64295d08b # v9 with: diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml index daa90764..07859c70 100644 --- a/.github/workflows/jreleaser.yml +++ b/.github/workflows/jreleaser.yml @@ -57,7 +57,7 @@ jobs: - name: Set release version run: mvn --no-transfer-progress --batch-mode versions:set -DnewVersion=$NEXT_VERSION -DprocessAllModules - name: Generate Readme - run : mvn resources:copy-resources + run : mvn generate-resources resources:copy-resources - name: Commit & Push changes uses: actions-js/push@master with: @@ -103,7 +103,7 @@ jobs: # Time to update some files with the new version #1 Readme and action.yml - name: Generate Readme - run : mvn resources:copy-resources -q + run : mvn generate-resources resources:copy-resources -q # Commit and push changes - name: Commit & Push changes uses: actions-js/push@master diff --git a/README.md b/README.md index 760ef6b1..687b8c40 100644 --- a/README.md +++ b/README.md @@ -108,16 +108,16 @@ Usage: ```yml name: Lockfile on: -pull_request: + pull_request: jobs: -check-lockfile: + check-lockfile: runs-on: ubuntu-latest steps: - name: run maven-lockfile - uses: chains-project/maven-lockfile@v1.1.7 - with: + uses: chains-project/maven-lockfile@20c49498ce30d0d6505ef97e8055c7cba90caa9f # v1.1.7 + with: github-token: ${{ secrets.GITHUB_TOKEN }} ``` If a pom.xml file is changed this action will add a commit with the updated lockfile to the pull request. diff --git a/github_action/pom.xml b/github_action/pom.xml index 9c2ef2bc..5f225af6 100644 --- a/github_action/pom.xml +++ b/github_action/pom.xml @@ -87,6 +87,29 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + 2.1.0 + false + + + org.apache.groovy + groovy + 4.0.6 + runtime + + + + + + + + + + + + maven-surefire-plugin ${surefire-plugin.version} diff --git a/maven_plugin/pom.xml b/maven_plugin/pom.xml index f16ef8aa..4a886006 100644 --- a/maven_plugin/pom.xml +++ b/maven_plugin/pom.xml @@ -153,6 +153,29 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + 2.1.0 + false + + + org.apache.groovy + groovy + 4.0.6 + runtime + + + + + + + + + + + + org.apache.maven.plugins maven-jar-plugin diff --git a/pom.xml b/pom.xml index 57a8429a..e9a602fd 100644 --- a/pom.xml +++ b/pom.xml @@ -72,6 +72,34 @@ + + org.codehaus.gmavenplus + gmavenplus-plugin + 2.1.0 + false + + + org.apache.groovy + groovy + 4.0.6 + runtime + + + + + + execute + + generate-resources + + + + + + + + org.apache.maven.plugins maven-resources-plugin diff --git a/template/README.md b/template/README.md index 83e70cd5..fa555eaf 100644 --- a/template/README.md +++ b/template/README.md @@ -106,19 +106,7 @@ We have created a GithubAction that can be used to validate the integrity of you A sample workflow is shown below: Usage: ```yml -name: Lockfile -on: -pull_request: - - -jobs: -check-lockfile: - runs-on: ubuntu-latest - steps: - - name: run maven-lockfile - uses: chains-project/maven-lockfile@v1.1.7 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} +${action_content} ``` If a pom.xml file is changed this action will add a commit with the updated lockfile to the pull request. Otherwise, it will validate the lockfile and fail if the lockfile is correct.