Skip to content

Commit 4736ff9

Browse files
eamonnmcmanuseamonnmcmanus
committed
Merge pull request #122 from aozarov/temp1
A fix for issue#121, fix NPE in storage#list and update maven dependencies
2 parents 37618dd + cbd1b26 commit 4736ff9

3 files changed

Lines changed: 18 additions & 16 deletions

File tree

‎gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public abstract class ServiceOptions<
5252

5353
private static final String DEFAULT_HOST = "https://www.googleapis.com";
5454
private static final long serialVersionUID = 1203687993961393350L;
55-
private static final String PROJECT_ENV_NAME = "default_project_id";
55+
private static final String PROJECT_ENV_NAME = "GCLOUD_PROJECT";
5656

5757
private final String projectId;
5858
private final String host;

‎gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,9 @@ private static abstract class BasePageFetcher<T extends Serializable>
175175
Map<StorageRpc.Option, ?> optionMap) {
176176
this.serviceOptions = serviceOptions;
177177
ImmutableMap.Builder<StorageRpc.Option, Object> builder = ImmutableMap.builder();
178-
builder.put(StorageRpc.Option.PAGE_TOKEN, cursor);
178+
if (cursor != null) {
179+
builder.put(StorageRpc.Option.PAGE_TOKEN, cursor);
180+
}
179181
for (Map.Entry<StorageRpc.Option, ?> option : optionMap.entrySet()) {
180182
if (option.getKey() != StorageRpc.Option.PAGE_TOKEN) {
181183
builder.put(option.getKey(), option.getValue());

‎pom.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<plugin>
9191
<groupId>org.codehaus.mojo</groupId>
9292
<artifactId>exec-maven-plugin</artifactId>
93-
<version>1.3.2</version>
93+
<version>1.4.0</version>
9494
<configuration>
9595
<skip>true</skip>
9696
<executable>java</executable>
@@ -125,7 +125,7 @@
125125
<plugin>
126126
<groupId>org.codehaus.mojo</groupId>
127127
<artifactId>exec-maven-plugin</artifactId>
128-
<version>1.3.2</version>
128+
<version>1.4.0</version>
129129
<executions>
130130
<execution>
131131
<goals>
@@ -156,7 +156,7 @@
156156
</plugin>
157157
<plugin>
158158
<artifactId>maven-jar-plugin</artifactId>
159-
<version>2.5</version>
159+
<version>2.6</version>
160160
<configuration>
161161
<archive>
162162
<addMavenDescriptor>true</addMavenDescriptor>
@@ -200,7 +200,7 @@
200200
<plugin>
201201
<groupId>org.apache.maven.plugins</groupId>
202202
<artifactId>maven-javadoc-plugin</artifactId>
203-
<version>2.10.1</version>
203+
<version>2.10.3</version>
204204
<executions>
205205
<execution>
206206
<id>attach-javadocs</id>
@@ -213,7 +213,7 @@
213213
<plugin>
214214
<groupId>org.apache.maven.plugins</groupId>
215215
<artifactId>maven-gpg-plugin</artifactId>
216-
<version>1.5</version>
216+
<version>1.6</version>
217217
<executions>
218218
<execution>
219219
<id>sign-artifacts</id>
@@ -227,7 +227,7 @@
227227
<plugin>
228228
<groupId>org.sonatype.plugins</groupId>
229229
<artifactId>nexus-staging-maven-plugin</artifactId>
230-
<version>1.6.3</version>
230+
<version>1.6.5</version>
231231
<extensions>true</extensions>
232232
<configuration>
233233
<serverId>sonatype-nexus-staging</serverId>
@@ -238,7 +238,7 @@
238238
<plugin>
239239
<groupId>org.eluder.coveralls</groupId>
240240
<artifactId>coveralls-maven-plugin</artifactId>
241-
<version>3.0.1</version>
241+
<version>3.1.0</version>
242242
<configuration>
243243
<coberturaReports>
244244
<coberturaReport>${basedir}/target/coverage.xml</coberturaReport>
@@ -248,7 +248,7 @@
248248
<plugin>
249249
<groupId>org.codehaus.mojo</groupId>
250250
<artifactId>cobertura-maven-plugin</artifactId>
251-
<version>2.6</version>
251+
<version>2.7</version>
252252
<configuration>
253253
<outputDirectory>${basedir}/target</outputDirectory>
254254
<formats>
@@ -271,12 +271,12 @@
271271
<plugin>
272272
<groupId>org.apache.maven.plugins</groupId>
273273
<artifactId>maven-checkstyle-plugin</artifactId>
274-
<version>2.13</version>
274+
<version>2.16</version>
275275
<dependencies>
276276
<dependency>
277277
<groupId>com.puppycrawl.tools</groupId>
278278
<artifactId>checkstyle</artifactId>
279-
<version>6.2</version>
279+
<version>6.8.1</version>
280280
</dependency>
281281
</dependencies>
282282
</plugin>
@@ -331,7 +331,7 @@
331331
<plugin>
332332
<groupId>org.apache.maven.plugins</groupId>
333333
<artifactId>maven-javadoc-plugin</artifactId>
334-
<version>2.10.1</version>
334+
<version>2.10.3</version>
335335
<reportSets>
336336
<reportSet>
337337
<id>html</id>
@@ -355,7 +355,7 @@
355355
<plugin>
356356
<groupId>org.apache.maven.plugins</groupId>
357357
<artifactId>maven-checkstyle-plugin</artifactId>
358-
<version>2.13</version>
358+
<version>2.16</version>
359359
<configuration>
360360
<configLocation>checkstyle.xml</configLocation>
361361
<failOnViolation>false</failOnViolation>
@@ -364,7 +364,7 @@
364364
<plugin>
365365
<groupId>org.codehaus.mojo</groupId>
366366
<artifactId>cobertura-maven-plugin</artifactId>
367-
<version>2.6</version>
367+
<version>2.7</version>
368368
<configuration>
369369
<aggregate>true</aggregate>
370370
</configuration>
@@ -375,7 +375,7 @@
375375
<plugin>
376376
<groupId>com.github.github</groupId>
377377
<artifactId>site-maven-plugin</artifactId>
378-
<version>0.10</version>
378+
<version>0.12</version>
379379
<configuration>
380380
<message>Creating site for ${project.artifactId} ${project.version}</message>
381381
<path>${project.distributionManagement.site.url}</path>

0 commit comments

Comments
 (0)