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

Commit f68543e

Browse files
author
Corneil du Plessis
authored
Fix CI-PR build to use .github/settings.xml since it isn't using JFrog cli. (#5238)
1 parent f6dd59b commit f68543e

File tree

7 files changed

+81
-15
lines changed

7 files changed

+81
-15
lines changed

‎.github/settings.xml‎

Lines changed: 71 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,71 @@
11
<settings>
22
<profiles>
3+
<profile>
4+
<id>pr</id>
5+
<activation>
6+
<activeByDefault>true</activeByDefault>
7+
</activation>
8+
<repositories>
9+
<repository>
10+
<id>maven-central</id>
11+
<name>Maven Central</name>
12+
<url>https://repo.maven.apache.org/maven2</url>
13+
<snapshots>
14+
<enabled>false</enabled>
15+
</snapshots>
16+
</repository>
17+
<repository>
18+
<id>spring-snapshots</id>
19+
<name>Spring Snapshots</name>
20+
<url>https://repo.spring.io/libs-snapshot</url>
21+
<snapshots>
22+
<enabled>true</enabled>
23+
</snapshots>
24+
</repository>
25+
<repository>
26+
<id>spring-milestones</id>
27+
<name>Spring Milestones</name>
28+
<url>https://repo.spring.io/libs-milestone</url>
29+
<snapshots>
30+
<enabled>false</enabled>
31+
</snapshots>
32+
</repository>
33+
<repository>
34+
<id>spring-releases</id>
35+
<name>Spring Releases</name>
36+
<url>https://repo.spring.io/libs-release</url>
37+
<snapshots>
38+
<enabled>true</enabled>
39+
</snapshots>
40+
</repository>
41+
</repositories>
42+
<pluginRepositories>
43+
<pluginRepository>
44+
<id>maven-central</id>
45+
<name>Maven Central</name>
46+
<url>https://repo.maven.apache.org/maven2</url>
47+
<snapshots>
48+
<enabled>false</enabled>
49+
</snapshots>
50+
</pluginRepository>
51+
<pluginRepository>
52+
<id>spring-snapshots</id>
53+
<name>Spring Snapshots</name>
54+
<url>https://repo.spring.io/libs-snapshot</url>
55+
<snapshots>
56+
<enabled>true</enabled>
57+
</snapshots>
58+
</pluginRepository>
59+
<pluginRepository>
60+
<id>spring-milestones</id>
61+
<name>Spring Milestones</name>
62+
<url>https://repo.spring.io/libs-milestone</url>
63+
<snapshots>
64+
<enabled>false</enabled>
65+
</snapshots>
66+
</pluginRepository>
67+
</pluginRepositories>
68+
</profile>
369
<profile>
470
<id>stagingmilestone</id>
571
<repositories>
@@ -22,7 +88,7 @@
2288
<repository>
2389
<id>maven-central</id>
2490
<name>Maven Central</name>
25-
<url>https://repo1.maven.apache.org/maven2</url>
91+
<url>https://repo.maven.apache.org/maven2</url>
2692
<snapshots>
2793
<enabled>false</enabled>
2894
</snapshots>
@@ -48,12 +114,12 @@
48114
<pluginRepository>
49115
<id>maven-central</id>
50116
<name>Maven Central</name>
51-
<url>https://repo1.maven.apache.org/maven2</url>
117+
<url>https://repo.maven.apache.org/maven2</url>
52118
<snapshots>
53119
<enabled>false</enabled>
54120
</snapshots>
55121
</pluginRepository>
56-
</pluginRepositories>
122+
</pluginRepositories>
57123
</profile>
58124
<profile>
59125
<id>stagingrelease</id>
@@ -69,7 +135,7 @@
69135
<repository>
70136
<id>maven-central</id>
71137
<name>Maven Central</name>
72-
<url>https://repo1.maven.apache.org/maven2</url>
138+
<url>https://repo.maven.apache.org/maven2</url>
73139
<snapshots>
74140
<enabled>false</enabled>
75141
</snapshots>
@@ -87,7 +153,7 @@
87153
<pluginRepository>
88154
<id>maven-central</id>
89155
<name>Maven Central</name>
90-
<url>https://repo1.maven.apache.org/maven2</url>
156+
<url>https://repo.maven.apache.org/maven2</url>
91157
<snapshots>
92158
<enabled>false</enabled>
93159
</snapshots>

‎.github/workflows/ci-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# build
2727
- name: Build
2828
run: |
29-
mvn -U -B clean package
29+
mvn -U -B -s .github/settings.xml clean package
3030
# clean m2 cache
3131
- name: Clean cache
3232
run: |

‎.settings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<repository>
4040
<id>maven-central</id>
4141
<name>Maven Central</name>
42-
<url>https://repo1.maven.apache.org/maven2</url>
42+
<url>https://repo.maven.apache.org/maven2</url>
4343
<snapshots>
4444
<enabled>false</enabled>
4545
</snapshots>
@@ -65,7 +65,7 @@
6565
<pluginRepository>
6666
<id>maven-central</id>
6767
<name>Maven Central</name>
68-
<url>https://repo1.maven.apache.org/maven2</url>
68+
<url>https://repo.maven.apache.org/maven2</url>
6969
<snapshots>
7070
<enabled>false</enabled>
7171
</snapshots>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@
443443
<repository>
444444
<id>maven-central</id>
445445
<name>Maven Central</name>
446-
<url>https://repo1.maven.apache.org/maven2</url>
446+
<url>https://repo.maven.apache.org/maven2</url>
447447
<snapshots>
448448
<enabled>false</enabled>
449449
</snapshots>
@@ -469,7 +469,7 @@
469469
<pluginRepository>
470470
<id>maven-central</id>
471471
<name>Maven Central</name>
472-
<url>https://repo1.maven.apache.org/maven2</url>
472+
<url>https://repo.maven.apache.org/maven2</url>
473473
<snapshots>
474474
<enabled>false</enabled>
475475
</snapshots>

‎spring-cloud-dataflow-dependencies/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<repository>
167167
<id>maven-central</id>
168168
<name>Maven Central</name>
169-
<url>https://repo1.maven.apache.org/maven2</url>
169+
<url>https://repo.maven.apache.org/maven2</url>
170170
<snapshots>
171171
<enabled>false</enabled>
172172
</snapshots>
@@ -192,7 +192,7 @@
192192
<pluginRepository>
193193
<id>maven-central</id>
194194
<name>Maven Central</name>
195-
<url>https://repo1.maven.apache.org/maven2</url>
195+
<url>https://repo.maven.apache.org/maven2</url>
196196
<snapshots>
197197
<enabled>false</enabled>
198198
</snapshots>

‎spring-cloud-dataflow-server/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
<repository>
225225
<id>maven-central</id>
226226
<name>Maven Central</name>
227-
<url>https://repo1.maven.apache.org/maven2</url>
227+
<url>https://repo.maven.apache.org/maven2</url>
228228
<snapshots>
229229
<enabled>false</enabled>
230230
</snapshots>
@@ -250,7 +250,7 @@
250250
<pluginRepository>
251251
<id>maven-central</id>
252252
<name>Maven Central</name>
253-
<url>https://repo1.maven.apache.org/maven2</url>
253+
<url>https://repo.maven.apache.org/maven2</url>
254254
<snapshots>
255255
<enabled>false</enabled>
256256
</snapshots>

‎src/local/download-apps.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function download_deps() {
2424
URL="https://repo.spring.io/libs-milestone"
2525
else
2626
INC_VER=false
27-
URL="https://repo1.maven.apache.org/maven2"
27+
URL="https://repo.maven.apache.org/maven2"
2828
fi
2929

3030
GROUP_ID=$(echo "$DEP" | awk -F":" '{split($0,a); print a[1]}')

0 commit comments

Comments
 (0)