Skip to content

Commit 4b478b0

Browse files
deps: fix build errors (#286)
* deps: fix build errors * temporarily remove flatten plugin * add flatten back, specify javax version * specify javax version in parent pom
1 parent 820b4d5 commit 4b478b0

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

google-cloud-bigquery/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@
157157
<dependency>
158158
<groupId>javax.annotation</groupId>
159159
<artifactId>javax.annotation-api</artifactId>
160+
<!-- Adding version here because flatten cannot interpret this -->
161+
<version>${javax.annotations.version}</version>
160162
</dependency>
161163
</dependencies>
162164
</profile>

pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,6 @@
161161
<artifactId>threetenbp</artifactId>
162162
<version>${threeten.version}</version>
163163
</dependency>
164-
<dependency>
165-
<groupId>javax.annotation</groupId>
166-
<artifactId>javax.annotation-api</artifactId>
167-
<version>${javax.annotations.version}</version>
168-
</dependency>
169164
<dependency>
170165
<groupId>org.codehaus.mojo</groupId>
171166
<artifactId>animal-sniffer-annotations</artifactId>

samples/snapshot/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<artifactId>google-cloud-bigquery</artifactId>
4747
<version>1.111.1-SNAPSHOT</version>
4848
</dependency>
49+
<!-- {x-version-update-end} -->
4950

5051
<!-- Test dependencies -->
5152
<dependency>
@@ -57,10 +58,10 @@
5758
<dependency>
5859
<groupId>com.google.truth</groupId>
5960
<artifactId>truth</artifactId>
60-
<version>1.111.1-SNAPSHOT</version>
61+
<version>1.0.1</version>
6162
<scope>test</scope>
6263
</dependency>
63-
<!-- {x-version-update-end} -->
64+
6465
</dependencies>
6566

6667
<!-- compile and run all snippet tests -->

0 commit comments

Comments
 (0)