From 28d338544374cd6ef994a4cec451737b94102e12 Mon Sep 17 00:00:00 2001 From: Arvind Mohabir Date: Thu, 21 Dec 2017 16:28:04 +0100 Subject: [PATCH 1/2] Added latest google-cloud-java BOM file and updated POM files accordingly --- guice/annotation/pom.xml | 1 - guice/core/pom.xml | 1 - guice/google-auth/pom.xml | 2 -- guice/grpc-sink/pom.xml | 1 - guice/v1/pom.xml | 1 - pom.xml | 23 ++++++++----- samples/guice-scheduled-grpc/pom.xml | 1 - samples/guice-servlet-grpc/pom.xml | 1 - sdk/core-testing/pom.xml | 2 -- sdk/core/pom.xml | 4 --- sdk/implementation/pom.xml | 3 -- sdk/java-timestamp/pom.xml | 1 - sdk/joda-timestamp/pom.xml | 2 -- sdk/service/pom.xml | 1 - services/appengine-standard-service/pom.xml | 5 ++- services/trace-grpc-api-service/pom.xml | 1 - sinks/v1/grpc-consumer/pom.xml | 2 -- .../trace/grpc/v1/GrpcTraceConsumer.java | 34 +++++++++---------- sinks/v1/http-consumer/pom.xml | 5 --- sinks/v1/sink/pom.xml | 5 --- 20 files changed, 33 insertions(+), 63 deletions(-) diff --git a/guice/annotation/pom.xml b/guice/annotation/pom.xml index 748e104..81605c3 100644 --- a/guice/annotation/pom.xml +++ b/guice/annotation/pom.xml @@ -35,7 +35,6 @@ com.google.guava guava - 19.0 com.google.inject diff --git a/guice/core/pom.xml b/guice/core/pom.xml index 303378a..14885a4 100644 --- a/guice/core/pom.xml +++ b/guice/core/pom.xml @@ -35,7 +35,6 @@ com.google.code.findbugs jsr305 - 3.0.1 provided diff --git a/guice/google-auth/pom.xml b/guice/google-auth/pom.xml index b803f63..7d0e451 100644 --- a/guice/google-auth/pom.xml +++ b/guice/google-auth/pom.xml @@ -25,12 +25,10 @@ com.google.auth google-auth-library-credentials - ${google-auth-library-credentials.version} com.google.auth google-auth-library-oauth2-http - ${google-auth-library-oauth2-http.version} diff --git a/guice/grpc-sink/pom.xml b/guice/grpc-sink/pom.xml index f0922b8..5da5474 100644 --- a/guice/grpc-sink/pom.xml +++ b/guice/grpc-sink/pom.xml @@ -35,7 +35,6 @@ com.google.auth google-auth-library-credentials - ${google-auth-library-credentials.version} com.google.inject diff --git a/guice/v1/pom.xml b/guice/v1/pom.xml index b9491c5..6ee2b00 100644 --- a/guice/v1/pom.xml +++ b/guice/v1/pom.xml @@ -30,7 +30,6 @@ com.google.cloud google-cloud-trace - ${google-cloud-trace.version} com.google.inject diff --git a/pom.xml b/pom.xml index 3dad48d..a18f151 100644 --- a/pom.xml +++ b/pom.xml @@ -31,10 +31,6 @@ UTF-8 - 1.6.1 - 0.24.0-alpha - 0.8.0 - 0.8.0 @@ -67,13 +63,22 @@ com.google.cloud - google-cloud-trace - ${google-cloud-trace.version} + google-cloud-bom + 0.32.0-alpha + pom + import - io.grpc - grpc-context - ${grpc.version} + com.google.truth + truth + 0.29 + test + + + org.mockito + mockito-core + 2.2.6 + test diff --git a/samples/guice-scheduled-grpc/pom.xml b/samples/guice-scheduled-grpc/pom.xml index 508d807..07bc346 100644 --- a/samples/guice-scheduled-grpc/pom.xml +++ b/samples/guice-scheduled-grpc/pom.xml @@ -20,7 +20,6 @@ com.google.guava guava - 19.0 diff --git a/samples/guice-servlet-grpc/pom.xml b/samples/guice-servlet-grpc/pom.xml index 255dc68..4025d13 100644 --- a/samples/guice-servlet-grpc/pom.xml +++ b/samples/guice-servlet-grpc/pom.xml @@ -20,7 +20,6 @@ com.google.guava guava - 19.0 diff --git a/sdk/core-testing/pom.xml b/sdk/core-testing/pom.xml index ab2daf7..156c1fb 100644 --- a/sdk/core-testing/pom.xml +++ b/sdk/core-testing/pom.xml @@ -25,13 +25,11 @@ com.google.truth truth - 0.29 test org.mockito mockito-core - 2.2.6 test diff --git a/sdk/core/pom.xml b/sdk/core/pom.xml index 9717ee4..b3b6e4d 100644 --- a/sdk/core/pom.xml +++ b/sdk/core/pom.xml @@ -20,24 +20,20 @@ com.google.guava guava - 19.0 com.google.code.findbugs jsr305 - 3.0.1 provided com.google.truth truth - 0.29 test org.mockito mockito-core - 2.2.6 test diff --git a/sdk/implementation/pom.xml b/sdk/implementation/pom.xml index 5a6574a..ad80da9 100644 --- a/sdk/implementation/pom.xml +++ b/sdk/implementation/pom.xml @@ -25,7 +25,6 @@ com.google.guava guava - 19.0 io.grpc @@ -34,7 +33,6 @@ com.google.code.findbugs jsr305 - 3.0.1 provided @@ -46,7 +44,6 @@ com.google.truth truth - 0.29 test diff --git a/sdk/java-timestamp/pom.xml b/sdk/java-timestamp/pom.xml index 07c45cb..3897afb 100644 --- a/sdk/java-timestamp/pom.xml +++ b/sdk/java-timestamp/pom.xml @@ -25,7 +25,6 @@ com.google.guava guava - 19.0 diff --git a/sdk/joda-timestamp/pom.xml b/sdk/joda-timestamp/pom.xml index 5afd995..c89c2a5 100644 --- a/sdk/joda-timestamp/pom.xml +++ b/sdk/joda-timestamp/pom.xml @@ -25,12 +25,10 @@ com.google.guava guava - 19.0 joda-time joda-time - 2.9.4 diff --git a/sdk/service/pom.xml b/sdk/service/pom.xml index e5e00d2..09fb729 100644 --- a/sdk/service/pom.xml +++ b/sdk/service/pom.xml @@ -25,7 +25,6 @@ com.google.truth truth - 0.29 test diff --git a/services/appengine-standard-service/pom.xml b/services/appengine-standard-service/pom.xml index a127ade..e47527c 100644 --- a/services/appengine-standard-service/pom.xml +++ b/services/appengine-standard-service/pom.xml @@ -23,7 +23,8 @@ ${project.groupId} core - 0.6.0-SNAPSHOT + ${project.version} + jar @@ -67,13 +68,11 @@ com.google.truth truth - 0.30 test org.mockito mockito-core - 2.2.9 test diff --git a/services/trace-grpc-api-service/pom.xml b/services/trace-grpc-api-service/pom.xml index b45ab00..efafcac 100644 --- a/services/trace-grpc-api-service/pom.xml +++ b/services/trace-grpc-api-service/pom.xml @@ -49,7 +49,6 @@ com.google.auth google-auth-library-credentials - ${google-auth-library-credentials.version} diff --git a/sinks/v1/grpc-consumer/pom.xml b/sinks/v1/grpc-consumer/pom.xml index b281bea..13f77d5 100644 --- a/sinks/v1/grpc-consumer/pom.xml +++ b/sinks/v1/grpc-consumer/pom.xml @@ -24,12 +24,10 @@ com.google.cloud google-cloud-trace - ${google-cloud-trace.version} com.google.auth google-auth-library-credentials - ${google-auth-library-credentials.version} diff --git a/sinks/v1/grpc-consumer/src/main/java/com/google/cloud/trace/grpc/v1/GrpcTraceConsumer.java b/sinks/v1/grpc-consumer/src/main/java/com/google/cloud/trace/grpc/v1/GrpcTraceConsumer.java index 23fda97..76424fa 100644 --- a/sinks/v1/grpc-consumer/src/main/java/com/google/cloud/trace/grpc/v1/GrpcTraceConsumer.java +++ b/sinks/v1/grpc-consumer/src/main/java/com/google/cloud/trace/grpc/v1/GrpcTraceConsumer.java @@ -63,23 +63,23 @@ public void receive(Traces traces) { * @param apiHost a string containing the API host name. * @param credentials a credentials used to authenticate API calls. */ - @Deprecated - public static GrpcTraceConsumer create(String apiHost, Credentials credentials) - throws IOException { - TraceServiceSettings traceServiceSettings = - TraceServiceSettings.newBuilder() - .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) - .setTransportProvider( - TraceServiceSettings.defaultGrpcTransportProviderBuilder() - .setChannelProvider( - TraceServiceSettings.defaultGrpcChannelProviderBuilder() - .setEndpoint(apiHost) - .build()) - .build()) - .build(); - - return new GrpcTraceConsumer(TraceServiceClient.create(traceServiceSettings)); - } + //@Deprecated +// public static GrpcTraceConsumer create(String apiHost, Credentials credentials) +// throws IOException { +// TraceServiceSettings traceServiceSettings = +// TraceServiceSettings.newBuilder() +// .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) +// .setTransportProvider( +// TraceServiceSettings.defaultGrpcTransportProviderBuilder() +// .setChannelProvider( +// TraceServiceSettings.defaultGrpcChannelProviderBuilder() +// .setEndpoint(apiHost) +// .build()) +// .build()) +// .build(); +// +// return new GrpcTraceConsumer(TraceServiceClient.create(traceServiceSettings)); +// } /** * Creates a trace consumer that sends trace messages to the Stackdriver Trace API via gRPC. diff --git a/sinks/v1/http-consumer/pom.xml b/sinks/v1/http-consumer/pom.xml index dc3dccf..4a7432f 100644 --- a/sinks/v1/http-consumer/pom.xml +++ b/sinks/v1/http-consumer/pom.xml @@ -24,27 +24,22 @@ com.google.cloud google-cloud-trace - ${google-cloud-trace.version} com.google.auth google-auth-library-oauth2-http - ${google-auth-library-oauth2-http.version} com.google.guava guava - 19.0 com.google.protobuf protobuf-java - 3.1.0 com.google.protobuf protobuf-java-util - 3.1.0 diff --git a/sinks/v1/sink/pom.xml b/sinks/v1/sink/pom.xml index 2d15406..a280e1c 100644 --- a/sinks/v1/sink/pom.xml +++ b/sinks/v1/sink/pom.xml @@ -25,28 +25,23 @@ com.google.guava guava - 19.0 com.google.cloud google-cloud-trace - ${google-cloud-trace.version} com.google.protobuf protobuf-java - 3.1.0 com.google.truth truth - 0.29 test org.mockito mockito-core - 2.2.6 test From a066450d60a2f0bd08a6411030e317bf81185760 Mon Sep 17 00:00:00 2001 From: Arvind Mohabir Date: Thu, 21 Dec 2017 16:31:08 +0100 Subject: [PATCH 2/2] Removed comments in POM --- services/appengine-standard-service/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/appengine-standard-service/pom.xml b/services/appengine-standard-service/pom.xml index e47527c..74a591f 100644 --- a/services/appengine-standard-service/pom.xml +++ b/services/appengine-standard-service/pom.xml @@ -24,8 +24,6 @@ ${project.groupId} core ${project.version} - - jar ${project.groupId}