Skip to content
This repository was archived by the owner on Apr 20, 2022. It is now read-only.

Commit 6dfa161

Browse files
author
Ryan Baxter
committed
Changes for 2020-1 release
1 parent a19b1ab commit 6dfa161

10 files changed

+1198
-103
lines changed

‎docs/pom.xml

+6-100
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
<version>1.0.0.BUILD-SNAPSHOT</version>
1717
<properties>
1818
<!-- Comma separated list of whitelisted branches -->
19-
<docs.whitelisted.branches>1.0.x,Dalston,Edgware,Finchley,Greenwich</docs.whitelisted.branches>
19+
<docs.whitelisted.branches>1.0.x,Dalston,Edgware,Finchley,Greenwich,Hoxton</docs.whitelisted.branches>
2020
<main.basedir>${basedir}/..</main.basedir>
2121
<docs.main>spring-cloud</docs.main>
22-
<spring-cloud-release.version>Hoxton.BUILD-SNAPSHOT</spring-cloud-release.version>
23-
<release-train-major>hoxton</release-train-major>
22+
<spring-cloud-release.version>2020-1.BUILD-SNAPSHOT</spring-cloud-release.version>
23+
<release-train-major>2020-1</release-train-major>
2424
<spring-cloud-version>${spring-cloud-release.version}</spring-cloud-version>
2525
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
2626
<configprops.path>${project.basedir}/src/main/asciidoc/_spring-cloud-${release-train-major}-configprops.adoc</configprops.path>
@@ -58,31 +58,6 @@
5858
<artifactId>spring-cloud-config-server</artifactId>
5959
<scope>compile</scope>
6060
</dependency>
61-
<dependency>
62-
<groupId>org.springframework.cloud</groupId>
63-
<artifactId>spring-cloud-starter-aws</artifactId>
64-
<scope>compile</scope>
65-
</dependency>
66-
<dependency>
67-
<groupId>org.springframework.cloud</groupId>
68-
<artifactId>spring-cloud-starter-aws-jdbc</artifactId>
69-
<scope>compile</scope>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.springframework.cloud</groupId>
73-
<artifactId>spring-cloud-starter-aws-messaging</artifactId>
74-
<scope>compile</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.springframework.cloud</groupId>
78-
<artifactId>spring-cloud-starter-aws-parameter-store-config</artifactId>
79-
<scope>compile</scope>
80-
</dependency>
81-
<!--<dependency>
82-
<groupId>org.springframework.cloud</groupId>
83-
<artifactId>spring-cloud-starter-aws-secrets-manager-config</artifactId>
84-
<scope>compile</scope>
85-
</dependency>-->
8661
<dependency>
8762
<groupId>org.springframework.cloud</groupId>
8863
<artifactId>spring-cloud-starter-security</artifactId>
@@ -253,11 +228,6 @@
253228
<artifactId>spring-cloud-function-adapter-azure</artifactId>
254229
<scope>compile</scope>
255230
</dependency>
256-
<dependency>
257-
<groupId>org.springframework.cloud</groupId>
258-
<artifactId>spring-cloud-function-task</artifactId>
259-
<scope>compile</scope>
260-
</dependency>
261231
<!-- for the post finchley dependencies check the profiles section -->
262232
</dependencies>
263233
<profiles>
@@ -311,51 +281,6 @@
311281
<artifactId>spring-cloud-starter-kubernetes-all</artifactId>
312282
<scope>compile</scope>
313283
</dependency>
314-
<dependency>
315-
<groupId>org.springframework.cloud</groupId>
316-
<artifactId>spring-cloud-gcp-starter-vision</artifactId>
317-
<scope>compile</scope>
318-
</dependency>
319-
<dependency>
320-
<groupId>org.springframework.cloud</groupId>
321-
<artifactId>spring-cloud-gcp-starter-trace</artifactId>
322-
<scope>compile</scope>
323-
</dependency>
324-
<dependency>
325-
<groupId>org.springframework.cloud</groupId>
326-
<artifactId>spring-cloud-gcp-starter-storage</artifactId>
327-
<scope>compile</scope>
328-
</dependency>
329-
<dependency>
330-
<groupId>org.springframework.cloud</groupId>
331-
<artifactId>spring-cloud-gcp-starter-sql-postgresql</artifactId>
332-
<scope>compile</scope>
333-
</dependency>
334-
<dependency>
335-
<groupId>org.springframework.cloud</groupId>
336-
<artifactId>spring-cloud-gcp-starter-sql-mysql</artifactId>
337-
<scope>compile</scope>
338-
</dependency>
339-
<dependency>
340-
<groupId>org.springframework.cloud</groupId>
341-
<artifactId>spring-cloud-gcp-starter-security-iap</artifactId>
342-
<scope>compile</scope>
343-
</dependency>
344-
<dependency>
345-
<groupId>org.springframework.cloud</groupId>
346-
<artifactId>spring-cloud-gcp-starter-pubsub</artifactId>
347-
<scope>compile</scope>
348-
</dependency>
349-
<dependency>
350-
<groupId>org.springframework.cloud</groupId>
351-
<artifactId>spring-cloud-gcp-starter-logging</artifactId>
352-
<scope>compile</scope>
353-
</dependency>
354-
<dependency>
355-
<groupId>org.springframework.cloud</groupId>
356-
<artifactId>spring-cloud-gcp-starter-data-spanner</artifactId>
357-
<scope>compile</scope>
358-
</dependency>
359284
<dependency>
360285
<groupId>org.springframework.cloud</groupId>
361286
<artifactId>spring-cloud-starter-circuitbreaker-reactor-resilience4j</artifactId>
@@ -381,17 +306,6 @@
381306
</goals>
382307
<configuration>
383308
<resources>
384-
<resource>
385-
<directory>
386-
${main.basedir}/gcp/src/main/asciidoc
387-
</directory>
388-
<includes>
389-
<include>images/**</include>
390-
</includes>
391-
<excludes>
392-
<exclude>*.sh</exclude>
393-
</excludes>
394-
</resource>
395309
<resource>
396310
<directory>
397311
${main.basedir}/kubernetes/src/main/asciidoc
@@ -420,6 +334,9 @@
420334
<plugin>
421335
<groupId>pl.project13.maven</groupId>
422336
<artifactId>git-commit-id-plugin</artifactId>
337+
<configuration>
338+
<!-- <useNativeGit>true</useNativeGit>-->
339+
</configuration>
423340
</plugin>
424341
<plugin>
425342
<groupId>org.apache.maven.plugins</groupId>
@@ -437,17 +354,6 @@
437354
</goals>
438355
<configuration>
439356
<resources>
440-
<resource>
441-
<directory>
442-
${main.basedir}/aws/src/main/asciidoc
443-
</directory>
444-
<includes>
445-
<include>images/**</include>
446-
</includes>
447-
<excludes>
448-
<exclude>*.sh</exclude>
449-
</excludes>
450-
</resource>
451357
<resource>
452358
<directory>
453359
${main.basedir}/bus/src/main/asciidoc

‎docs/src/main/asciidoc/_spring-cloud-2020-1-attributes.adoc

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
:spring-boot-version: 2.3.0.M4
2+
:spring-cloud-build-version: 3.0.0.M1
3+
:spring-cloud-commons-version: 3.0.0.M1
4+
:spring-cloud-function-version: 3.1.0.M1
5+
:spring-cloud-stream-version: 3.1.0.M1
6+
:spring-cloud-bus-version: 3.0.0.M1
7+
:spring-cloud-task-version: 2.2.3.RELEASE
8+
:spring-cloud-config-version: 3.0.0.M1
9+
:spring-cloud-netflix-version: 3.0.0.M1
10+
:spring-cloud-cloudfoundry-version: 3.0.0.M1
11+
:spring-cloud-kubernetes-version: 2.0.0.M1
12+
:spring-cloud-openfeign-version: 3.0.0.M1
13+
:spring-cloud-consul-version: 3.0.0.M1
14+
:spring-cloud-gateway-version: 3.0.0.M1
15+
:spring-cloud-security-version: 3.0.0.M1
16+
:spring-cloud-sleuth-version: 3.0.0.M1
17+
:spring-cloud-zookeeper-version: 3.0.0.M1
18+
:spring-cloud-contract-version: 3.0.0.M1
19+
:spring-cloud-vault-version: 3.0.0.M1
20+
:spring-cloud-circuitbreaker-version: 2.0.0.M1
21+
:spring-cloud-cli-version: 3.0.0.M1

0 commit comments

Comments
 (0)