Skip to content

Commit 0edf0df

Browse files
igorbernstein2garrettjonesgoogle
igorbernstein2
authored and
garrettjonesgoogle
committed
---
yaml --- r: 10029 b: refs/heads/hzyi-move-bom-info-up c: 799710f h: refs/heads/master i: 10027: 8a3bdff
1 parent cbf452a commit 0edf0df

8 files changed

Lines changed: 1187 additions & 102 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ refs/tags/v0.55.0: 01b46f9b12b2b8a3070467d7dceeb040bbce4ee2
109109
refs/tags/v0.55.1: 9c9664b8be47a8548100c42df02f03a7888a982a
110110
refs/tags/v0.56.0: c31fb69430b7e6d4139db41d8491c0ed56028436
111111
refs/heads/gcs-bucket-lock: 7a109589d7d1c5852961bcd7303936e664ef5091
112-
refs/heads/hzyi-move-bom-info-up: b1e061708bfcbc15a325f4e10f8196a5ec9f13e6
112+
refs/heads/hzyi-move-bom-info-up: 799710f12b24afdf37c29124e4c8f4890cba0192
113113
refs/tags/v0.57.0: f9845be37c0b524de2b3c0f34c539c42fe49b335
114114
refs/tags/v0.58.0: a1f1af76bca0933c003646372b07142cfe22f3fc
115115
refs/tags/v0.59.0: 32a3ffd5009922e34c0dd00c8e49e42a01866241

‎branches/hzyi-move-bom-info-up/README.md‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -84,25 +84,7 @@ Besides adding client libraries, the plugins provide additional functionality, s
8484

8585
These client libraries can be used on App Engine standard for Java 8 runtime and App Engine flexible (including the Compat runtime). Most of the libraries do not work on the App Engine standard for Java 7 runtime. However, Datastore, Storage, and Bigquery should work.
8686

87-
If you are running into problems with version conflicts, the easiest way to solve the conflicts is to use google-cloud's BOM. In Maven, add the following to your POM:
88-
89-
[//]: # ({x-version-update-start:google-cloud-bom:released})
90-
```xml
91-
<dependencyManagement>
92-
<dependencies>
93-
<dependency>
94-
<groupId>com.google.cloud</groupId>
95-
<artifactId>google-cloud-bom</artifactId>
96-
<version>0.57.0-alpha</version>
97-
<type>pom</type>
98-
<scope>import</scope>
99-
</dependency>
100-
</dependencies>
101-
</dependencyManagement>
102-
```
103-
[//]: # ({x-version-update-end})
104-
105-
Note that the BOM is only available starting at version 0.32.0-alpha. For prior versions, refer to [Old Version Combinations](#old-version-combinations) to make sure that your versions are compatible.
87+
If you are running into problems with version conflicts, see [Version Management](#version-management).
10688

10789
Specifying a Project ID
10890
-----------------------
@@ -298,10 +280,29 @@ a higher priority.
298280
are more likely to get backwards-incompatible updates. Additionally, it's possible for Alpha
299281
libraries to get deprecated and deleted before ever being promoted to Beta or GA.
300282
301-
Old Version Combinations
283+
Version Management
302284
------------------
303285
304-
If you are having compatbility problems with google-cloud prior to version 0.32.0-alpha, use the following table as a reference to make sure that your versions are compatible. Definitions:
286+
The easiest way to solve version conflicts is to use google-cloud's BOM. In Maven, add the following to your POM:
287+
288+
[//]: # ({x-version-update-start:google-cloud-bom:released})
289+
```xml
290+
<dependencyManagement>
291+
<dependencies>
292+
<dependency>
293+
<groupId>com.google.cloud</groupId>
294+
<artifactId>google-cloud-bom</artifactId>
295+
<version>0.57.0-alpha</version>
296+
<type>pom</type>
297+
<scope>import</scope>
298+
</dependency>
299+
</dependencies>
300+
</dependencyManagement>
301+
```
302+
[//]: # ({x-version-update-end})
303+
304+
This BOM is only available starting at version 0.32.0-alpha. If you are having problems with prior versions of
305+
google-cloud, use the following table as a reference to make sure that your versions are compatible. Definitions:
305306
306307
* **alpha**: The version of any alpha package in google-cloud
307308
* **beta**: The version of any beta package in google-cloud

0 commit comments

Comments
 (0)