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

Commit

Permalink
Changes for 2020-1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryanjbaxter
ryanjbaxter committed Apr 15, 2020
1 parent a19b1ab commit 6dfa161
Show file tree
Hide file tree
Showing 10 changed files with 1,198 additions and 103 deletions.
106 changes: 6 additions & 100 deletions docs/pom.xml
View file
Expand Up @@ -16,11 +16,11 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<properties>
<!-- Comma separated list of whitelisted branches -->
<docs.whitelisted.branches>1.0.x,Dalston,Edgware,Finchley,Greenwich</docs.whitelisted.branches>
<docs.whitelisted.branches>1.0.x,Dalston,Edgware,Finchley,Greenwich,Hoxton</docs.whitelisted.branches>
<main.basedir>${basedir}/..</main.basedir>
<docs.main>spring-cloud</docs.main>
<spring-cloud-release.version>Hoxton.BUILD-SNAPSHOT</spring-cloud-release.version>
<release-train-major>hoxton</release-train-major>
<spring-cloud-release.version>2020-1.BUILD-SNAPSHOT</spring-cloud-release.version>
<release-train-major>2020-1</release-train-major>
<spring-cloud-version>${spring-cloud-release.version}</spring-cloud-version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<configprops.path>${project.basedir}/src/main/asciidoc/_spring-cloud-${release-train-major}-configprops.adoc</configprops.path>
Expand Down Expand Up @@ -58,31 +58,6 @@
<artifactId>spring-cloud-config-server</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-aws</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-aws-jdbc</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-aws-messaging</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-aws-parameter-store-config</artifactId>
<scope>compile</scope>
</dependency>
<!--<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-aws-secrets-manager-config</artifactId>
<scope>compile</scope>
</dependency>-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-security</artifactId>
Expand Down Expand Up @@ -253,11 +228,6 @@
<artifactId>spring-cloud-function-adapter-azure</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-task</artifactId>
<scope>compile</scope>
</dependency>
<!-- for the post finchley dependencies check the profiles section -->
</dependencies>
<profiles>
Expand Down Expand Up @@ -311,51 +281,6 @@
<artifactId>spring-cloud-starter-kubernetes-all</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter-vision</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter-trace</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter-storage</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter-sql-postgresql</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter-sql-mysql</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter-security-iap</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter-pubsub</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter-logging</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-gcp-starter-data-spanner</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-circuitbreaker-reactor-resilience4j</artifactId>
Expand All @@ -381,17 +306,6 @@
</goals>
<configuration>
<resources>
<resource>
<directory>
${main.basedir}/gcp/src/main/asciidoc
</directory>
<includes>
<include>images/**</include>
</includes>
<excludes>
<exclude>*.sh</exclude>
</excludes>
</resource>
<resource>
<directory>
${main.basedir}/kubernetes/src/main/asciidoc
Expand Down Expand Up @@ -420,6 +334,9 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<configuration>
<!-- <useNativeGit>true</useNativeGit>-->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -437,17 +354,6 @@
</goals>
<configuration>
<resources>
<resource>
<directory>
${main.basedir}/aws/src/main/asciidoc
</directory>
<includes>
<include>images/**</include>
</includes>
<excludes>
<exclude>*.sh</exclude>
</excludes>
</resource>
<resource>
<directory>
${main.basedir}/bus/src/main/asciidoc
Expand Down
21 changes: 21 additions & 0 deletions docs/src/main/asciidoc/_spring-cloud-2020-1-attributes.adoc
View file
@@ -0,0 +1,21 @@
:spring-boot-version: 2.3.0.M4
:spring-cloud-build-version: 3.0.0.M1
:spring-cloud-commons-version: 3.0.0.M1
:spring-cloud-function-version: 3.1.0.M1
:spring-cloud-stream-version: 3.1.0.M1
:spring-cloud-bus-version: 3.0.0.M1
:spring-cloud-task-version: 2.2.3.RELEASE
:spring-cloud-config-version: 3.0.0.M1
:spring-cloud-netflix-version: 3.0.0.M1
:spring-cloud-cloudfoundry-version: 3.0.0.M1
:spring-cloud-kubernetes-version: 2.0.0.M1
:spring-cloud-openfeign-version: 3.0.0.M1
:spring-cloud-consul-version: 3.0.0.M1
:spring-cloud-gateway-version: 3.0.0.M1
:spring-cloud-security-version: 3.0.0.M1
:spring-cloud-sleuth-version: 3.0.0.M1
:spring-cloud-zookeeper-version: 3.0.0.M1
:spring-cloud-contract-version: 3.0.0.M1
:spring-cloud-vault-version: 3.0.0.M1
:spring-cloud-circuitbreaker-version: 2.0.0.M1
:spring-cloud-cli-version: 3.0.0.M1

0 comments on commit 6dfa161

Please sign in to comment.