Skip to content

Commit 859707d

Browse files
garrettjonesgooglegarrettjonesgoogle
committed
Adding dependency convergence
1 parent 67af4bf commit 859707d

File tree

22 files changed

+125
-89
lines changed

22 files changed

+125
-89
lines changed

‎google-cloud-bigquery/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<dependency>
5353
<groupId>junit</groupId>
5454
<artifactId>junit</artifactId>
55-
<version>4.12</version>
5655
<scope>test</scope>
5756
</dependency>
5857
<dependency>

‎google-cloud-compute/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<dependency>
4747
<groupId>junit</groupId>
4848
<artifactId>junit</artifactId>
49-
<version>4.12</version>
5049
<scope>test</scope>
5150
</dependency>
5251
<dependency>

‎google-cloud-contrib/google-cloud-nio-examples/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
<artifactId>google-cloud-storage</artifactId>
2424
<version>${storage.version}</version>
2525
</dependency>
26-
27-
<dependency>
28-
<groupId>org.apache.maven.plugins</groupId>
29-
<artifactId>maven-assembly-plugin</artifactId>
30-
<version>2.5.4</version>
31-
</dependency>
3226
</dependencies>
3327
<build>
3428
<plugins>

‎google-cloud-contrib/google-cloud-nio/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@
2626
<dependency>
2727
<groupId>com.google.guava</groupId>
2828
<artifactId>guava</artifactId>
29-
<version>19.0</version>
3029
</dependency>
3130
<dependency>
3231
<groupId>com.google.code.findbugs</groupId>
3332
<artifactId>jsr305</artifactId>
34-
<version>2.0.1</version>
3533
</dependency>
3634
<dependency>
3735
<groupId>javax.inject</groupId>
@@ -47,19 +45,16 @@
4745
<dependency>
4846
<groupId>com.google.auto.value</groupId>
4947
<artifactId>auto-value</artifactId>
50-
<version>1.1</version>
5148
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
5249
</dependency>
5350
<dependency>
5451
<groupId>junit</groupId>
5552
<artifactId>junit</artifactId>
56-
<version>4.12</version>
5753
<scope>test</scope>
5854
</dependency>
5955
<dependency>
6056
<groupId>com.google.guava</groupId>
6157
<artifactId>guava-testlib</artifactId>
62-
<version>19.0</version>
6358
<scope>test</scope>
6459
</dependency>
6560
<dependency>

‎google-cloud-core/pom.xml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@
2222
<dependency>
2323
<groupId>com.google.auth</groupId>
2424
<artifactId>google-auth-library-credentials</artifactId>
25-
<version>${google.auth.version}</version>
2625
</dependency>
2726
<dependency>
2827
<groupId>com.google.auth</groupId>
2928
<artifactId>google-auth-library-oauth2-http</artifactId>
30-
<version>${google.auth.version}</version>
3129
<exclusions>
3230
<exclusion>
3331
<groupId>com.google.guava</groupId>
@@ -38,24 +36,20 @@
3836
<dependency>
3937
<groupId>com.google.http-client</groupId>
4038
<artifactId>google-http-client</artifactId>
41-
<version>1.21.0</version>
4239
<scope>compile</scope>
4340
</dependency>
4441
<dependency>
4542
<groupId>com.google.oauth-client</groupId>
4643
<artifactId>google-oauth-client</artifactId>
47-
<version>1.21.0</version>
4844
<scope>compile</scope>
4945
</dependency>
5046
<dependency>
5147
<groupId>com.google.guava</groupId>
5248
<artifactId>guava</artifactId>
53-
<version>19.0</version>
5449
</dependency>
5550
<dependency>
5651
<groupId>com.google.api-client</groupId>
5752
<artifactId>google-api-client</artifactId>
58-
<version>1.21.0</version>
5953
<scope>compile</scope>
6054
<exclusions>
6155
<exclusion>
@@ -67,7 +61,6 @@
6761
<dependency>
6862
<groupId>com.google.http-client</groupId>
6963
<artifactId>google-http-client-appengine</artifactId>
70-
<version>1.21.0</version>
7164
<scope>compile</scope>
7265
<exclusions>
7366
<exclusion>
@@ -79,7 +72,6 @@
7972
<dependency>
8073
<groupId>com.google.http-client</groupId>
8174
<artifactId>google-http-client-jackson</artifactId>
82-
<version>1.21.0</version>
8375
<scope>compile</scope>
8476
<exclusions>
8577
<exclusion>
@@ -91,13 +83,11 @@
9183
<dependency>
9284
<groupId>junit</groupId>
9385
<artifactId>junit</artifactId>
94-
<version>4.12</version>
9586
<scope>test</scope>
9687
</dependency>
9788
<dependency>
9889
<groupId>joda-time</groupId>
9990
<artifactId>joda-time</artifactId>
100-
<version>2.9.2</version>
10191
<scope>compile</scope>
10292
</dependency>
10393
<dependency>
@@ -115,12 +105,10 @@
115105
<dependency>
116106
<groupId>com.google.protobuf</groupId>
117107
<artifactId>protobuf-java</artifactId>
118-
<version>3.2.0</version>
119108
</dependency>
120109
<dependency>
121110
<groupId>com.google.protobuf</groupId>
122111
<artifactId>protobuf-java-util</artifactId>
123-
<version>3.2.0</version>
124112
</dependency>
125113
<dependency>
126114
<groupId>io.grpc</groupId>
@@ -146,7 +134,6 @@
146134
<dependency>
147135
<groupId>com.google.api.grpc</groupId>
148136
<artifactId>grpc-google-common-protos</artifactId>
149-
<version>0.1.7</version>
150137
<exclusions>
151138
<exclusion>
152139
<groupId>io.grpc</groupId>
@@ -157,7 +144,6 @@
157144
<dependency>
158145
<groupId>com.google.api.grpc</groupId>
159146
<artifactId>grpc-google-iam-v1</artifactId>
160-
<version>0.1.7</version>
161147
<exclusions>
162148
<exclusion>
163149
<groupId>io.grpc</groupId>

‎google-cloud-datastore/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
<dependency>
5151
<groupId>junit</groupId>
5252
<artifactId>junit</artifactId>
53-
<version>4.12</version>
5453
<scope>test</scope>
5554
</dependency>
5655
<dependency>

‎google-cloud-dns/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<dependency>
5858
<groupId>junit</groupId>
5959
<artifactId>junit</artifactId>
60-
<version>4.12</version>
6160
<scope>test</scope>
6261
</dependency>
6362
<dependency>

‎google-cloud-errorreporting/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
<dependency>
6666
<groupId>junit</groupId>
6767
<artifactId>junit</artifactId>
68-
<version>4.12</version>
6968
<scope>test</scope>
7069
</dependency>
7170
<dependency>

‎google-cloud-examples/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,9 @@
2828
<artifactId>google-cloud-nio</artifactId>
2929
<version>${project.version}</version>
3030
</dependency>
31-
<dependency>
32-
<groupId>org.apache.maven.plugins</groupId>
33-
<artifactId>maven-assembly-plugin</artifactId>
34-
<version>2.5.4</version>
35-
</dependency>
3631
<dependency>
3732
<groupId>junit</groupId>
3833
<artifactId>junit</artifactId>
39-
<version>4.12</version>
4034
<scope>test</scope>
4135
</dependency>
4236
</dependencies>

‎google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import com.google.pubsub.v1.Subscription;
3636
import com.google.pubsub.v1.SubscriptionName;
3737
import com.google.pubsub.v1.TopicName;
38-
import edu.emory.mathcs.backport.java.util.Collections;
38+
import java.util.Collections;
3939
import java.util.LinkedList;
4040
import java.util.List;
4141

0 commit comments

Comments
 (0)