Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable ErrorProne for GAE Standard #536

Merged
merged 2 commits into from
Feb 24, 2017
Merged

Disable ErrorProne for GAE Standard #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
664d70f
Disable ErrorProne for GAE Standard
Feb 23, 2017
856f1d8
Merge branch 'master' into epsample-j7
lesv Feb 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

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

## Contributing a new sample

1. App Engine Standard samples all go into `/appengine` (java 7) or `/java8-appengine` (Java 8) (if your contributing a group of samples,
please put the App Engine Standard sample into `/appengine` and provide a link in both `README.md`'s for
the project for the additional sample.

1. App Engine Flexible samples all go into `/flexible`

1. Technology samples go into the project root.


## Build Tools

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

### Keys and Secrets

Please contact a Java DPE for instructions before adding to Travis.

## Style

Samples in this repository follow the [Google Java Style Guide][java-style].
Expand Down
6 changes: 3 additions & 3 deletions appengine/analytics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2015 Google Inc. All Rights Reserved.
Copyright 2015 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -21,10 +21,10 @@
<artifactId>appengine-analytics</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->

Expand Down
6 changes: 3 additions & 3 deletions appengine/appidentity/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2015 Google Inc. All Rights Reserved.
Copyright 2015 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -22,9 +22,9 @@

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<properties>
Expand Down
6 changes: 3 additions & 3 deletions appengine/channel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2015 Google Inc. All Rights Reserved.
Copyright 2015 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -21,9 +21,9 @@
<artifactId>appengine-channel</artifactId>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>
<properties>
<objectify.version>5.1.14</objectify.version>
Expand Down
6 changes: 3 additions & 3 deletions appengine/cloudsql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Copyright 2016 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -21,10 +21,10 @@
<artifactId>appengine-cloudsql</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<!-- [START properties] -->
Expand Down
6 changes: 3 additions & 3 deletions appengine/datastore/indexes-exploding/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Copyright 2016 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -22,9 +22,9 @@

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>../../..</relativePath>
<relativePath>../..</relativePath>
</parent>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions appengine/datastore/indexes-perfect/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Copyright 2016 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -22,9 +22,9 @@

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>../../..</relativePath>
<relativePath>../..</relativePath>
</parent>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions appengine/datastore/indexes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Copyright 2016 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -22,9 +22,9 @@

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>../../..</relativePath>
<relativePath>../..</relativePath>
</parent>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions appengine/datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Copyright 2016 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -22,9 +22,9 @@

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<dependencies>
Expand Down
21 changes: 3 additions & 18 deletions appengine/endpoints-frameworks-v2/backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Copyright 2016 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -22,10 +22,10 @@
<artifactId>echo</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../../..</relativePath>
<relativePath>../..</relativePath>
</parent>

<properties>
Expand Down Expand Up @@ -106,21 +106,6 @@
<!-- for hot reload of the web application-->
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>display-dependency-updates</goal>
<goal>display-plugin-updates</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions appengine/endpoints-frameworks-v2/discovery/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<!--
Copyright 2017 Google Inc.

Expand All @@ -15,6 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<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">
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
Expand All @@ -23,10 +23,10 @@ limitations under the License.
<artifactId>helloendpoints</artifactId>

<parent>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>../../..</relativePath>
<relativePath>../..</relativePath>
</parent>

<properties>
Expand Down
8 changes: 5 additions & 3 deletions appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<!--
Copyright 2015 Google Inc. All Rights Reserved.
Copyright 2015 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -20,9 +22,9 @@

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>../../..</relativePath>
<relativePath>../..</relativePath>
</parent>

<properties>
Expand Down
6 changes: 3 additions & 3 deletions appengine/firebase-tictactoe/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2015 Google Inc. All Rights Reserved.
Copyright 2015 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -21,9 +21,9 @@
<artifactId>appengine-firebase-tictactoe</artifactId>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>
<properties>
<objectify.version>5.1.14</objectify.version>
Expand Down
19 changes: 17 additions & 2 deletions appengine/guestbook-cloud-datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2016 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
Expand All @@ -14,9 +29,9 @@
</properties>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<!-- [START set_versions] -->
Expand Down
19 changes: 17 additions & 2 deletions appengine/guestbook-objectify/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2015 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<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">

<modelVersion>4.0.0</modelVersion>
Expand All @@ -13,9 +28,9 @@
</properties>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<!-- [START set_versions] -->
Expand Down
6 changes: 3 additions & 3 deletions appengine/helloworld-new-plugins/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2015 Google Inc. All Rights Reserved.
Copyright 2015 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,9 +30,9 @@ Copyright 2015 Google Inc. All Rights Reserved.

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>doc-samples</artifactId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>../..</relativePath>
<relativePath>..</relativePath>
</parent>

<dependencies>
Expand Down
Loading