Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit ab02f51

Browse files
Corneil du Plessiscorneil
Corneil du Plessis
authored and
corneil
committed
[CI] Remove setup-maven. Fix main-3 references. Bump maven plugin versions.
1 parent d1048f4 commit ab02f51

File tree

11 files changed

+36
-60
lines changed

11 files changed

+36
-60
lines changed

‎.github/workflows/build-snapshot-worker.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ jobs:
1717
with:
1818
java-version: '17'
1919
distribution: 'liberica'
20-
- uses: jvalkeal/setup-maven@v1
21-
with:
22-
maven-version: 3.8.8
23-
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
2420
- uses: jfrog/setup-jfrog-cli@v1
2521
with:
2622
version: 1.46.4
@@ -38,14 +34,14 @@ jobs:
3834
# target deploy repos
3935
- name: Configure JFrog Cli
4036
run: |
41-
jfrog rt mvnc \
37+
jfrog rt mvnc --use-wrapper \
4238
--server-id-resolve=repo.spring.io \
4339
--server-id-deploy=repo.spring.io \
4440
--repo-resolve-releases=libs-milestone \
4541
--repo-resolve-snapshots=libs-snapshot \
4642
--repo-deploy-releases=libs-release-local \
4743
--repo-deploy-snapshots=libs-snapshot-local
48-
echo JFROG_CLI_BUILD_NAME=spring-cloud-deployer-main-3 >> $GITHUB_ENV
44+
echo JFROG_CLI_BUILD_NAME=spring-cloud-deployer-main >> $GITHUB_ENV
4945
echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
5046
5147
# zoo extract and ensure
@@ -59,8 +55,8 @@ jobs:
5955
run: |
6056
jfrog rt mvn -U -B clean install -T 0.5C
6157
jfrog rt build-publish
62-
echo BUILD_ZOO_HANDLER_spring_cloud_deployer_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
63-
echo BUILD_ZOO_HANDLER_spring_cloud_deployer_buildname=spring-cloud-deployer-main-3 >> $GITHUB_ENV
58+
echo BUILD_ZOO_HANDLER_spring_cloud_deployer_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
59+
echo BUILD_ZOO_HANDLER_spring_cloud_deployer_buildname=spring-cloud-deployer-main >> $GITHUB_ENV
6460
echo BUILD_ZOO_HANDLER_spring_cloud_deployer_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
6561
- name: Test Report
6662
uses: dorny/test-reporter@v1

‎.github/workflows/ci-it.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,37 @@ jobs:
3737
with:
3838
java-version: '17'
3939
distribution: 'liberica'
40-
- uses: jvalkeal/setup-maven@v1
40+
- name: Install kubectl
41+
uses: azure/setup-kubectl@v3
42+
- uses: docker/login-action@v3
4143
with:
42-
maven-version: 3.8.8
43-
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
44+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
45+
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
4446
- name: 'Install minikube ${{ matrix.patch && matrix.patch || matrix.k8s_version }}'
4547
shell: bash
4648
run: |
4749
MINIKUBE_VERSION="v1.32.0"
4850
curl -LO "https://storage.googleapis.com/minikube/releases/$MINIKUBE_VERSION/minikube-linux-amd64"
4951
sudo install minikube-linux-amd64 /usr/local/bin/minikube
5052
minikube start "--kubernetes-version=${{ matrix.patch && matrix.patch || matrix.k8s_version }}"
53+
- name: 'Prepare docker hub pull secrets'
54+
shell: bash
55+
env:
56+
DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
57+
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
58+
run: |
59+
kubectl create secret docker-registry docker-hub-pull-secret \
60+
--docker-server=registry-1.docker.io \
61+
--docker-username="$DOCKER_HUB_USERNAME" \
62+
--docker-password="$DOCKER_HUB_PASSWORD" \
63+
kubectl patch serviceaccount default -p '{"imagePullSecrets": [{"name": "docker-hub-pull-secret"}]}'
5164
# build
5265
- name: Build
5366
run: |
54-
mvn -U -B -Pfailsafe verify -pl spring-cloud-deployer-kubernetes
67+
./mvnw install -am -pl spring-cloud-deployer-kubernetes,spring-cloud-deployer-spi-test-app -DskipTests -T 1C
68+
./mvnw spring-boot:build-image -pl spring-cloud-deployer-spi-test-app
69+
minikube image load springcloud/spring-cloud-deployer-spi-test-app:latest
70+
./mvnw -B -Pfailsafe verify -pl spring-cloud-deployer-kubernetes
5571
- name: Test Report
5672
uses: dorny/test-reporter@v1
5773
if: ${{ success() || failure() }}

‎.github/workflows/ci-pr.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,10 @@ jobs:
2020
with:
2121
java-version: '17'
2222
distribution: 'liberica'
23-
- uses: jvalkeal/setup-maven@v1
24-
with:
25-
maven-version: 3.8.8
26-
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
2723
# build
2824
- name: Build
2925
run: |
30-
mvn -U -B clean package
26+
./mvnw -U -B clean package
3127
- name: Capture Test Results
3228
if: failure()
3329
uses: actions/upload-artifact@v3

‎.github/workflows/ci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ jobs:
2929
with:
3030
java-version: '17'
3131
distribution: 'liberica'
32-
- uses: jvalkeal/setup-maven@v1
33-
with:
34-
maven-version: 3.8.8
35-
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
3632
# jfrog cli
3733
- uses: jfrog/setup-jfrog-cli@v1
3834
with:

‎.github/workflows/issue-handler.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ jobs:
3131
"dturanski",
3232
"onobc",
3333
"claudiahub",
34-
"sobychacko"
34+
"sobychacko",
35+
"corneil"
3536
]
3637
},
3738
"recipes": [

‎.github/workflows/milestone-worker.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ jobs:
1717
with:
1818
java-version: '17'
1919
distribution: 'liberica'
20-
- uses: jvalkeal/setup-maven@v1
21-
with:
22-
maven-version: 3.8.8
23-
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
2420
- uses: jfrog/setup-jfrog-cli@v1
2521
with:
2622
version: 1.46.4
@@ -65,7 +61,7 @@ jobs:
6561
-Dartifactory.publish.artifacts=false \
6662
-DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-'${BUILD_ZOO_HANDLER_milestone_version} \
6763
-B
68-
echo BUILD_ZOO_HANDLER_spring_cloud_deployer_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
64+
echo BUILD_ZOO_HANDLER_spring_cloud_deployer_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
6965
jfrog rt build-clean
7066
jfrog rt mvn clean install \
7167
-gs .github/settings.xml \

‎.github/workflows/next-dev-version-worker.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ jobs:
1717
with:
1818
java-version: '17'
1919
distribution: 'liberica'
20-
- uses: jvalkeal/setup-maven@v1
21-
with:
22-
maven-version: 3.8.8
23-
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
2420
- uses: jfrog/setup-jfrog-cli@v1
2521
with:
2622
version: 1.46.4
@@ -63,7 +59,7 @@ jobs:
6359
-Dartifactory.publish.artifacts=false \
6460
-DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}-SNAPSHOT' \
6561
-B
66-
echo BUILD_ZOO_HANDLER_spring_cloud_deployer_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
62+
echo BUILD_ZOO_HANDLER_spring_cloud_deployer_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
6763
jfrog rt build-clean
6864
jfrog rt mvn clean install -DskipTests -B -T 0.5C
6965
jfrog rt build-publish

‎.github/workflows/release-worker.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ jobs:
1717
with:
1818
java-version: '17'
1919
distribution: 'liberica'
20-
- uses: jvalkeal/setup-maven@v1
21-
with:
22-
maven-version: 3.8.8
23-
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
2420
- uses: jfrog/setup-jfrog-cli@v1
2521
with:
2622
version: 1.46.4
@@ -63,7 +59,7 @@ jobs:
6359
-Dartifactory.publish.artifacts=false \
6460
-DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}' \
6561
-B
66-
echo BUILD_ZOO_HANDLER_spring_cloud_deployer_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
62+
echo BUILD_ZOO_HANDLER_spring_cloud_deployer_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
6763
jfrog rt build-clean
6864
jfrog rt mvn clean install \
6965
-gs .github/settings.xml \

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip

‎spring-cloud-deployer-kubernetes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<plugin>
155155
<groupId>org.apache.maven.plugins</groupId>
156156
<artifactId>maven-failsafe-plugin</artifactId>
157-
<version>3.0.0</version>
157+
<version>3.5.0</version>
158158
<configuration>
159159
<includes>
160160
<include>**/*IT.*</include>

‎spring-cloud-deployer-spi-test-app/pom.xml

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,11 @@
3838
<groupId>org.springframework.boot</groupId>
3939
<artifactId>spring-boot-maven-plugin</artifactId>
4040
<version>${spring-boot.version}</version>
41-
<executions>
42-
<execution>
43-
<goals>
44-
<goal>repackage</goal>
45-
</goals>
46-
<configuration>
47-
48-
<classifier>exec</classifier>
49-
</configuration>
50-
</execution>
51-
</executions>
52-
</plugin>
53-
<plugin>
54-
<groupId>com.spotify</groupId>
55-
<artifactId>dockerfile-maven-plugin</artifactId>
56-
<version>${dockerfile-maven-plugin.version}</version>
5741
<configuration>
58-
<repository>${docker.image.prefix}/${project.artifactId}</repository>
59-
<tag>${project.version}</tag>
60-
<buildArgs>
61-
<JAR_FILE>${project.build.finalName}-exec.jar</JAR_FILE>
62-
</buildArgs>
42+
<image>
43+
<pullPolicy>IF_NOT_PRESENT</pullPolicy>
44+
<name>springcloud/spring-cloud-deployer-spi-test-app:latest</name>
45+
</image>
6346
</configuration>
6447
</plugin>
6548
</plugins>

0 commit comments

Comments
 (0)