Skip to content

Commit 80ee963

Browse files
philwebbphilwebb
committed
Merge branch '1.1.x'
2 parents df9200d + ccda6f6 commit 80ee963

File tree

2 files changed

+103
-14
lines changed

2 files changed

+103
-14
lines changed

‎.settings-template.xml‎

Lines changed: 78 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,83 @@
11
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
4-
http://maven.apache.org/xsd/settings-1.0.0.xsd">
3+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
4+
<profiles>
5+
<profile>
6+
<id>snapshot</id>
7+
<repositories>
8+
<repository>
9+
<id>spring-ext</id>
10+
<url>http://repo.spring.io/ext-release-local/</url>
11+
<releases>
12+
<enabled>true</enabled>
13+
</releases>
14+
<snapshots>
15+
<enabled>false</enabled>
16+
</snapshots>
17+
</repository>
18+
<repository>
19+
<id>jboss</id>
20+
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
21+
<releases>
22+
<enabled>true</enabled>
23+
</releases>
24+
<snapshots>
25+
<enabled>false</enabled>
26+
</snapshots>
27+
</repository>
28+
</repositories>
29+
</profile>
30+
<profile>
31+
<id>milestone</id>
32+
<repositories>
33+
<repository>
34+
<id>spring-ext</id>
35+
<url>http://repo.spring.io/ext-release-local/</url>
36+
<releases>
37+
<enabled>true</enabled>
38+
</releases>
39+
<snapshots>
40+
<enabled>false</enabled>
41+
</snapshots>
42+
</repository>
43+
<repository>
44+
<id>jboss</id>
45+
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
46+
<releases>
47+
<enabled>true</enabled>
48+
</releases>
49+
<snapshots>
50+
<enabled>false</enabled>
51+
</snapshots>
52+
</repository>
53+
</repositories>
54+
</profile>
55+
<profile>
56+
<id>release</id>
57+
<repositories>
58+
<repository>
59+
<id>spring-ext</id>
60+
<url>http://repo.spring.io/ext-release-local/</url>
61+
<releases>
62+
<enabled>true</enabled>
63+
</releases>
64+
<snapshots>
65+
<enabled>false</enabled>
66+
</snapshots>
67+
</repository>
68+
<repository>
69+
<id>jboss</id>
70+
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
71+
<releases>
72+
<enabled>true</enabled>
73+
</releases>
74+
<snapshots>
75+
<enabled>false</enabled>
76+
</snapshots>
77+
</repository>
78+
</repositories>
79+
</profile>
80+
</profiles>
581
<activeProfiles>
682
<activeProfile>@profile@</activeProfile>
783
</activeProfiles>

‎spring-boot-parent/pom.xml‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -220,18 +220,6 @@
220220
</exclusions>
221221
</dependency>
222222
</dependencies>
223-
<repositories>
224-
<repository>
225-
<id>spring-ext</id>
226-
<url>http://repo.spring.io/ext-release-local/</url>
227-
<releases>
228-
<enabled>true</enabled>
229-
</releases>
230-
<snapshots>
231-
<enabled>false</enabled>
232-
</snapshots>
233-
</repository>
234-
</repositories>
235223
<build>
236224
<pluginManagement>
237225
<plugins>
@@ -469,6 +457,16 @@
469457
<activeByDefault>true</activeByDefault>
470458
</activation>
471459
<repositories>
460+
<repository>
461+
<id>spring-ext</id>
462+
<url>http://repo.spring.io/ext-release-local/</url>
463+
<releases>
464+
<enabled>true</enabled>
465+
</releases>
466+
<snapshots>
467+
<enabled>false</enabled>
468+
</snapshots>
469+
</repository>
472470
<repository>
473471
<id>spring-milestones</id>
474472
<name>Spring Milestones</name>
@@ -505,6 +503,21 @@
505503
</pluginRepository>
506504
</pluginRepositories>
507505
</profile>
506+
<profile>
507+
<id>prepare</id>
508+
<repositories>
509+
<repository>
510+
<id>spring-ext</id>
511+
<url>http://repo.spring.io/ext-release-local/</url>
512+
<releases>
513+
<enabled>true</enabled>
514+
</releases>
515+
<snapshots>
516+
<enabled>false</enabled>
517+
</snapshots>
518+
</repository>
519+
</repositories>
520+
</profile>
508521
<profile>
509522
<id>full</id>
510523
<build>

0 commit comments

Comments
 (0)