Skip to content

Commit 4315c05

Browse files
hpehlhpehl
committed
Maven 4 migration
1 parent aa83fbe commit 4315c05

File tree

15 files changed

+895
-448
lines changed

15 files changed

+895
-448
lines changed

‎.github/workflows/apidocs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ jobs:
1616
java-version: 21
1717
distribution: temurin
1818
cache: maven
19+
- run: $MVN install
20+
working-directory: bom
1921
- run: |
2022
$MVN -D quickly clean install
2123
$MVN -P snippets javadoc:aggregate

‎.github/workflows/release.yml‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,40 @@ on:
66
- 'v*'
77

88
jobs:
9-
deploy:
9+
deploy-bom:
10+
name: Deploy BOM
11+
runs-on: ubuntu-latest
12+
env:
13+
MVN: ./mvnw --show-version --batch-mode --no-transfer-progress
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-java@v4
17+
with:
18+
java-version: 17
19+
distribution: temurin
20+
cache: maven
21+
- run: $MVN package
22+
working-directory: bom
23+
- uses: actions/setup-java@v4
24+
with: # running setup-java again overwrites the settings.xml
25+
java-version: 17
26+
distribution: temurin
27+
server-id: central
28+
server-username: CENTRAL_USERNAME
29+
server-password: CENTRAL_PASSWORD
30+
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
31+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
32+
- run: $MVN deploy -P release
33+
working-directory: bom
34+
env:
35+
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
36+
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
37+
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
38+
39+
deploy-patternfly:
1040
name: Deploy Maven Artifacts
1141
runs-on: ubuntu-latest
42+
needs: deploy-bom
1243
env:
1344
MVN: ./mvnw --show-version --batch-mode --no-transfer-progress
1445
steps:
@@ -46,6 +77,8 @@ jobs:
4677
java-version: 21
4778
distribution: temurin
4879
cache: maven
80+
- run: $MVN install
81+
working-directory: bom
4982
- run: |
5083
$MVN -D quickly clean install
5184
$MVN -P snippets javadoc:aggregate
@@ -62,6 +95,7 @@ jobs:
6295
publish-showcase:
6396
name: Publish Showcase
6497
runs-on: ubuntu-latest
98+
needs: deploy-patternfly
6599
env:
66100
MVN: ./mvnw --show-version --batch-mode --no-transfer-progress
67101
steps:
@@ -82,8 +116,8 @@ jobs:
82116

83117
release:
84118
name: Create GitHub Release
85-
needs: deploy
86119
runs-on: ubuntu-latest
120+
needs: deploy-patternfly
87121
steps:
88122
- name: Get Version
89123
id: get-version

‎.github/workflows/showcase.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ jobs:
1616
java-version: 17
1717
distribution: temurin
1818
cache: maven
19+
- run: $MVN install
20+
working-directory: bom
1921
- run: $MVN --projects org.patternfly:patternfly-java-showcase-j2cl --also-make -P showcase,prod package
2022
- uses: JamesIves/[email protected]
2123
with:

‎.github/workflows/snapshot.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,31 @@ on:
66
types: [completed]
77

88
jobs:
9+
snapshot-bom:
10+
name: Publish BOM
11+
runs-on: ubuntu-latest
12+
env:
13+
MVN: ./mvnw --show-version --batch-mode --no-transfer-progress
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-java@v4
17+
with:
18+
java-version: 17
19+
distribution: temurin
20+
cache: maven
21+
server-id: central
22+
server-username: CENTRAL_USERNAME
23+
server-password: CENTRAL_PASSWORD
24+
- run: $MVN deploy -DskipTests
25+
working-directory: bom
26+
env:
27+
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
28+
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
29+
930
snapshot:
1031
name: Publish Snapshot
1132
runs-on: ubuntu-latest
33+
needs: snapshot-bom
1234
env:
1335
MVN: ./mvnw --show-version --batch-mode --no-transfer-progress
1436
steps:

‎.github/workflows/verify.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ jobs:
1919
java-version: 17
2020
distribution: temurin
2121
cache: maven
22+
- run: $MVN install
23+
working-directory: bom
2224
- run: $MVN verify

‎.mvn/maven.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-T
2+
1C

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-3/apache-maven-4.0.0-rc-3-bin.zip

‎bom/.mvn/maven.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-T
2+
1C

0 commit comments

Comments
 (0)