Skip to content

Commit

Permalink
Cleaned appengine/users
Browse files Browse the repository at this point in the history
  • Loading branch information
@kurtisvg
kurtisvg committed Dec 21, 2017
1 parent fd55257 commit d589729
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 218 deletions.
4 changes: 4 additions & 0 deletions appengine/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
December 13, 2017 and will be shut down entirely on January 16, 2019. It is replaced by the
[Java 8 Runtime Environment](https://cloud.google.com/appengine/docs/standard/java/runtime-java8).**

<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine/README.md">
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>


Samples for the Java 8 runtime can be found [here](/appengine-java8).


Expand Down
92 changes: 5 additions & 87 deletions appengine/datastore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,92 +35,10 @@
<maven.compiler.source>1.7</maven.compiler.source>
</properties>

<dependencies>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.9.59</version>
</dependency>
<modules>
<module>indexes</module>
<module>indexes-exploding</module>
<module>indexes-perfect</module>
</modules>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>1.5.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId> <!-- @Nullable annotations -->
<version>3.0.2</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
</dependency>

<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.9.9</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.37</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<!-- for hot reload of the web application -->
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
<plugins>
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>1.9.59</version>
</plugin>
</plugins>
</build>
</project>
15 changes: 6 additions & 9 deletions appengine/endpoints-v1-helloworld/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,12 @@
<parent>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.7</version>
</parent>


<properties>
<appengine.app.version>1</appengine.app.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<appengine.plugin.version>1.9.59</appengine.plugin.version>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
Expand All @@ -50,12 +47,12 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.plugin.version}</version>
<version>1.9.59</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-endpoints</artifactId>
<version>${appengine.plugin.version}</version>
<version>1.9.59</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -85,13 +82,13 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>${appengine.plugin.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>${appengine.plugin.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -138,7 +135,7 @@
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>${appengine.plugin.version}</version>
<version>1.9.59</version>
<configuration>
<enableJarClasses>false</enableJarClasses>
<!-- Comment in the below snippet to bind to all IPs instead of just localhost -->
Expand Down
85 changes: 1 addition & 84 deletions appengine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,12 @@
<artifactId>appengine-doc-samples</artifactId>
<packaging>pom</packaging>

<!-- Parent POM defines common plugins and properties. -->
<parent>
<artifactId>doc-samples</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.0.0</version>
<relativePath>..</relativePath>
</parent>

<properties>
<appengine.sdk.version>1.9.59</appengine.sdk.version>
<appengine.app.version>1</appengine.app.version>

<project.http.version>1.19.0</project.http.version>
<project.oauth.version>1.19.0</project.oauth.version>

<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
</properties>

<modules>
<!-- App Engine Standard -->
<module>analytics</module>
<module>appidentity</module>
<module>cloudsql</module>
<module>datastore</module>
<module>datastore/indexes</module>
<module>datastore/indexes-exploding</module>
<module>datastore/indexes-perfect</module>

<module>endpoints-frameworks-v2/backend</module>
<module>endpoints-frameworks-v2/migration-example</module>
Expand All @@ -58,9 +36,7 @@

<module>firebase-event-proxy/gae-firebase-event-proxy</module>
<module>firebase-tictactoe</module>

<module>gaeinfo</module>

<module>guestbook-cloud-datastore</module>
<module>guestbook-objectify</module>
<module>helloworld</module>
Expand All @@ -69,7 +45,6 @@
<module>images</module>
<module>logs</module>
<module>mail</module>

<module>mailgun</module>
<module>mailjet</module>
<module>memcache</module>
Expand All @@ -79,74 +54,16 @@
<module>requests</module>
<module>search</module>
<module>sendgrid</module>

<module>remote/remote-client</module>
<module>remote/remote-server</module>

<module>sockets</module>

<module>static-files</module>
<module>taskqueue</module>
<module>twilio</module>
<module>urlfetch</module>
<module>users</module>
</modules>

<dependencyManagement>
<dependencies>
<!-- Compile/runtime dependencies -->
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.sdk.version}</version>
</dependency>

<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.13.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-matchers</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>${appengine.sdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>${appengine.sdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins> <!-- DISABLE ErrorProne - until we move to Java 8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration combine.self="override" />
</plugin>
</plugins>
</build>
</project>
32 changes: 19 additions & 13 deletions appengine/users/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,30 @@ Copyright 2015 Google Inc.
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">
<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>
<groupId>com.example.appengine</groupId>
<artifactId>appengine-users</artifactId>
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->

<!--
The parent pom defines common style checks and testing strategies for our samples.
Removing or replacing it should not effect the execution of the samples in anyway.
-->
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>appengine-doc-samples</artifactId>
<version>1.0.0</version>
<relativePath>..</relativePath>
<groupId>com.google.cloud.samples</groupId>
<artifactId>shared-configuration</artifactId>
<version>1.0.7</version>
</parent>

<dependencies>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -67,19 +72,19 @@ Copyright 2015 Google Inc.
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -92,7 +97,8 @@ Copyright 2015 Google Inc.
</dependencies>
<build>
<!-- for hot reload of the web application -->
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes
</outputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -106,7 +112,7 @@ Copyright 2015 Google Inc.
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>${appengine.sdk.version}</version>
<version>1.9.59</version>
</plugin>
</plugins>
</build>
Expand Down
Loading

0 comments on commit d589729

Please sign in to comment.