Skip to content

Commit 2237216

Browse files
authored
---
yaml --- r: 8327 b: refs/heads/snehashah-snippets c: 7a83404 h: refs/heads/master i: 8325: 1edd68c 8323: ff6ca12 8319: 934293b
1 parent 1541bdf commit 2237216

2 files changed

Lines changed: 35 additions & 1 deletion

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5656
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5757
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5858
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
59-
refs/heads/snehashah-snippets: 94f395ecb7e79a6536a320a15f81d343a7826d7e
59+
refs/heads/snehashah-snippets: 7a834042458af7df4f5b09fa4546703adb8ad4b0
6060
refs/tags/v0.20.2: 5a53aa06f268b74dc192204f4f83e1a04d40f65d
6161
refs/tags/v0.20.3: 269025fdc14af0b68df214a4518be5379b2fe569
6262
refs/tags/v0.21.0: f88b200e00e41ba6262ee88a92abba38b1e2417e

branches/snehashah-snippets/README.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,40 @@ libraryDependencies += "com.google.cloud" % "google-cloud" % "0.21.1-alpha"
6868

6969
For running on Google App Engine, see [more instructions here](./APPENGINE.md).
7070

71+
Resolving dependency conflicts
72+
----------
73+
Optionally, if you encounter dependency conflicts, you may specify google-cloud-pom as a ["bill of materials"](https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies) to ensure that internal dependencies of google-cloud and your project are in sync.
74+
75+
If you are using Maven, add this to your pom.xml file
76+
```xml
77+
<dependencyManagement>
78+
<dependencies>
79+
<dependency>
80+
<groupId>com.google.cloud</groupId>
81+
<artifactId>google-cloud-pom</artifactId>
82+
<version>0.21.1-alpha</version>
83+
<type>pom</type>
84+
<scope>import</scope>
85+
</dependency>
86+
</dependencies>
87+
</dependencyManagement>
88+
```
89+
If you are using Gradle, add the following plugin at the beginning of your build.gradle file
90+
91+
```Groovy
92+
plugins {
93+
id "io.spring.dependency-management" version "1.0.3.RELEASE"
94+
}
95+
```
96+
Then add the following in your build.gradle file
97+
```Groovy
98+
dependencyManagement {
99+
imports {
100+
mavenBom 'com.google.cloud:google-cloud-pom:0.21.1-alpha'
101+
}
102+
}
103+
```
104+
71105
Example Applications
72106
--------------------
73107

0 commit comments

Comments
 (0)