Skip to content

Commit 7f3e692

Browse files
committed
fix: update Maven wrapper to Maven 3.9.12 and use it in CI
Signed-off-by: xstefank <xstefank122@gmail.com>
1 parent e9053ee commit 7f3e692

File tree

7 files changed

+404
-556
lines changed

7 files changed

+404
-556
lines changed

.github/workflows/e2e-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ jobs:
4949
cache: 'maven'
5050

5151
- name: Build SDK
52-
run: mvn install -DskipTests
52+
run: ./mvnw install -DskipTests
5353

5454
- name: Run integration tests in local mode
5555
run: |
56-
mvn test -P end-to-end-tests -pl ${{ matrix.sample }}
56+
./mvnw test -P end-to-end-tests -pl ${{ matrix.sample }}
5757
5858
- name: Run E2E tests as a deployment
5959
run: |
6060
eval $(minikube -p minikube docker-env)
61-
mvn jib:dockerBuild test -P end-to-end-tests -Dtest.deployment=remote -pl ${{ matrix.sample }}
61+
./mvnw jib:dockerBuild test -P end-to-end-tests -Dtest.deployment=remote -pl ${{ matrix.sample }}

.github/workflows/release-project-in-dir.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838
- name: Change version to release version
3939
# Assume that RELEASE_VERSION will have form like: "v1.0.1". So we cut the "v"
4040
run: |
41-
mvn ${MAVEN_ARGS} versions:set -DnewVersion="${RELEASE_VERSION:1}" versions:commit -DprocessAllModules
41+
./mvnw ${MAVEN_ARGS} versions:set -DnewVersion="${RELEASE_VERSION:1}" versions:commit -DprocessAllModules
4242
env:
4343
RELEASE_VERSION: ${{ github.event.release.tag_name }}
4444

4545
- name: Publish to Apache Maven Central
46-
run: mvn package deploy -Prelease
46+
run: ./mvnw package deploy -Prelease
4747
env:
4848
MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
4949
MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_PASSWORD }}
@@ -69,7 +69,7 @@ jobs:
6969

7070
- name: Update version to new SNAPSHOT version
7171
run: |
72-
mvn ${MAVEN_ARGS} build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit -DprocessAllModules
72+
./mvnw ${MAVEN_ARGS} build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit -DprocessAllModules
7373
git config --local user.email "action@github.com"
7474
git config --local user.name "GitHub Action"
7575
git commit -m "Set new SNAPSHOT version into pom files." -a

.github/workflows/snapshot-releases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
gpg-passphrase: MAVEN_GPG_PASSPHRASE
4444

4545
- name: Publish to Apache Maven Central
46-
run: mvn package deploy -Prelease
46+
run: ./mvnw package deploy -Prelease
4747
env:
4848
MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
4949
MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_PASSWORD }}

.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 0 additions & 117 deletions
This file was deleted.
Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-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
1+
wrapperVersion=3.3.4
2+
distributionType=only-script
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip

0 commit comments

Comments
 (0)