Skip to content

chore: eliminate duplicate guava version declarations #1777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
burkedavison wants to merge 11 commits into from
Closed

chore: eliminate duplicate guava version declarations #1777

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
86d21da
chore: eliminate duplicate guava version declarations
burkedavison Jun 15, 2023
1139266
chore: eliminate duplicate guava version declaration in dependency-co…
burkedavison Jun 15, 2023
a8f7999
chore: copy and update PROPERTIES using widely supported syntax (#1779)
burkedavison Jun 16, 2023
e0c2b45
build(deps): bump guava from 31.1-jre to 32.0.0-jre in /java-common-p…
dependabot[bot] Jun 19, 2023
65bc13f
build(deps): bump guava from 31.1-jre to 32.0.0-jre in /gapic-generat…
dependabot[bot] Jun 19, 2023
9ff8595
build(deps-dev): bump guava from 31.0.1-jre to 32.0.0-jre in /java-sh…
dependabot[bot] Jun 19, 2023
9f15fea
feat: GA Gax HttpJson (#1264)
lqiu96 Jun 20, 2023
7b89c36
chore: Update dependencies.properties to use gax's version (#1792)
lqiu96 Jun 21, 2023
b9b4977
chore: eliminate duplicate guava version declarations
burkedavison Jun 15, 2023
858a1bd
chore: eliminate duplicate guava version declaration in dependency-co…
burkedavison Jun 15, 2023
53d02a6
Merge remote-tracking branch 'origin/guava-version-deduplication' int…
burkedavison Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion gapic-generator-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
Expand Down
1 change: 0 additions & 1 deletion java-common-protos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<github.global.server>github</github.global.server>
<site.installationModule>google-iam-parent</site.installationModule>
<junit.version>4.13.2</junit.version>
<guava.version>31.1-jre</guava.version>
</properties>

<dependencyManagement>
Expand Down
14 changes: 13 additions & 1 deletion java-shared-dependencies/dependency-convergence-check/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,22 @@
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>3.11.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -33,6 +44,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
Copy link
Contributor

@blakeli0 blakeli0 Jun 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change required?

Copy link
Member Author

@burkedavison burkedavison Jun 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. dependency-convergence-check is not currently a valid POM in the main branch.
Run mvn validate in this folder to see what I mean.

<scope>test</scope>
</dependency>
</dependencies>
Expand Down