Skip to content

Commit e0fd8f6

Browse files
chingor13chingor13
authored
chore: fix dependency declarations, update shared dependencies/config (#85)
1 parent a7e09ff commit e0fd8f6

File tree

5 files changed

+161
-3
lines changed

5 files changed

+161
-3
lines changed

‎google-cloud-pubsublite/EnableAutoValue.txt‎

Whitespace-only changes.

‎google-cloud-pubsublite/pom.xml‎

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,37 @@
1919
<groupId>com.google.protobuf</groupId>
2020
<artifactId>protobuf-java-util</artifactId>
2121
</dependency>
22+
<dependency>
23+
<groupId>io.grpc</groupId>
24+
<artifactId>grpc-api</artifactId>
25+
</dependency>
26+
<dependency>
27+
<groupId>io.grpc</groupId>
28+
<artifactId>grpc-auth</artifactId>
29+
</dependency>
30+
<dependency>
31+
<groupId>io.grpc</groupId>
32+
<artifactId>grpc-core</artifactId>
33+
</dependency>
2234
<dependency>
2335
<groupId>io.grpc</groupId>
2436
<artifactId>grpc-stub</artifactId>
2537
</dependency>
38+
<dependency>
39+
<groupId>com.google.protobuf</groupId>
40+
<artifactId>protobuf-java</artifactId>
41+
</dependency>
2642
<dependency>
2743
<groupId>com.google.api</groupId>
2844
<artifactId>gax</artifactId>
2945
</dependency>
3046
<dependency>
3147
<groupId>com.google.cloud</groupId>
3248
<artifactId>google-cloud-pubsub</artifactId>
33-
<version>1.105.0</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>com.google.api.grpc</groupId>
52+
<artifactId>proto-google-cloud-pubsub-v1</artifactId>
3453
</dependency>
3554
<dependency>
3655
<groupId>com.google.api.grpc</groupId>
@@ -47,6 +66,36 @@
4766
<artifactId>google-extensions</artifactId>
4867
<version>0.5.1</version>
4968
</dependency>
69+
<dependency>
70+
<groupId>com.google.code.findbugs</groupId>
71+
<artifactId>jsr305</artifactId>
72+
</dependency>
73+
<dependency>
74+
<groupId>com.google.api</groupId>
75+
<artifactId>api-common</artifactId>
76+
</dependency>
77+
<dependency>
78+
<groupId>com.google.guava</groupId>
79+
<artifactId>guava</artifactId>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.threeten</groupId>
83+
<artifactId>threetenbp</artifactId>
84+
</dependency>
85+
<dependency>
86+
<groupId>com.google.errorprone</groupId>
87+
<artifactId>error_prone_annotations</artifactId>
88+
<version>2.3.4</version>
89+
</dependency>
90+
<dependency>
91+
<groupId>com.google.auto.value</groupId>
92+
<artifactId>auto-value-annotations</artifactId>
93+
</dependency>
94+
<dependency>
95+
<groupId>com.google.auth</groupId>
96+
<artifactId>google-auth-library-oauth2-http</artifactId>
97+
</dependency>
98+
5099
<!--test dependencies-->
51100
<dependency>
52101
<groupId>com.google.flogger</groupId>
@@ -57,6 +106,7 @@
57106
<dependency>
58107
<groupId>com.google.truth</groupId>
59108
<artifactId>truth</artifactId>
109+
<version>1.0.1</version>
60110
<scope>test</scope>
61111
</dependency>
62112
<dependency>
@@ -76,8 +126,35 @@
76126
<artifactId>grpc-testing</artifactId>
77127
<scope>test</scope>
78128
</dependency>
129+
<dependency>
130+
<groupId>junit</groupId>
131+
<artifactId>junit</artifactId>
132+
<version>4.13</version>
133+
<scope>test</scope>
134+
</dependency>
135+
<dependency>
136+
<groupId>org.hamcrest</groupId>
137+
<artifactId>hamcrest</artifactId>
138+
<version>2.2</version>
139+
<scope>test</scope>
140+
</dependency>
79141
</dependencies>
80142
<build>
143+
<pluginManagement>
144+
<plugins>
145+
<plugin>
146+
<groupId>org.apache.maven.plugins</groupId>
147+
<artifactId>maven-dependency-plugin</artifactId>
148+
<configuration>
149+
<ignoredUnusedDeclaredDependencies>
150+
<ignoredUnusedDeclaredDependency>org.hamcrest:hamcrest</ignoredUnusedDeclaredDependency>
151+
<ignoredUnusedDeclaredDependency>com.google.flogger:flogger-system-backend</ignoredUnusedDeclaredDependency>
152+
</ignoredUnusedDeclaredDependencies>
153+
<ignoredUsedUndeclaredDependencies>org.hamcrest:hamcrest-core</ignoredUsedUndeclaredDependencies>
154+
</configuration>
155+
</plugin>
156+
</plugins>
157+
</pluginManagement>
81158
<plugins>
82159
<plugin>
83160
<groupId>com.coveo</groupId>

‎pom.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-shared-config</artifactId>
6-
<version>0.5.0</version>
6+
<version>0.6.0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>com.google.cloud</groupId>
@@ -18,7 +18,14 @@
1818
<dependency>
1919
<groupId>com.google.cloud</groupId>
2020
<artifactId>google-cloud-shared-dependencies</artifactId>
21-
<version>0.4.0</version>
21+
<version>0.5.0</version>
22+
<type>pom</type>
23+
<scope>import</scope>
24+
</dependency>
25+
<dependency>
26+
<groupId>com.google.cloud</groupId>
27+
<artifactId>google-cloud-pubsub-bom</artifactId>
28+
<version>1.105.0</version>
2229
<type>pom</type>
2330
<scope>import</scope>
2431
</dependency>

‎pubsublite-beam-io/EnableAutoValue.txt‎

Whitespace-only changes.

‎pubsublite-beam-io/pom.xml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,65 @@
3030
<artifactId>beam-sdks-java-core</artifactId>
3131
<version>2.20.0</version>
3232
</dependency>
33+
<dependency>
34+
<groupId>com.google.code.findbugs</groupId>
35+
<artifactId>jsr305</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>com.google.api</groupId>
39+
<artifactId>api-common</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>com.google.guava</groupId>
43+
<artifactId>guava</artifactId>
44+
</dependency>
45+
<dependency>
46+
<groupId>io.grpc</groupId>
47+
<artifactId>grpc-api</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.google.protobuf</groupId>
51+
<artifactId>protobuf-java</artifactId>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.google.protobuf</groupId>
55+
<artifactId>protobuf-java-util</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>com.google.errorprone</groupId>
59+
<artifactId>error_prone_annotations</artifactId>
60+
<version>2.3.4</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>com.google.auto.value</groupId>
64+
<artifactId>auto-value-annotations</artifactId>
65+
</dependency>
66+
<dependency>
67+
<groupId>joda-time</groupId>
68+
<artifactId>joda-time</artifactId>
69+
<version>2.10.5</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>com.google.api.grpc</groupId>
73+
<artifactId>proto-google-cloud-pubsublite-v1</artifactId>
74+
<version>0.1.5</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
75+
</dependency>
76+
<dependency>
77+
<groupId>com.google.api.grpc</groupId>
78+
<artifactId>grpc-google-cloud-pubsublite-v1</artifactId>
79+
<version>0.1.5</version><!-- {x-version-update:google-cloud-pubsublite:current} -->
80+
</dependency>
81+
<dependency>
82+
<groupId>com.google.api.grpc</groupId>
83+
<artifactId>proto-google-cloud-pubsub-v1</artifactId>
84+
</dependency>
3385
<!--test dependencies-->
86+
<dependency>
87+
<groupId>junit</groupId>
88+
<artifactId>junit</artifactId>
89+
<version>4.13</version>
90+
<scope>test</scope>
91+
</dependency>
3492
<dependency>
3593
<groupId>com.google.truth</groupId>
3694
<artifactId>truth</artifactId>
@@ -69,6 +127,22 @@
69127
</dependency>
70128
</dependencies>
71129
<build>
130+
<pluginManagement>
131+
<plugins>
132+
<plugin>
133+
<groupId>org.apache.maven.plugins</groupId>
134+
<artifactId>maven-dependency-plugin</artifactId>
135+
<configuration>
136+
<ignoredUnusedDeclaredDependencies>
137+
<ignoredUnusedDeclaredDependency>org.hamcrest:hamcrest</ignoredUnusedDeclaredDependency>
138+
<ignoredUnusedDeclaredDependency>io.grpc:grpc-testing</ignoredUnusedDeclaredDependency>
139+
<ignoredUnusedDeclaredDependency>org.apache.beam:beam-runners-direct-java</ignoredUnusedDeclaredDependency>
140+
</ignoredUnusedDeclaredDependencies>
141+
<ignoredUsedUndeclaredDependencies>org.hamcrest:hamcrest-core</ignoredUsedUndeclaredDependencies>
142+
</configuration>
143+
</plugin>
144+
</plugins>
145+
</pluginManagement>
72146
<plugins>
73147
<plugin>
74148
<groupId>com.coveo</groupId>

0 commit comments

Comments
 (0)