Skip to content

Commit e741371

Browse files
authored
chore: shared-deps third party's parent is generator-pom-parent (#2664)
Following Tomo's suggestion in #2602 (comment) Shared-Dep's third_party parent is gapic-generator-java-pom-parent. threetenbp's + otel version is defined in gapic-generator-java-pom-parent
1 parent 1dfe4c0 commit e741371

File tree

3 files changed

+9
-11
lines changed
  • gapic-generator-java-pom-parent
  • gax-java
  • java-shared-dependencies/third-party-dependencies

3 files changed

+9
-11
lines changed

gapic-generator-java-pom-parent/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<maven.compiler.release>8</maven.compiler.release>
3737
<errorprone.version>2.26.1</errorprone.version>
3838
<j2objc-annotations.version>3.0.0</j2objc-annotations.version>
39+
<threetenbp.version>1.6.8</threetenbp.version>
3940
</properties>
4041

4142
<developers>

gax-java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>org.threeten</groupId>
6464
<artifactId>threetenbp</artifactId>
65-
<version>1.6.8</version>
65+
<version>${threetenbp.version}</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>com.google.code.findbugs</groupId>

java-shared-dependencies/third-party-dependencies/pom.xml

+7-10
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,17 @@
1313
</description>
1414

1515
<parent>
16-
<groupId>com.google.cloud</groupId>
17-
<artifactId>google-cloud-shared-config</artifactId>
18-
<version>1.7.7</version>
19-
<relativePath />
16+
<groupId>com.google.api</groupId>
17+
<artifactId>gapic-generator-java-pom-parent</artifactId>
18+
<version>2.38.2-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
19+
<relativePath>../../gapic-generator-java-pom-parent</relativePath>
2020
</parent>
2121

2222
<properties>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<site.installationModule>${project.artifactId}</site.installationModule>
2525

26-
<threeten.version>1.6.8</threeten.version>
2726
<threeten-extra.version>1.8.0</threeten-extra.version>
28-
<javax.annotations.version>1.3.2</javax.annotations.version>
2927
<animal-sniffer.version>1.23</animal-sniffer.version>
3028
<opencensus.version>0.31.1</opencensus.version>
3129
<findbugs.version>3.0.2</findbugs.version>
@@ -37,9 +35,8 @@
3735
<!-- ensure checker-qual version matches what Guava uses -->
3836
<checker-qual.version>3.42.0</checker-qual.version>
3937
<perfmark-api.version>0.27.0</perfmark-api.version>
40-
<google.cloud.opentelemetry.version>0.28.0</google.cloud.opentelemetry.version>
4138
<j2objc-annotations.version>3.0.0</j2objc-annotations.version>
42-
<opentelemetry.version>1.36.0</opentelemetry.version>
39+
<google.cloud.opentelemetry.version>0.28.0</google.cloud.opentelemetry.version>
4340
<opentelemetry-grpc-instrumentation.version>2.1.0-alpha</opentelemetry-grpc-instrumentation.version>
4441
<flogger.version>0.8</flogger.version>
4542
<arrow.version>15.0.2</arrow.version>
@@ -75,7 +72,7 @@
7572
<dependency>
7673
<groupId>org.threeten</groupId>
7774
<artifactId>threetenbp</artifactId>
78-
<version>${threeten.version}</version>
75+
<version>${threetenbp.version}</version>
7976
</dependency>
8077
<dependency>
8178
<groupId>org.threeten</groupId>
@@ -85,7 +82,7 @@
8582
<dependency>
8683
<groupId>javax.annotation</groupId>
8784
<artifactId>javax.annotation-api</artifactId>
88-
<version>${javax.annotations.version}</version>
85+
<version>${javax.annotation-api.version}</version>
8986
<scope>compile</scope>
9087
</dependency>
9188
<dependency>

0 commit comments

Comments
 (0)