Skip to content

Commit 7389332

Browse files
lesvlesv
authored
Disable ErrorProne for GAE Standard (GoogleCloudPlatform#536)
1. Disable ErrorProne by adding a appengine/pom.xml 2. Make all appengine/* reference appengine/pom.xml 3. Fix some copyrights 4. Bump GAE to 1.9.49 5. OAuth 1 is no longer supported - remove test 6. Updated CONTRIBUTING.md
1 parent df58057 commit 7389332

File tree

53 files changed

+385
-266
lines changed

Some content is hidden

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

53 files changed

+385
-266
lines changed

‎CONTRIBUTING.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
* [Contributor License Agreements](#Contributor-License-Agreements)
44
* [Contributing a Patch](#Contributing-a-Patch)
5+
* [Contributing a new sample](#Contributing-a-new-sample)
56
* [Build Tools](#build-tools)
67
* [Integration Testing](#testing)
78
* [Style](#Style)
@@ -37,6 +38,17 @@ accept your pull requests.
3738
1. Ensure that your code has an appropriate set of unit tests which all pass.
3839
1. Submit a pull request.
3940

41+
## Contributing a new sample
42+
43+
1. App Engine Standard samples all go into `/appengine` (java 7) or `/java8-appengine` (Java 8) (if your contributing a group of samples,
44+
please put the App Engine Standard sample into `/appengine` and provide a link in both `README.md`'s for
45+
the project for the additional sample.
46+
47+
1. App Engine Flexible samples all go into `/flexible`
48+
49+
1. Technology samples go into the project root.
50+
51+
4052
## Build Tools
4153

4254
All new samples should build and run integration tests with both [Maven](https://maven.apache.org/) and [Gradle](https://gradle.org/).
@@ -66,6 +78,10 @@ test {
6678
}
6779
```
6880

81+
### Keys and Secrets
82+
83+
Please contact a Java DPE for instructions before adding to Travis.
84+
6985
## Style
7086

7187
Samples in this repository follow the [Google Java Style Guide][java-style].

‎appengine/analytics/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2015 Google Inc. All Rights Reserved.
2+
Copyright 2015 Google Inc.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
2121
<artifactId>appengine-analytics</artifactId>
2222

2323
<parent>
24-
<artifactId>doc-samples</artifactId>
24+
<artifactId>appengine-doc-samples</artifactId>
2525
<groupId>com.google.cloud</groupId>
2626
<version>1.0.0</version>
27-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
2828
</parent>
2929
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
3030

‎appengine/appidentity/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2015 Google Inc. All Rights Reserved.
2+
Copyright 2015 Google Inc.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
2222

2323
<parent>
2424
<groupId>com.google.cloud</groupId>
25-
<artifactId>doc-samples</artifactId>
25+
<artifactId>appengine-doc-samples</artifactId>
2626
<version>1.0.0</version>
27-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
2828
</parent>
2929

3030
<properties>

‎appengine/channel/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2015 Google Inc. All Rights Reserved.
2+
Copyright 2015 Google Inc.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
2121
<artifactId>appengine-channel</artifactId>
2222
<parent>
2323
<groupId>com.google.cloud</groupId>
24-
<artifactId>doc-samples</artifactId>
24+
<artifactId>appengine-doc-samples</artifactId>
2525
<version>1.0.0</version>
26-
<relativePath>../..</relativePath>
26+
<relativePath>..</relativePath>
2727
</parent>
2828
<properties>
2929
<objectify.version>5.1.14</objectify.version>

‎appengine/cloudsql/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2016 Google Inc. All Rights Reserved.
2+
Copyright 2016 Google Inc.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
2121
<artifactId>appengine-cloudsql</artifactId>
2222

2323
<parent>
24-
<artifactId>doc-samples</artifactId>
24+
<artifactId>appengine-doc-samples</artifactId>
2525
<groupId>com.google.cloud</groupId>
2626
<version>1.0.0</version>
27-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
2828
</parent>
2929

3030
<!-- [START properties] -->

‎appengine/datastore/indexes-exploding/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2016 Google Inc. All Rights Reserved.
2+
Copyright 2016 Google Inc.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
2222

2323
<parent>
2424
<groupId>com.google.cloud</groupId>
25-
<artifactId>doc-samples</artifactId>
25+
<artifactId>appengine-doc-samples</artifactId>
2626
<version>1.0.0</version>
27-
<relativePath>../../..</relativePath>
27+
<relativePath>../..</relativePath>
2828
</parent>
2929

3030
<dependencies>

‎appengine/datastore/indexes-perfect/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2016 Google Inc. All Rights Reserved.
2+
Copyright 2016 Google Inc.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
2222

2323
<parent>
2424
<groupId>com.google.cloud</groupId>
25-
<artifactId>doc-samples</artifactId>
25+
<artifactId>appengine-doc-samples</artifactId>
2626
<version>1.0.0</version>
27-
<relativePath>../../..</relativePath>
27+
<relativePath>../..</relativePath>
2828
</parent>
2929

3030
<dependencies>

‎appengine/datastore/indexes/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2016 Google Inc. All Rights Reserved.
2+
Copyright 2016 Google Inc.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
2222

2323
<parent>
2424
<groupId>com.google.cloud</groupId>
25-
<artifactId>doc-samples</artifactId>
25+
<artifactId>appengine-doc-samples</artifactId>
2626
<version>1.0.0</version>
27-
<relativePath>../../..</relativePath>
27+
<relativePath>../..</relativePath>
2828
</parent>
2929

3030
<dependencies>

‎appengine/datastore/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2016 Google Inc. All Rights Reserved.
2+
Copyright 2016 Google Inc.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
2222

2323
<parent>
2424
<groupId>com.google.cloud</groupId>
25-
<artifactId>doc-samples</artifactId>
25+
<artifactId>appengine-doc-samples</artifactId>
2626
<version>1.0.0</version>
27-
<relativePath>../..</relativePath>
27+
<relativePath>..</relativePath>
2828
</parent>
2929

3030
<dependencies>

‎appengine/endpoints-frameworks-v2/backend/pom.xml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright 2016 Google Inc. All Rights Reserved.
2+
Copyright 2016 Google Inc.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@
2222
<artifactId>echo</artifactId>
2323

2424
<parent>
25-
<artifactId>doc-samples</artifactId>
25+
<artifactId>appengine-doc-samples</artifactId>
2626
<groupId>com.google.cloud</groupId>
2727
<version>1.0.0</version>
28-
<relativePath>../../..</relativePath>
28+
<relativePath>../..</relativePath>
2929
</parent>
3030

3131
<properties>
@@ -106,21 +106,6 @@
106106
<!-- for hot reload of the web application-->
107107
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
108108
<plugins>
109-
<plugin>
110-
<groupId>org.codehaus.mojo</groupId>
111-
<artifactId>versions-maven-plugin</artifactId>
112-
<version>2.2</version>
113-
<executions>
114-
<execution>
115-
<phase>compile</phase>
116-
<goals>
117-
<goal>display-dependency-updates</goal>
118-
<goal>display-plugin-updates</goal>
119-
</goals>
120-
</execution>
121-
</executions>
122-
</plugin>
123-
124109
<plugin>
125110
<groupId>org.apache.maven.plugins</groupId>
126111
<artifactId>maven-war-plugin</artifactId>

0 commit comments

Comments
 (0)