Skip to content

Commit 8959c2c

Browse files
pongadpongad
committed
Merge branch 'master' into bq-perf
2 parents 8ac24ed + 973ffc1 commit 8959c2c

133 files changed

Lines changed: 14760 additions & 1781 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,22 @@ If you are using Maven, add this to your pom.xml file
5050
<dependency>
5151
<groupId>com.google.cloud</groupId>
5252
<artifactId>google-cloud</artifactId>
53-
<version>0.30.0-alpha</version>
53+
<version>0.32.0-alpha</version>
5454
</dependency>
5555
```
5656
If you are using Gradle, add this to your dependencies
5757
```Groovy
58-
compile 'com.google.cloud:google-cloud:0.30.0-alpha'
58+
compile 'com.google.cloud:google-cloud:0.32.0-alpha'
5959
```
6060
If you are using SBT, add this to your dependencies
6161
```Scala
62-
libraryDependencies += "com.google.cloud" % "google-cloud" % "0.30.0-alpha"
62+
libraryDependencies += "com.google.cloud" % "google-cloud" % "0.32.0-alpha"
6363
```
6464

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

67+
If you are running into problems with version conflicts, see [Version Management](#version-management).
68+
6769
Specifying a Project ID
6870
-----------------------
6971

@@ -258,6 +260,61 @@ a higher priority.
258260
**Alpha**: Libraries defined at an Alpha quality level are still a work-in-progress and
259261
are more likely to get backwards-incompatible updates.
260262
263+
Version Management
264+
------------------
265+
266+
The easiest way to solve version conflicts is to use google-cloud's BOM. In Maven, add the following to your POM:
267+
268+
```
269+
<dependencyManagement>
270+
<dependencies>
271+
<dependency>
272+
<groupId>com.google.cloud</groupId>
273+
<artifactId>google-cloud-bom</artifactId>
274+
<version>0.32.0-alpha</version>
275+
<type>pom</type>
276+
<scope>import</scope>
277+
</dependency>
278+
</dependencies>
279+
</dependencyManagement>
280+
```
281+
282+
This BOM is only available starting at version 0.32.0-alpha. If you are having problems with prior versions of
283+
google-cloud, use the following table as a reference to make sure that your versions are compatible. Definitions:
284+
285+
* **alpha**: The version of any alpha package in google-cloud
286+
* **beta**: The version of any beta package in google-cloud
287+
* **GA**: The version of any GA package in google-cloud
288+
* **gax**: The version of com.google.api:gax
289+
* **gax-grpc**: The version of com.google.api:gax-grpc
290+
291+
Something to be aware of is that a package can be promoted from alpha -> beta or beta -> GA between versions, which
292+
means that after a certain point for any given package, the alpha or beta version won't be valid any more.
293+
294+
alpha | beta | GA | gax | gax-grpc
295+
------------- | ------------ | ---------- | ---------- | --------
296+
0.30.0-alpha | 0.30.0-beta | 1.12.0 | 1.15.0 | 1.15.0
297+
0.29.0-alpha | 0.29.0-beta | 1.11.0 | 1.15.0 | 1.15.0
298+
0.28.0-alpha | 0.28.0-beta | 1.10.0 | 1.14.0 | 1.14.0
299+
0.27.0-alpha | 0.27.0-beta | 1.9.0 | 1.13.0 | 0.30.0
300+
0.26.0-alpha | 0.26.0-beta | 1.8.0 | 1.9.0 | 0.26.0
301+
0.25.0-alpha | 0.25.0-beta | 1.7.0 | 1.8.1 | 0.25.1
302+
0.24.0-alpha | 0.24.0-beta | 1.6.0 | 1.8.1 | 0.25.1
303+
0.23.1-alpha | 0.23.1-beta | 1.5.1 | 1.8.1 | 0.25.1
304+
0.23.0-alpha | 0.23.0-beta | 1.5.0 | 1.5.0 | 0.22.0
305+
0.22.0-alpha | 0.22.0-beta | 1.4.0 | 1.5.0 | 0.22.0
306+
0.21.1-alpha | 0.21.1-beta | 1.3.1 | 1.5.0 | 0.22.0
307+
0.21.0-alpha | 0.21.0-beta | 1.3.0 | 1.5.0 | 0.22.0
308+
0.20.3-alpha | 0.20.3-beta | 1.2.3 | 1.4.2 | 0.21.2
309+
0.20.2-alpha | 0.20.2-beta | 1.2.2 | 1.4.2 | 0.21.2
310+
0.20.1-alpha | 0.20.1-beta | 1.2.1 | 1.4.1 | 0.21.1
311+
0.20.0-alpha | 0.20.0-beta | 1.2.0 | 1.3.1 | 0.20.0
312+
0.19.0-alpha | 0.19.0-beta | 1.1.0 | 1.3.0 | 0.19.0
313+
0.18.0-alpha | 0.18.0-beta | 1.0.2 | 1.1.0 | 0.17.0
314+
0.17.2-alpha | 0.17.2-beta | 1.0.1 | 1.0.0 | 0.16.0
315+
0.17.1-alpha | 0.17.1-beta | 1.0.0 | 1.0.0 | 0.16.0
316+
0.17.0-alpha | 0.17.0-beta | 1.0.0-rc4 | 1.0.0-rc1 | 0.15.0
317+
261318
Contributing
262319
------------
263320

‎google-cloud-bigquery/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file
2222
<dependency>
2323
<groupId>com.google.cloud</groupId>
2424
<artifactId>google-cloud-bigquery</artifactId>
25-
<version>0.30.0-beta</version>
25+
<version>0.32.0-beta</version>
2626
</dependency>
2727
```
2828
If you are using Gradle, add this to your dependencies
2929
```Groovy
30-
compile 'com.google.cloud:google-cloud-bigquery:0.30.0-beta'
30+
compile 'com.google.cloud:google-cloud-bigquery:0.32.0-beta'
3131
```
3232
If you are using SBT, add this to your dependencies
3333
```Scala
34-
libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "0.30.0-beta"
34+
libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "0.32.0-beta"
3535
```
3636

3737
Example Application

‎google-cloud-bigquery/pom.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>google-cloud-bigquery</artifactId>
5-
<version>0.30.1-beta-SNAPSHOT</version>
5+
<version>0.32.1-beta-SNAPSHOT</version>
66
<packaging>jar</packaging>
77
<name>Google Cloud BigQuery</name>
88
<url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquery</url>
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-pom</artifactId>
15-
<version>0.30.1-alpha-SNAPSHOT</version>
15+
<version>0.32.1-alpha-SNAPSHOT</version>
1616
</parent>
1717
<properties>
1818
<site.installationModule>google-cloud-bigquery</site.installationModule>
@@ -35,7 +35,6 @@
3535
<dependency>
3636
<groupId>com.google.apis</groupId>
3737
<artifactId>google-api-services-bigquery</artifactId>
38-
<version>v2-rev347-1.22.0</version>
3938
<scope>compile</scope>
4039
<exclusions>
4140
<exclusion>
@@ -70,6 +69,11 @@
7069
<artifactId>objenesis</artifactId>
7170
<scope>test</scope>
7271
</dependency>
72+
<dependency>
73+
<groupId>com.google.truth</groupId>
74+
<artifactId>truth</artifactId>
75+
<scope>test</scope>
76+
</dependency>
7377
</dependencies>
7478
<build>
7579
<resources>

0 commit comments

Comments
 (0)