Skip to content
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

Jump to bottom

deps: do not re-declare grpc dependencies as test dependencies #278

Merged
merged 4 commits into from Nov 24, 2020
Merged

deps: do not re-declare grpc dependencies as test dependencies #278

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7db9e92
deps: include grpc dependencies
olavloite Nov 19, 2020
0214bd2
deps: remove all unnecessary deps
olavloite Nov 20, 2020
07a6762
Merge branch 'include-grpc-deps' of github.com:googleapis/java-spanne…
olavloite Nov 20, 2020
8acd358
fix: re-add undeclared dependencies
olavloite Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 12 additions & 15 deletions pom.xml
View file
Open in desktop
Expand Up @@ -105,6 +105,18 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner</artifactId>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The version that is used here will be determined by the version defined at line 72 for the import of google-cloud-spanner-bom (currently 2.0.2). That is the version of google-cloud-spanner that anyone using google-cloud-spanner-jdbc should be using. But:

  • Any application that adds only google-cloud-spanner-jdbc (version 1.17.3) as a dependency without importing the libraries-bom will get google-cloud-spanner version 2.0.2.
  • Any application that adds google-cloud-spanner-jdbc as a dependency and imports the libraries-bom, will get the versions of google-cloud-spanner-jdbc and google-cloud-spanner that are defined in the libraries-bom. The version of google-cloud-spanner in the BOM can be different from the one defined in google-cloud-spanner-jdbc.

</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand Down Expand Up @@ -157,21 +169,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
Expand Down