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

Commit ef38b09

Browse files
onobconobc
authored
Switch Maven repos off of libs-* variants (#5331)
See #5325
1 parent 83b530d commit ef38b09

File tree

18 files changed

+49
-40
lines changed

18 files changed

+49
-40
lines changed

‎.settings.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,20 @@
3131
<repository>
3232
<id>spring-snapshots</id>
3333
<name>Spring Snapshots</name>
34-
<url>https://repo.spring.io/libs-snapshot</url>
34+
<url>https://repo.spring.io/snapshot</url>
3535
<snapshots>
3636
<enabled>true</enabled>
3737
</snapshots>
3838
</repository>
3939
<repository>
4040
<id>spring-milestones</id>
4141
<name>Spring Milestones</name>
42-
<url>https://repo.spring.io/libs-milestone</url>
42+
<url>https://repo.spring.io/milestone</url>
4343
<snapshots>
4444
<enabled>false</enabled>
4545
</snapshots>
4646
</repository>
47+
<!-- Required for io.spring.docresources:spring-doc-resources:zip:0.2.5 -->
4748
<repository>
4849
<id>spring-releases</id>
4950
<name>Spring Releases</name>
@@ -65,15 +66,15 @@
6566
<pluginRepository>
6667
<id>spring-snapshots</id>
6768
<name>Spring Snapshots</name>
68-
<url>https://repo.spring.io/libs-snapshot</url>
69+
<url>https://repo.spring.io/snapshot</url>
6970
<snapshots>
7071
<enabled>true</enabled>
7172
</snapshots>
7273
</pluginRepository>
7374
<pluginRepository>
7475
<id>spring-milestones</id>
7576
<name>Spring Milestones</name>
76-
<url>https://repo.spring.io/libs-milestone</url>
77+
<url>https://repo.spring.io/milestone</url>
7778
<snapshots>
7879
<enabled>false</enabled>
7980
</snapshots>

‎pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,19 +434,20 @@
434434
<repository>
435435
<id>spring-snapshots</id>
436436
<name>Spring Snapshots</name>
437-
<url>https://repo.spring.io/libs-snapshot</url>
437+
<url>https://repo.spring.io/snapshot</url>
438438
<snapshots>
439439
<enabled>true</enabled>
440440
</snapshots>
441441
</repository>
442442
<repository>
443443
<id>spring-milestones</id>
444444
<name>Spring Milestones</name>
445-
<url>https://repo.spring.io/libs-milestone</url>
445+
<url>https://repo.spring.io/milestone</url>
446446
<snapshots>
447447
<enabled>false</enabled>
448448
</snapshots>
449449
</repository>
450+
<!-- Required for io.spring.docresources:spring-doc-resources:zip:0.2.5 -->
450451
<repository>
451452
<id>spring-releases</id>
452453
<name>Spring Releases</name>
@@ -468,15 +469,15 @@
468469
<pluginRepository>
469470
<id>spring-snapshots</id>
470471
<name>Spring Snapshots</name>
471-
<url>https://repo.spring.io/libs-snapshot</url>
472+
<url>https://repo.spring.io/snapshot</url>
472473
<snapshots>
473474
<enabled>true</enabled>
474475
</snapshots>
475476
</pluginRepository>
476477
<pluginRepository>
477478
<id>spring-milestones</id>
478479
<name>Spring Milestones</name>
479-
<url>https://repo.spring.io/libs-milestone</url>
480+
<url>https://repo.spring.io/milestone</url>
480481
<snapshots>
481482
<enabled>false</enabled>
482483
</snapshots>

‎spring-cloud-dataflow-classic-docs/src/test/resources/rest-docs-config.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ spring:
2020
org.springframework.cloud.dataflow.shell.autoconfigure.BaseShellAutoConfiguration,
2121
org.springframework.cloud.dataflow.server.config.cloudfoundry.CloudFoundryTaskPlatformAutoConfiguration,
2222
org.springframework.cloud.dataflow.server.config.kubernetes.KubernetesTaskPlatformAutoConfiguration
23+
2324
maven:
2425
remoteRepositories:
26+
mavenCentral:
27+
url: https://repo.maven.apache.org/maven2
2528
springRepo:
26-
url: https://repo.spring.io/libs-snapshot
29+
url: https://repo.spring.io/snapshot

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<snapshotRepository>
141141
<id>repo.spring.io</id>
142142
<name>Spring Snapshot Repository</name>
143-
<url>https://repo.spring.io/libs-snapshot</url>
143+
<url>https://repo.spring.io/libs-snapshot-local</url>
144144
</snapshotRepository>
145145
</distributionManagement>
146146
<profiles>
@@ -158,15 +158,15 @@
158158
<repository>
159159
<id>spring-snapshots</id>
160160
<name>Spring Snapshots</name>
161-
<url>https://repo.spring.io/libs-snapshot</url>
161+
<url>https://repo.spring.io/snapshot</url>
162162
<snapshots>
163163
<enabled>true</enabled>
164164
</snapshots>
165165
</repository>
166166
<repository>
167167
<id>spring-milestones</id>
168168
<name>Spring Milestones</name>
169-
<url>https://repo.spring.io/libs-milestone</url>
169+
<url>https://repo.spring.io/milestone</url>
170170
<snapshots>
171171
<enabled>false</enabled>
172172
</snapshots>
@@ -184,15 +184,15 @@
184184
<pluginRepository>
185185
<id>spring-snapshots</id>
186186
<name>Spring Snapshots</name>
187-
<url>https://repo.spring.io/libs-snapshot</url>
187+
<url>https://repo.spring.io/snapshot</url>
188188
<snapshots>
189189
<enabled>true</enabled>
190190
</snapshots>
191191
</pluginRepository>
192192
<pluginRepository>
193193
<id>spring-milestones</id>
194194
<name>Spring Milestones</name>
195-
<url>https://repo.spring.io/libs-milestone</url>
195+
<url>https://repo.spring.io/milestone</url>
196196
<snapshots>
197197
<enabled>false</enabled>
198198
</snapshots>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<description>Spring Cloud Data Flow Docs</description>
1212
<properties>
1313
<main.basedir>${basedir}/..</main.basedir>
14-
<docs.resources.version>0.2.1.RELEASE</docs.resources.version>
14+
<docs.resources.version>0.2.5</docs.resources.version>
1515
</properties>
1616
<dependencies>
1717
<dependency>

‎spring-cloud-dataflow-docs/src/main/asciidoc/appendix-howto.adoc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ We are also more than happy to extend this section. If you want to add a "`how-t
1414
You can set the Maven properties, such as the local Maven repository location, remote Maven repositories, authentication credentials, and proxy server properties through command-line properties when you start the Data Flow server.
1515
Alternatively, you can set the properties by setting the `SPRING_APPLICATION_JSON` environment property for the Data Flow server.
1616

17-
The remote Maven repositories need to be configured explicitly if the applications are resolved by using the Maven repository, except for a `local` Data Flow server.
18-
The other Data Flow server implementations (which use Maven resources for application artifacts resolution) have no default value for remote repositories.
19-
The `local` server has `https://repo.spring.io/libs-snapshot` as the default remote repository.
17+
The remote Maven repositories need to be configured explicitly if the applications are resolved by using the Maven repository.
18+
The one exception to this rule is for the `local` Data Flow server installation, which already has the `https://repo.maven.apache.org/maven2` and `https://repo.spring.io/snapshot` remote repositories pre-configured.
19+
The other (`non-local`) server installations have no default value for remote repositories.
20+
21+
NOTE: If you configure your own remote repositories, be sure to add Maven central (`https://repo.maven.apache.org/maven2`) as it is not automatically added for you.
2022

2123
To pass the properties as command-line options, run the server with a command similar to the following:
2224

@@ -93,4 +95,4 @@ include::appendix-local-k8s-development.adoc[]
9395
In this section, we review the frequently asked questions for Spring Cloud Data Flow.
9496
See the https://dataflow.spring.io/docs/resources/faq/[Frequently Asked Questions] section of the microsite for more information.
9597

96-
// TODO move the FAG to reference guide.
98+
// TODO move the FAG to reference guide.

‎spring-cloud-dataflow-docs/src/main/asciidoc/configuration-cloudfoundry.adoc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,8 @@ applications:
788788
path: {PATH TO SERVER UBER-JAR}
789789
env:
790790
SPRING_APPLICATION_NAME: data-flow-server
791-
MAVEN_REMOTE_REPOSITORIES_REPO1_URL: https://repo.spring.io/libs-snapshot
791+
MAVEN_REMOTE_REPOSITORIES_CENTRAL_URL: https://repo.maven.apache.org/maven2
792+
MAVEN_REMOTE_REPOSITORIES_REPO1_URL: https://repo.spring.io/snapshot
792793
SPRING_CLOUD_DATAFLOW_TASK_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[default]_CONNECTION_URL: https://api.sys.huron.cf-app.com
793794
SPRING_CLOUD_DATAFLOW_TASK_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[default]_CONNECTION_ORG: sabby20
794795
SPRING_CLOUD_DATAFLOW_TASK_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[default]_CONNECTION_SPACE: sabby20
@@ -863,7 +864,8 @@ applications:
863864
path: spring-cloud-dataflow-server-VERSION.jar
864865
env:
865866
SPRING_APPLICATION_NAME: test-server
866-
MAVEN_REMOTE_REPOSITORIES_REPO1_URL: https://repo.spring.io/libs-snapshot
867+
MAVEN_REMOTE_REPOSITORIES_CENTRAL_URL: https://repo.maven.apache.org/maven2
868+
MAVEN_REMOTE_REPOSITORIES_REPO1_URL: https://repo.spring.io/snapshot
867869
SPRING_CLOUD_DATAFLOW_TASK_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[default]_CONNECTION_URL: https://api.sys.huron.cf-app.com
868870
SPRING_CLOUD_DATAFLOW_TASK_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[default]_CONNECTION_ORG: sabby20
869871
SPRING_CLOUD_DATAFLOW_TASK_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[default]_CONNECTION_SPACE: sabby20

‎spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes-app-properties.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ You can use a `SPRING_APPLICATION_JSON` environment variable to set Data Flow se
279279
----
280280
env:
281281
- name: SPRING_APPLICATION_JSON
282-
value: "{ \"maven\": { \"local-repository\": null, \"remote-repositories\": { \"repo1\": { \"url\": \"https://repo.spring.io/libs-snapshot\"} } } }"
282+
value: "{ \"maven\": { \"local-repository\": null, \"remote-repositories\": { \"central\": { \"url\": \"https://repo.maven.apache.org/maven2\" }, \"repo1\": { \"url\": \"https://repo.spring.io/snapshot\" } } } }"
283283
----
284284
====
285285

‎spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/AboutController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,8 @@ private String constructUrl(String url, String version) {
299299
}
300300

301301
private String repoSelector(String version) {
302-
final String REPO_SNAPSHOT_ROOT = "https://repo.spring.io/libs-snapshot";
303-
final String REPO_MILESTONE_ROOT = "https://repo.spring.io/libs-milestone";
302+
final String REPO_SNAPSHOT_ROOT = "https://repo.spring.io/snapshot";
303+
final String REPO_MILESTONE_ROOT = "https://repo.spring.io/milestone";
304304
final String REPO_RELEASE_ROOT = "https://repo.spring.io/release";
305305
final String MAVEN_ROOT = "https://repo.maven.apache.org/maven2";
306306

‎spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/configuration/TestDependencies.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public AuditRecordService auditRecordService(AuditRecordRepository auditRecordRe
245245
public MavenProperties mavenProperties() {
246246
MavenProperties mavenProperties = new MavenProperties();
247247
mavenProperties.setRemoteRepositories(new HashMap<>(Collections.singletonMap("springRepo",
248-
new MavenProperties.RemoteRepository("https://repo.spring.io/libs-snapshot"))));
248+
new MavenProperties.RemoteRepository("https://repo.spring.io/snapshot"))));
249249
return mavenProperties;
250250
}
251251

0 commit comments

Comments
 (0)