Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
stephaniewang526 committed Apr 22, 2020
1 parent 820b4d5 commit 4b478b0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 2 additions & 0 deletions google-cloud-bigquery/pom.xml
Expand Up @@ -157,6 +157,8 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<!-- Adding version here because flatten cannot interpret this -->
<version>${javax.annotations.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down
5 changes: 0 additions & 5 deletions pom.xml
Expand Up @@ -161,11 +161,6 @@
<artifactId>threetenbp</artifactId>
<version>${threeten.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions samples/snapshot/pom.xml
Expand Up @@ -46,6 +46,7 @@
<artifactId>google-cloud-bigquery</artifactId>
<version>1.111.1-SNAPSHOT</version>
</dependency>
<!-- {x-version-update-end} -->

<!-- Test dependencies -->
<dependency>
Expand All @@ -57,10 +58,10 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>1.111.1-SNAPSHOT</version>
<version>1.0.1</version>
<scope>test</scope>
</dependency>
<!-- {x-version-update-end} -->

</dependencies>

<!-- compile and run all snippet tests -->
Expand Down

0 comments on commit 4b478b0

Please sign in to comment.