Skip to content

Commit b1731f3

Browse files
author
Adrian Cole
committed
update maven wrapper to latest, and adjusts CI to use it
Signed-off-by: Adrian Cole <[email protected]>
1 parent 11184dc commit b1731f3

File tree

7 files changed

+149
-140
lines changed

7 files changed

+149
-140
lines changed

Diff for: .github/workflows/maven.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
distribution: 'temurin'
2222
java-version: 11
2323
- name: Verify Format and License
24-
run: mvn spotless:check
24+
run: ./mvnw spotless:check
2525
build:
2626
name: Java ${{ matrix.java }} Maven Test on ${{ matrix.os }}
2727
strategy:
@@ -51,7 +51,7 @@ jobs:
5151
EXCLUDED_EXAMPLE_MODULES=`ls examples | grep examples | xargs -I {} echo '!examples/{}' | tr '\n' ',' | sed 's/.$//'`
5252
MODS_OVERRIDES=$MODS_OVERRIDES,$EXCLUDED_EXAMPLE_MODULES
5353
fi
54-
mvn -q -B --define=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn $MODS_OVERRIDES clean test
54+
./mvnw -q -B --define=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn $MODS_OVERRIDES clean test
5555
build-graalvm:
5656
runs-on: ubuntu-latest
5757
name: GraalVM Maven Test
@@ -63,7 +63,7 @@ jobs:
6363
java-version: '17'
6464
components: 'native-image'
6565
- name: Build with Maven
66-
run: mvn -q test -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
66+
run: ./mvnw -q test -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
6767
e2e:
6868
runs-on: ubuntu-latest
6969
name: End-to-End Test Against Real Cluster
@@ -78,12 +78,12 @@ jobs:
7878
java-version: 17.0.x
7979
- name: Run E2E with Maven
8080
run: |
81-
mvn clean install \
81+
./mvnw clean install \
8282
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
8383
-q \
8484
-Dmaven.test.skip=true
8585
cd e2e
86-
mvn test \
86+
./mvnw test \
8787
-B \
8888
-De2e.skip=false \
8989
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
@@ -106,29 +106,29 @@ jobs:
106106
${{ runner.os }}-maven-
107107
- name: Build with Maven
108108
run: |
109-
mvn clean install \
109+
./mvnw clean install \
110110
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
111111
-q \
112112
-Dmaven.test.skip=true
113113
- name: Build Cert Manager Contrib
114114
run: |
115115
cd client-java-contrib/cert-manager
116-
mvn clean install \
116+
./mvnw clean install \
117117
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
118118
-q \
119119
-Dmaven.test.skip=true
120120
- name: Build Prometheus Contrib
121121
run: |
122122
cd client-java-contrib/prometheus-operator
123-
mvn clean install \
123+
./mvnw clean install \
124124
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
125125
-q \
126126
-Dmaven.test.skip=true
127127
- name: Examples
128128
run: |
129129
for d in $(find examples* -maxdepth 1 -type d)
130130
do
131-
mvn clean install -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
131+
./mvnw clean install -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
132132
done
133133
codegen:
134134
runs-on: ubuntu-latest

Diff for: .github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
git config user.name "Kubernetes Publisher"
5252
- name: Check Current Version
5353
run: |
54-
mvn -q \
54+
./mvnw -q \
5555
-Dexec.executable=echo \
5656
-Dexec.args='${project.version}' \
5757
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
@@ -60,7 +60,7 @@ jobs:
6060
- name: Release Prepare
6161
run: |
6262
git checkout -b 'automated-release-${{ github.event.inputs.releaseVersion }}'
63-
mvn --batch-mode \
63+
./mvnw --batch-mode \
6464
release:prepare \
6565
-Dtag=v${{ github.event.inputs.releaseVersion }} \
6666
-DconnectionUrl=https://${{ github.token }}@github.com/${{ github.repository }}.git \
@@ -76,7 +76,7 @@ jobs:
7676
GPG_PASSPHRASE: ${{ secrets.GPG_PASSWORD }}
7777
run: |
7878
# The tests are already executed in the prepare, skipping
79-
mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DlocalCheckout=true -Darguments=-DskipTests release:perform
79+
./mvnw -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DlocalCheckout=true -Darguments=-DskipTests release:perform
8080
git push https://${{ github.token }}@github.com/${{ github.repository }}.git \
8181
automated-release-${{ github.event.inputs.releaseVersion }}:automated-release-${{ github.event.inputs.releaseVersion }}
8282
git push https://${{ github.token }}@github.com/${{ github.repository }}.git v${{ github.event.inputs.releaseVersion }}

Diff for: .mvn/wrapper/maven-wrapper.jar

3.73 KB
Binary file not shown.

Diff for: .mvn/wrapper/maven-wrapper.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
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.8.5/apache-maven-3.8.5-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-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

Diff for: RELEASES.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ Now we are ready to perform the release.
136136
Make sure there are no unstaged changes, otherwise `mvn` will reject the
137137
release. There are two commands to be run in the root directory:
138138

139-
1. `mvn release:prepare -DdryRun=true`: This will perform a dry run of the
139+
1. `./mvnw release:prepare -DdryRun=true`: This will perform a dry run of the
140140
automated SCM modifications that will performed in the next step. If
141141
everything looks OK - you're good to continue.
142142

143-
2. `mvn release:clean release:prepare release:perform`: This will first clean
143+
2. `./mvnw release:clean release:prepare release:perform`: This will first clean
144144
any staged modifications made in the prior run, commit a new `pom.xml`
145145
version, tag your source with the current release, build and sign your
146146
artifacts with your GPG key, and publish the release to Maven central.
@@ -157,7 +157,7 @@ PR against the main repository.
157157

158158
Now that the release is consumable, there are two things left to do:
159159

160-
1. Find the newly released tag that was pushed by `mvn release:prepare` under
160+
1. Find the newly released tag that was pushed by `./mvnw release:prepare` under
161161
the [tags](https://github.com/kubernetes-client/java/tags) of the client
162162
library, and click "Add release notes". Title the release version of the form
163163
`MAJOR.MINOR.PATCH`, and include the changelog in the release description.
@@ -173,7 +173,7 @@ Let's add entries here as we run into problems.
173173
* **Authentication problems**: Ensure your git SSH keys & JIRA account have
174174
access to https://github.com/kubernetes-client/java and the
175175
`io.kubernetes:client-java` repositories respectively. If this is the case,
176-
check `mvn release:<command>` output for complaints of malformed
176+
check `./mvnw release:<command>` output for complaints of malformed
177177
`settings.xml` entries.
178178

179179
* **Undo a mistake**: If you've made a mistake during a release, and the

0 commit comments

Comments
 (0)