Skip to content

Commit 32924c4

Browse files
committed
Revert "Merge maven-ci-settings.xml and maven-cd-settings in a single maven-settings.xml"
This reverts commit ff39855.
1 parent ff39855 commit 32924c4

4 files changed

Lines changed: 70 additions & 3 deletions

File tree

.github/maven-ci-settings.xml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<!--
2+
~ Copyright (c) 2021 Red Hat, Inc.
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
-->
16+
17+
<settings>
18+
19+
<interactiveMode>false</interactiveMode>
20+
21+
<profiles>
22+
<profile>
23+
<id>google-mirror</id>
24+
<activation>
25+
<activeByDefault>true</activeByDefault>
26+
</activation>
27+
<repositories>
28+
<repository>
29+
<id>google-maven-central</id>
30+
<name>GCS Maven Central mirror EU</name>
31+
<url>https://maven-central.storage-download.googleapis.com/maven2/</url>
32+
<releases>
33+
<enabled>true</enabled>
34+
</releases>
35+
<snapshots>
36+
<enabled>false</enabled>
37+
</snapshots>
38+
</repository>
39+
</repositories>
40+
<pluginRepositories>
41+
<pluginRepository>
42+
<id>google-maven-central</id>
43+
<name>GCS Maven Central mirror</name>
44+
<url>https://maven-central.storage-download.googleapis.com/maven2/</url>
45+
<releases>
46+
<enabled>true</enabled>
47+
</releases>
48+
<snapshots>
49+
<enabled>false</enabled>
50+
</snapshots>
51+
</pluginRepository>
52+
</pluginRepositories>
53+
</profile>
54+
55+
<profile>
56+
<id>network-retry-config</id>
57+
<activation>
58+
<activeByDefault>true</activeByDefault>
59+
</activation>
60+
<properties>
61+
<aether.connector.http.retryHandler.serviceUnavailable>403,429,503</aether.connector.http.retryHandler.serviceUnavailable>
62+
<aether.connector.http.retryHandler.count>5</aether.connector.http.retryHandler.count>
63+
<aether.connector.http.retryHandler.interval>3000</aether.connector.http.retryHandler.interval>
64+
</properties>
65+
</profile>
66+
</profiles>
67+
</settings>

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
distribution: temurin
3939
- name: Run tests
4040
if: ${{ runner.os != 'Linux' || inputs.container != '' }}
41-
run: mvn -s .github/maven-settings.xml -q clean verify -B -Pcheckstyle ${{ inputs.profile }}
41+
run: mvn -s .github/maven-ci-settings.xml -q clean verify -B -Pcheckstyle ${{ inputs.profile }}
4242
- name: Run tests
4343
if: ${{ runner.os == 'Linux' && inputs.container == '' }}
4444
run: |
4545
# io_uring testing requires more locked memory for kernel ring buffers than the default 8MB limit
4646
sudo prlimit --pid $$ --memlock=16777216:16777216
47-
mvn -s .github/maven-settings.xml -q clean verify -B -Pcheckstyle ${{ inputs.profile }}
47+
mvn -s .github/maven-ci-settings.xml -q clean verify -B -Pcheckstyle ${{ inputs.profile }}

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ jobs:
3131
run: echo "PROJECT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:evaluate -Dexpression=project.version -q -DforceStdout | grep -v '\[')" >> $GITHUB_ENV
3232
- name: Maven deploy
3333
if: ${{ endsWith(env.PROJECT_VERSION, '-SNAPSHOT') }}
34-
run: mvn deploy -s .github/maven-settings.xml -DskipTests -B -Ptoolchain,Java21
34+
run: mvn deploy -s .github/maven-cd-settings.xml -DskipTests -B -Ptoolchain,Java21

0 commit comments

Comments
 (0)