Skip to content

Commit aa21e04

Browse files
authored
Remove missing dependencies from BOM (spring-attic#2140)
Removing `spring-cloud-gcp-trace` and `spring-cloud-gcp-config` from the BOM because they don't exist. Also, removing `spring-cloud-gcp-starter-config` because it's never published to Maven Central. Fixes: spring-attic#2138.
1 parent 13c976d commit aa21e04

File tree

6 files changed

+11
-34
lines changed

6 files changed

+11
-34
lines changed

README.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ This will allow you to not specify versions for any of the Maven dependencies an
5959
<dependency>
6060
<groupId>org.springframework.cloud</groupId>
6161
<artifactId>spring-cloud-gcp-dependencies</artifactId>
62-
<version>1.1.2.RELEASE</version>
62+
<version>1.2.1.RELEASE</version>
6363
<type>pom</type>
6464
<scope>import</scope>
6565
</dependency>

docs/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<dependency>
3737
<groupId>${project.groupId}</groupId>
3838
<artifactId>spring-cloud-gcp-starter-config</artifactId>
39+
<version>${project.version}</version>
3940
</dependency>
4041
<dependency>
4142
<groupId>${project.groupId}</groupId>

docs/src/main/asciidoc/config.adoc

+7-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ Spring Cloud GCP makes it possible to use the https://cloud.google.com/deploymen
55
The Spring Cloud GCP Config support is provided via its own Spring Boot starter.
66
It enables the use of the Google Runtime Configuration API as a source for Spring Boot configuration properties.
77

8-
NOTE: The Google Cloud Runtime Configuration service is in beta status.
8+
NOTE: The Google Cloud Runtime Configuration service is in *Beta* status, and is only available in snapshot and milestone versions of the project. It's also not available in the Spring Cloud GCP BOM, unlike other modules.
99

10-
Maven coordinates, using <<getting-started.adoc#_bill_of_materials, Spring Cloud GCP BOM>>:
10+
Maven coordinates:
1111

12-
[source,xml]
12+
[source,xml,subs="normal"]
1313
----
1414
<dependency>
1515
<groupId>org.springframework.cloud</groupId>
1616
<artifactId>spring-cloud-gcp-starter-config</artifactId>
17+
<version>{project-version}</version>
1718
</dependency>
1819
----
1920

@@ -22,7 +23,9 @@ Gradle coordinates:
2223
[source,subs="normal"]
2324
----
2425
dependencies {
25-
compile group: 'org.springframework.cloud', name: 'spring-cloud-gcp-starter-config'
26+
compile group: 'org.springframework.cloud',
27+
name: 'spring-cloud-gcp-starter-config',
28+
version: '{project-version}'
2629
}
2730
----
2831

docs/src/main/asciidoc/firestore.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Read documents are locked until the transaction finishes with a commit or a roll
202202
If an `Exception` is thrown within a transaction, the rollback operation is executed.
203203
Otherwise, the commit operation is executed.
204204

205-
===== Declarative Transactions with @Transactional Annotation
205+
==== Declarative Transactions with @Transactional Annotation
206206

207207
This feature requires a bean of `SpannerTransactionManager`, which is provided when using `spring-cloud-gcp-starter-data-firestore`.
208208

spring-cloud-gcp-dependencies/pom.xml

-15
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,11 @@
6363
<artifactId>spring-cloud-gcp-storage</artifactId>
6464
<version>${project.version}</version>
6565
</dependency>
66-
<dependency>
67-
<groupId>org.springframework.cloud</groupId>
68-
<artifactId>spring-cloud-gcp-trace</artifactId>
69-
<version>${project.version}</version>
70-
</dependency>
7166
<dependency>
7267
<groupId>org.springframework.cloud</groupId>
7368
<artifactId>spring-cloud-gcp-logging</artifactId>
7469
<version>${project.version}</version>
7570
</dependency>
76-
<dependency>
77-
<groupId>org.springframework.cloud</groupId>
78-
<artifactId>spring-cloud-gcp-config</artifactId>
79-
<version>${project.version}</version>
80-
</dependency>
8171
<dependency>
8272
<groupId>org.springframework.cloud</groupId>
8373
<artifactId>spring-cloud-gcp-pubsub-stream-binder</artifactId>
@@ -155,11 +145,6 @@
155145
<artifactId>spring-cloud-gcp-starter-sql-postgresql</artifactId>
156146
<version>${project.version}</version>
157147
</dependency>
158-
<dependency>
159-
<groupId>org.springframework.cloud</groupId>
160-
<artifactId>spring-cloud-gcp-starter-config</artifactId>
161-
<version>${project.version}</version>
162-
</dependency>
163148
<dependency>
164149
<groupId>org.springframework.cloud</groupId>
165150
<artifactId>spring-cloud-gcp-starter-trace</artifactId>

spring-cloud-gcp-samples/spring-cloud-gcp-config-sample/pom.xml

+1-13
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,6 @@
1515
<artifactId>spring-cloud-gcp-config-sample</artifactId>
1616
<name>Spring Cloud GCP Runtime Configuration Code Sample</name>
1717

18-
<!-- The Spring Cloud GCP BOM will manage spring-cloud-gcp version numbers for you. -->
19-
<dependencyManagement>
20-
<dependencies>
21-
<dependency>
22-
<groupId>org.springframework.cloud</groupId>
23-
<artifactId>spring-cloud-gcp-dependencies</artifactId>
24-
<version>${project.version}</version>
25-
<type>pom</type>
26-
<scope>import</scope>
27-
</dependency>
28-
</dependencies>
29-
</dependencyManagement>
30-
3118
<dependencies>
3219
<dependency>
3320
<groupId>org.springframework.boot</groupId>
@@ -38,6 +25,7 @@
3825
<dependency>
3926
<groupId>org.springframework.cloud</groupId>
4027
<artifactId>spring-cloud-gcp-starter-config</artifactId>
28+
<version>${project.version}</version>
4129
</dependency>
4230

4331
<!-- Optional dependency to enable configuration refresh runtime via /refresh endpoint -->

0 commit comments

Comments
 (0)