Skip to content

Commit 13c976d

Browse files
suztomomeltsufin
authored andcommitted
Use GCP Libraries BOM (spring-attic#2130)
1 parent 6ef72e2 commit 13c976d

File tree

3 files changed

+6
-20
lines changed

3 files changed

+6
-20
lines changed

spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/pubsub/GcpPubSubEmulatorAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class GcpPubSubEmulatorAutoConfiguration {
4646
public TransportChannelProvider transportChannelProvider(GcpPubSubProperties gcpPubSubProperties) {
4747
ManagedChannel channel = ManagedChannelBuilder
4848
.forTarget("dns:///" + gcpPubSubProperties.getEmulatorHost())
49-
.usePlaintext(true)
49+
.usePlaintext()
5050
.build();
5151
return FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel));
5252
}

spring-cloud-gcp-dependencies/pom.xml

+4-18
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
<packaging>pom</packaging>
1717

1818
<properties>
19-
<google-cloud-bom.version>0.119.0-alpha</google-cloud-bom.version>
20-
<google-auth-library-oauth2-http.version>0.18.0</google-auth-library-oauth2-http.version>
19+
<gcp-libraries-bom.version>3.4.0</gcp-libraries-bom.version>
2120
<cloud-sql-socket-factory.version>1.0.15</cloud-sql-socket-factory.version>
2221
<java-cfenv.version>1.1.1.RELEASE</java-cfenv.version>
2322
</properties>
@@ -200,28 +199,15 @@
200199
<version>${cloud-sql-socket-factory.version}</version>
201200
</dependency>
202201

203-
<!--google-cloud-java BOM-->
202+
<!--Google Cloud Platform Libraries BOM -->
204203
<dependency>
205204
<groupId>com.google.cloud</groupId>
206-
<artifactId>google-cloud-bom</artifactId>
207-
<version>${google-cloud-bom.version}</version>
205+
<artifactId>libraries-bom</artifactId>
206+
<version>${gcp-libraries-bom.version}</version>
208207
<type>pom</type>
209208
<scope>import</scope>
210209
</dependency>
211210

212-
<!-- spring-cloud-gcp-starter -->
213-
<dependency>
214-
<groupId>com.google.auth</groupId>
215-
<artifactId>google-auth-library-oauth2-http</artifactId>
216-
<version>${google-auth-library-oauth2-http.version}</version>
217-
<exclusions>
218-
<exclusion>
219-
<groupId>com.google.guava</groupId>
220-
<artifactId>guava</artifactId>
221-
</exclusion>
222-
</exclusions>
223-
</dependency>
224-
225211
<dependency>
226212
<groupId>io.pivotal.cfenv</groupId>
227213
<artifactId>java-cfenv</artifactId>

spring-cloud-gcp-pubsub-stream-binder/src/test/java/org/springframework/cloud/gcp/stream/binder/pubsub/PubSubTestBinder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public PubSubTestBinder(String host) {
5959
// Transport channel provider so that test binder talks to emulator.
6060
ManagedChannel channel = ManagedChannelBuilder
6161
.forTarget(host)
62-
.usePlaintext(true)
62+
.usePlaintext()
6363
.build();
6464
TransportChannelProvider transportChannelProvider =
6565
FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel));

0 commit comments

Comments
 (0)