Skip to content

Commit a08aeb9

Browse files
mziccardmziccard
committed
---
yaml --- r: 2339 b: refs/heads/update-datastore c: fdb2402 h: refs/heads/master i: 2337: 024b028 2335: b5703d7
1 parent ced3edf commit a08aeb9

17 files changed

Lines changed: 1097 additions & 15 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
66
refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
8-
refs/heads/update-datastore: ff9f60cb609f18da1c40f69fd5db5e8c6ae97ecd
8+
refs/heads/update-datastore: fdb2402b1ea90fc1cfc4631005563c08887fdfd3
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
1010
refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
1111
refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2

‎branches/update-datastore/gcloud-java-core/pom.xml‎

Lines changed: 98 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<artifactId>gcloud-java-pom</artifactId>
1414
<version>0.0.11-SNAPSHOT</version>
1515
</parent>
16-
<properties>
17-
<site.installationModule>gcloud-java-core</site.installationModule>
18-
</properties>
1916
<dependencies>
2017
<dependency>
2118
<groupId>com.google.auth</groupId>
@@ -93,4 +90,102 @@
9390
<scope>test</scope>
9491
</dependency>
9592
</dependencies>
93+
<build>
94+
<plugins>
95+
<plugin>
96+
<groupId>org.apache.maven.plugins</groupId>
97+
<artifactId>maven-site-plugin</artifactId>
98+
<version>3.4</version>
99+
<configuration>
100+
<skipDeploy>true</skipDeploy>
101+
<reportPlugins>
102+
<plugin>
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-changelog-plugin</artifactId>
105+
<version>2.3</version>
106+
</plugin>
107+
<plugin>
108+
<groupId>org.apache.maven.plugins</groupId>
109+
<artifactId>maven-project-info-reports-plugin</artifactId>
110+
<version>2.8</version>
111+
<reportSets>
112+
<reportSet>
113+
<reports>
114+
<report>index</report>
115+
<report>dependency-info</report>
116+
<report>dependencies</report>
117+
<report>dependency-convergence</report>
118+
<report>project-team</report>
119+
<report>mailing-list</report>
120+
<report>cim</report>
121+
<report>issue-tracking</report>
122+
<report>license</report>
123+
<report>scm</report>
124+
<report>dependency-management</report>
125+
<report>distribution-management</report>
126+
<report>summary</report>
127+
<report>modules</report>
128+
</reports>
129+
</reportSet>
130+
</reportSets>
131+
<configuration>
132+
<aggregate>true</aggregate>
133+
<quiet>true</quiet>
134+
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
135+
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
136+
<artifactId>gcloud-java-core</artifactId>
137+
<packaging>jar</packaging>
138+
</configuration>
139+
</plugin>
140+
<plugin>
141+
<groupId>org.apache.maven.plugins</groupId>
142+
<artifactId>maven-dependency-plugin</artifactId>
143+
<version>2.10</version>
144+
</plugin>
145+
<plugin>
146+
<groupId>org.apache.maven.plugins</groupId>
147+
<artifactId>maven-javadoc-plugin</artifactId>
148+
<version>2.10.3</version>
149+
<reportSets>
150+
<reportSet>
151+
<id>html</id>
152+
<reports>
153+
<report>javadoc</report>
154+
</reports>
155+
</reportSet>
156+
</reportSets>
157+
<configuration>
158+
<aggregate>true</aggregate>
159+
<show>protected</show>
160+
<nohelp>true</nohelp>
161+
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
162+
</configuration>
163+
</plugin>
164+
<plugin>
165+
<groupId>org.apache.maven.plugins</groupId>
166+
<artifactId>maven-surefire-report-plugin</artifactId>
167+
<version>2.18.1</version>
168+
</plugin>
169+
<plugin>
170+
<groupId>org.apache.maven.plugins</groupId>
171+
<artifactId>maven-checkstyle-plugin</artifactId>
172+
<version>2.16</version>
173+
<configuration>
174+
<configLocation>checkstyle.xml</configLocation>
175+
<failOnViolation>false</failOnViolation>
176+
</configuration>
177+
</plugin>
178+
<plugin>
179+
<groupId>org.codehaus.mojo</groupId>
180+
<artifactId>cobertura-maven-plugin</artifactId>
181+
<version>2.7</version>
182+
<configuration>
183+
<aggregate>true</aggregate>
184+
</configuration>
185+
</plugin>
186+
</reportPlugins>
187+
</configuration>
188+
</plugin>
189+
</plugins>
190+
</build>
96191
</project>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,8 @@ private static boolean isWindows() {
411411
}
412412

413413
protected static String getAppEngineProjectId() {
414+
// TODO(ozarov): An alternative to reflection would be to depend on AE api jar:
415+
// http://mvnrepository.com/artifact/com.google.appengine/appengine-api-1.0-sdk/1.2.0
414416
try {
415417
Class<?> factoryClass =
416418
Class.forName("com.google.appengine.api.appidentity.AppIdentityServiceFactory");

‎branches/update-datastore/gcloud-java-datastore/pom.xml‎

Lines changed: 98 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<artifactId>gcloud-java-pom</artifactId>
1414
<version>0.0.11-SNAPSHOT</version>
1515
</parent>
16-
<properties>
17-
<site.installationModule>gcloud-java-datastore</site.installationModule>
18-
</properties>
1916
<dependencies>
2017
<dependency>
2118
<groupId>${project.groupId}</groupId>
@@ -41,4 +38,102 @@
4138
<scope>test</scope>
4239
</dependency>
4340
</dependencies>
41+
<build>
42+
<plugins>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-site-plugin</artifactId>
46+
<version>3.4</version>
47+
<configuration>
48+
<skipDeploy>true</skipDeploy>
49+
<reportPlugins>
50+
<plugin>
51+
<groupId>org.apache.maven.plugins</groupId>
52+
<artifactId>maven-changelog-plugin</artifactId>
53+
<version>2.3</version>
54+
</plugin>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-project-info-reports-plugin</artifactId>
58+
<version>2.8</version>
59+
<reportSets>
60+
<reportSet>
61+
<reports>
62+
<report>index</report>
63+
<report>dependency-info</report>
64+
<report>dependencies</report>
65+
<report>dependency-convergence</report>
66+
<report>project-team</report>
67+
<report>mailing-list</report>
68+
<report>cim</report>
69+
<report>issue-tracking</report>
70+
<report>license</report>
71+
<report>scm</report>
72+
<report>dependency-management</report>
73+
<report>distribution-management</report>
74+
<report>summary</report>
75+
<report>modules</report>
76+
</reports>
77+
</reportSet>
78+
</reportSets>
79+
<configuration>
80+
<aggregate>true</aggregate>
81+
<quiet>true</quiet>
82+
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
83+
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
84+
<artifactId>gcloud-java-datastore</artifactId>
85+
<packaging>jar</packaging>
86+
</configuration>
87+
</plugin>
88+
<plugin>
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-dependency-plugin</artifactId>
91+
<version>2.10</version>
92+
</plugin>
93+
<plugin>
94+
<groupId>org.apache.maven.plugins</groupId>
95+
<artifactId>maven-javadoc-plugin</artifactId>
96+
<version>2.10.3</version>
97+
<reportSets>
98+
<reportSet>
99+
<id>html</id>
100+
<reports>
101+
<report>javadoc</report>
102+
</reports>
103+
</reportSet>
104+
</reportSets>
105+
<configuration>
106+
<aggregate>true</aggregate>
107+
<show>protected</show>
108+
<nohelp>true</nohelp>
109+
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
110+
</configuration>
111+
</plugin>
112+
<plugin>
113+
<groupId>org.apache.maven.plugins</groupId>
114+
<artifactId>maven-surefire-report-plugin</artifactId>
115+
<version>2.18.1</version>
116+
</plugin>
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-checkstyle-plugin</artifactId>
120+
<version>2.16</version>
121+
<configuration>
122+
<configLocation>checkstyle.xml</configLocation>
123+
<failOnViolation>false</failOnViolation>
124+
</configuration>
125+
</plugin>
126+
<plugin>
127+
<groupId>org.codehaus.mojo</groupId>
128+
<artifactId>cobertura-maven-plugin</artifactId>
129+
<version>2.7</version>
130+
<configuration>
131+
<aggregate>true</aggregate>
132+
</configuration>
133+
</plugin>
134+
</reportPlugins>
135+
</configuration>
136+
</plugin>
137+
</plugins>
138+
</build>
44139
</project>

‎branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ public String namespace() {
172172
}
173173

174174
private static String defaultNamespace() {
175+
// TODO(ozarov): An alternative to reflection would be to depend on AE api jar:
176+
// http://mvnrepository.com/artifact/com.google.appengine/appengine-api-1.0-sdk/1.2.0
175177
try {
176178
Class<?> clazz = Class.forName("com.google.appengine.api.NamespaceManager");
177179
Method method = clazz.getMethod("get");

‎branches/update-datastore/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ public void testRunStructuredQuery() {
459459
assertEquals("Dan", entity.getString("name"));
460460
assertEquals(2, entity.properties().size());
461461
assertFalse(results4.hasNext());
462+
// TODO(ozarov): construct a test to verify nextQuery/pagination
462463
}
463464

464465
@Test

‎branches/update-datastore/gcloud-java-examples/pom.xml‎

Lines changed: 94 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<artifactId>gcloud-java-pom</artifactId>
1414
<version>0.0.11-SNAPSHOT</version>
1515
</parent>
16-
<properties>
17-
<site.installationModule>gcloud-java-examples</site.installationModule>
18-
</properties>
1916
<dependencies>
2017
<dependency>
2118
<groupId>${project.groupId}</groupId>
@@ -32,6 +29,100 @@
3229
<skip>false</skip>
3330
</configuration>
3431
</plugin>
32+
<plugin>
33+
<groupId>org.apache.maven.plugins</groupId>
34+
<artifactId>maven-site-plugin</artifactId>
35+
<version>3.4</version>
36+
<configuration>
37+
<skipDeploy>true</skipDeploy>
38+
<reportPlugins>
39+
<plugin>
40+
<groupId>org.apache.maven.plugins</groupId>
41+
<artifactId>maven-changelog-plugin</artifactId>
42+
<version>2.3</version>
43+
</plugin>
44+
<plugin>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<artifactId>maven-project-info-reports-plugin</artifactId>
47+
<version>2.8</version>
48+
<reportSets>
49+
<reportSet>
50+
<reports>
51+
<report>index</report>
52+
<report>dependency-info</report>
53+
<report>dependencies</report>
54+
<report>dependency-convergence</report>
55+
<report>project-team</report>
56+
<report>mailing-list</report>
57+
<report>cim</report>
58+
<report>issue-tracking</report>
59+
<report>license</report>
60+
<report>scm</report>
61+
<report>dependency-management</report>
62+
<report>distribution-management</report>
63+
<report>summary</report>
64+
<report>modules</report>
65+
</reports>
66+
</reportSet>
67+
</reportSets>
68+
<configuration>
69+
<aggregate>true</aggregate>
70+
<quiet>true</quiet>
71+
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
72+
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
73+
<artifactId>gcloud-java-examples</artifactId>
74+
<packaging>jar</packaging>
75+
</configuration>
76+
</plugin>
77+
<plugin>
78+
<groupId>org.apache.maven.plugins</groupId>
79+
<artifactId>maven-dependency-plugin</artifactId>
80+
<version>2.10</version>
81+
</plugin>
82+
<plugin>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-javadoc-plugin</artifactId>
85+
<version>2.10.3</version>
86+
<reportSets>
87+
<reportSet>
88+
<id>html</id>
89+
<reports>
90+
<report>javadoc</report>
91+
</reports>
92+
</reportSet>
93+
</reportSets>
94+
<configuration>
95+
<aggregate>true</aggregate>
96+
<show>protected</show>
97+
<nohelp>true</nohelp>
98+
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
99+
</configuration>
100+
</plugin>
101+
<plugin>
102+
<groupId>org.apache.maven.plugins</groupId>
103+
<artifactId>maven-surefire-report-plugin</artifactId>
104+
<version>2.18.1</version>
105+
</plugin>
106+
<plugin>
107+
<groupId>org.apache.maven.plugins</groupId>
108+
<artifactId>maven-checkstyle-plugin</artifactId>
109+
<version>2.16</version>
110+
<configuration>
111+
<configLocation>checkstyle.xml</configLocation>
112+
<failOnViolation>false</failOnViolation>
113+
</configuration>
114+
</plugin>
115+
<plugin>
116+
<groupId>org.codehaus.mojo</groupId>
117+
<artifactId>cobertura-maven-plugin</artifactId>
118+
<version>2.7</version>
119+
<configuration>
120+
<aggregate>true</aggregate>
121+
</configuration>
122+
</plugin>
123+
</reportPlugins>
124+
</configuration>
125+
</plugin>
35126
</plugins>
36127
</build>
37128
</project>

0 commit comments

Comments
 (0)