Skip to content

Commit 82ff60d

Browse files
committed
Merge remote-tracking branch 'origin/master' into docs
# Conflicts: # src/site/apt/examples/create-test-jar.apt.vm # src/site/apt/examples/manifest-customization.apt.vm # src/site/apt/index.apt.vm # src/site/apt/usage.apt.vm
2 parents f70ce99 + 70bc118 commit 82ff60d

22 files changed

Lines changed: 479 additions & 550 deletions

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,9 @@ updates:
3333
schedule:
3434
interval: "daily"
3535
target-branch: "maven-jar-plugin-3.x"
36+
37+
- package-ecosystem: "github-actions"
38+
directory: "/"
39+
schedule:
40+
interval: "daily"
41+
target-branch: "maven-jar-plugin-3.x"

.github/workflows/maven-verify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ on:
2424
jobs:
2525
build:
2626
name: Verify
27-
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
27+
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v5
2828
with:
29-
ff-maven: "4.0.0-rc-4" # Maven version for fail-fast-build
30-
maven-matrix: '[ "4.0.0-rc-4" ]'
29+
maven4-build: true
30+
maven4-version: '4.0.0-rc-6' # the same as used in project
3131
jdk-matrix: '[ "17", "21" ]'

.github/workflows/pr-automation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ on:
2424
jobs:
2525
pr-automation:
2626
name: PR Automation
27-
uses: apache/maven-gh-actions-shared/.github/workflows/pr-automation.yml@v4
27+
uses: apache/maven-gh-actions-shared/.github/workflows/pr-automation.yml@v5

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ on:
2626

2727
jobs:
2828
update_release_draft:
29-
uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v4
29+
uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v5

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ on:
2525

2626
jobs:
2727
stale:
28-
uses: 'apache/maven-gh-actions-shared/.github/workflows/stale.yml@v4'
28+
uses: 'apache/maven-gh-actions-shared/.github/workflows/stale.yml@v5'

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
* under the License.
1818
*/
1919

20-
asfMavenTlpPlgnBuild(jdks:[ "17", "21" ], maven: [ "4.0.x" ], siteJdk:[ "17" ], siteMvn:[ "4.0.x" ])
20+
asfMavenTlpPlgnBuild(jdks:[ "17", "21" ], maven: [ "4.0.x" ], siteJdk:[ "17" ], siteMvn: "4.0.x" )

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
<properties>
7676
<javaVersion>17</javaVersion>
77-
<mavenVersion>4.0.0-rc-4</mavenVersion>
77+
<mavenVersion>4.0.0-rc-6</mavenVersion>
7878

7979
<guiceVersion>5.1.0</guiceVersion>
8080
<junitVersion>5.14.4</junitVersion>

src/site/apt/examples/attached-jar.apt.vm

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/site/apt/examples/create-test-jar.apt.vm

Lines changed: 0 additions & 137 deletions
This file was deleted.

src/site/apt/examples/include-exclude.apt.vm

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)