Skip to content

Commit 93cc505

Browse files
committed
Cleaned root pom and other minor fixes.
1 parent d589729 commit 93cc505

File tree

7 files changed

+26
-8
lines changed

7 files changed

+26
-8
lines changed

appengine/analytics/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<!-- for hot reload of the web application -->
5959
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
6060
<plugins>
61-
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
6261
<plugin>
6362
<groupId>com.google.appengine</groupId>
6463
<artifactId>appengine-maven-plugin</artifactId>

appengine/datastore/indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ public void doGet_emptyDatastore_writesNoWidgets() throws Exception {
8484

8585
@Test
8686
public void doGet_repeatedPropertyEntities_writesWidgets() throws Exception {
87+
//CHECKSTYLE.OFF: VariableDeclarationUsageDistance - readability
8788
DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
89+
//CHECKSTYLE.ON: VariableDeclarationUsageDistance
8890
// [START exploding_index_example_3]
8991
Entity widget = new Entity("Widget");
9092
widget.setProperty("x", Arrays.asList(1, 2, 3, 4));

appengine/datastore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
-->
1616
<project>
1717
<modelVersion>4.0.0</modelVersion>
18-
<packaging>war</packaging>
18+
<packaging>pom</packaging>
1919
<version>1.0-SNAPSHOT</version>
2020
<groupId>com.example.appengine</groupId>
2121
<artifactId>appengine-datastore</artifactId>

appengine/firebase-tictactoe/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
<version>1.0.7</version>
3131
</parent>
3232

33+
<properties>
34+
<maven.compiler.target>1.7</maven.compiler.target>
35+
<maven.compiler.source>1.7</maven.compiler.source>
36+
</properties>
37+
3338
<dependencies>
3439
<dependency>
3540
<groupId>com.googlecode.objectify</groupId>

appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.junit.After;
4646
import org.junit.Before;
4747
import org.junit.BeforeClass;
48+
import org.junit.Ignore;
4849
import org.junit.Test;
4950
import org.junit.runner.RunWith;
5051
import org.junit.runners.JUnit4;
@@ -148,6 +149,7 @@ public LowLevelHttpResponse execute() throws IOException {
148149
eq("PATCH"), Matchers.matches(FIREBASE_DB_URL + "/channels/[\\w-]+.json$"));
149150
}
150151

152+
@Ignore
151153
public void doPost_notMyTurn_move() throws Exception {
152154
// Insert a game
153155
Objectify ofy = ObjectifyService.ofy();

appengine/pom.xml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,22 @@
1414
limitations under the License.
1515
-->
1616
<project>
17-
<modelVersion>4.0.0</modelVersion>
18-
<version>1.0.0</version>
17+
<modelVersion>4.0.0</modelVersion>
18+
<version>1.0.0</version>
19+
<groupId>com.google.cloud</groupId>
20+
<artifactId>appengine-doc-samples</artifactId>
21+
<packaging>pom</packaging>
22+
23+
<!--
24+
The parent pom defines common style checks and testing strategies for our samples.
25+
Removing or replacing it should not effect the execution of the samples in anyway.
26+
-->
27+
<parent>
28+
<groupId>com.google.cloud.samples</groupId>
29+
<artifactId>shared-configuration</artifactId>
30+
<version>1.0.7</version>
31+
</parent>
1932

20-
<groupId>com.google.cloud</groupId>
21-
<artifactId>appengine-doc-samples</artifactId>
22-
<packaging>pom</packaging>
2333

2434
<modules>
2535
<!-- App Engine Standard -->

appengine/taskqueue/pull-samples/src/main/java/com/example/taskqueue/TaskqueueServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import javax.servlet.http.HttpServletRequest;
3030
import javax.servlet.http.HttpServletResponse;
3131

32-
/**
32+
/*
3333
* Form Handling Servlet
3434
* This servlet has one method
3535
* {@link #doPost(<#HttpServletRequest req#>, <#HttpServletResponse resp#>)} which takes the form

0 commit comments

Comments
 (0)