Skip to content

Commit 9899b9f

Browse files
gguusskurtisvg
gguuss
authored and
kurtisvg
committed
Remove references to java7 (GoogleCloudPlatform#1540)
1 parent 0adc027 commit 9899b9f

File tree

17 files changed

+83
-42
lines changed

17 files changed

+83
-42
lines changed

‎appengine-java8/endpoints-v2-migration/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ endpointsServer {
7272
group = 'com.example.helloendpoints' // Generated output GroupId
7373
version = '1' // Version in generated output
7474

75-
sourceCompatibility = 1.8 // App Engine Standard uses Java 7
76-
targetCompatibility = 1.8 // App Engine Standard uses Java 7
75+
sourceCompatibility = 1.8 // App Engine Standard uses Java 8
76+
targetCompatibility = 1.8 // App Engine Standard uses Java 8

‎appengine-java8/gaeinfo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Copyright 2017 Google Inc.
3232
</parent>
3333

3434
<!-- [START compiler] -->
35-
<properties> <!-- App Engine Standard currently requires Java 7 -->
35+
<properties> <!-- App Engine Standard currently requires Java 8 -->
3636
<maven.compiler.target>1.8</maven.compiler.target>
3737
<maven.compiler.source>1.8</maven.compiler.source>
3838
</properties>

‎appengine/endpoints-frameworks-v2/backend/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ appengine { // App Engine tasks configuration
7272
}
7373
}
7474

75-
sourceCompatibility = 1.7 // App Engine Standard uses Java 7
76-
targetCompatibility = 1.7 // App Engine Standard uses Java 7
75+
sourceCompatibility = 1.8 // App Engine Standard uses Java 8
76+
targetCompatibility = 1.8 // App Engine Standard uses Java 8
7777

7878
// this replaces the ${endpoints.project.id} in appengine-web.xml and web.xml
7979
task replaceProjectId(type: Copy) {

‎appengine/endpoints-frameworks-v2/guice-example/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ appengine { // App Engine tasks configuration
6868
}
6969
}
7070

71-
sourceCompatibility = 1.7 // App Engine Standard uses Java 7
72-
targetCompatibility = 1.7 // App Engine Standard uses Java 7
71+
sourceCompatibility = 1.8 // App Engine Standard uses Java 8
72+
targetCompatibility = 1.8 // App Engine Standard uses Java 8
7373

7474
// this replaces the ${endpoints.project.id} in appengine-web.xml and web.xml
7575
task replaceProjectId(type: Copy) {

‎appengine/endpoints-frameworks-v2/migration-example/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ endpointsServer {
7979
group = 'com.example.helloendpoints' // Generated output GroupId
8080
version = '1' // Version in generated output
8181

82-
sourceCompatibility = 1.7 // App Engine Standard uses Java 7
83-
targetCompatibility = 1.7 // App Engine Standard uses Java 7
82+
sourceCompatibility = 1.8 // App Engine Standard uses Java 8
83+
targetCompatibility = 1.8 // App Engine Standard uses Java 8

‎appengine/gaeinfo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Copyright 2017 Google Inc.
3333

3434

3535
<!-- [START compiler] -->
36-
<properties> <!-- App Engine Standard currently requires Java 7 -->
36+
<properties> <!-- App Engine Standard currently requires Java 8 -->
3737
<maven.compiler.target>1.8</maven.compiler.target>
3838
<maven.compiler.source>1.8</maven.compiler.source>
3939
</properties>

‎appengine/helloworld-new-plugins/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ appengine { // App Engine tasks configuration
5858
group = 'com.example.appengine' // Generated output GroupId
5959
version = '1.0-SNAPSHOT' // Version in generated output
6060

61-
sourceCompatibility = 1.7 // App Engine Standard uses Java 7
62-
targetCompatibility = 1.7 // App Engine Standard uses Java 7
61+
sourceCompatibility = 1.8 // App Engine Standard uses Java 8
62+
targetCompatibility = 1.8 // App Engine Standard uses Java 8

‎appengine/helloworld/pom.xml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,26 @@ Copyright 2015 Google Inc.
5151
<plugins>
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
54-
<version>3.3</version>
5554
<artifactId>maven-compiler-plugin</artifactId>
55+
<version>3.8.1</version>
5656
<configuration>
57-
<source>1.7</source>
58-
<target>1.7</target>
57+
<compilerArgs>
58+
<arg>-XDcompilePolicy=simple</arg>
59+
<arg>-Xplugin:ErrorProne</arg>
60+
</compilerArgs>
61+
<annotationProcessorPaths>
62+
<path>
63+
<groupId>com.google.errorprone</groupId>
64+
<artifactId>error_prone_core</artifactId>
65+
<version>2.3.3</version>
66+
</path>
67+
</annotationProcessorPaths>
5968
</configuration>
6069
</plugin>
61-
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
6270
<plugin>
6371
<groupId>com.google.appengine</groupId>
6472
<artifactId>appengine-maven-plugin</artifactId>
65-
<version>1.9.59</version>
73+
<version>1.9.76</version>
6674
</plugin>
6775
</plugins>
6876
</build>

‎appengine/iap/pom.xml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,26 @@ Copyright 2017 Google Inc.
5050
<plugins>
5151
<plugin>
5252
<groupId>org.apache.maven.plugins</groupId>
53-
<version>3.3</version>
5453
<artifactId>maven-compiler-plugin</artifactId>
54+
<version>3.8.1</version>
5555
<configuration>
56-
<source>1.7</source>
57-
<target>1.7</target>
56+
<compilerArgs>
57+
<arg>-XDcompilePolicy=simple</arg>
58+
<arg>-Xplugin:ErrorProne</arg>
59+
</compilerArgs>
60+
<annotationProcessorPaths>
61+
<path>
62+
<groupId>com.google.errorprone</groupId>
63+
<artifactId>error_prone_core</artifactId>
64+
<version>2.3.3</version>
65+
</path>
66+
</annotationProcessorPaths>
5867
</configuration>
5968
</plugin>
6069
<plugin>
6170
<groupId>com.google.cloud.tools</groupId>
6271
<artifactId>appengine-maven-plugin</artifactId>
63-
<version>1.3.1</version>
72+
<version>1.9.76</version>
6473
</plugin>
6574
</plugins>
6675
</build>

‎appengine/sendgrid/pom.xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,20 @@ Copyright 2015 Google Inc.
6363
</plugin>
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
66-
<version>3.3</version>
6766
<artifactId>maven-compiler-plugin</artifactId>
67+
<version>3.8.1</version>
6868
<configuration>
69-
<source>1.7</source>
70-
<target>1.7</target>
69+
<compilerArgs>
70+
<arg>-XDcompilePolicy=simple</arg>
71+
<arg>-Xplugin:ErrorProne</arg>
72+
</compilerArgs>
73+
<annotationProcessorPaths>
74+
<path>
75+
<groupId>com.google.errorprone</groupId>
76+
<artifactId>error_prone_core</artifactId>
77+
<version>2.3.3</version>
78+
</path>
79+
</annotationProcessorPaths>
7180
</configuration>
7281
</plugin>
7382
</plugins>

‎appengine/sockets/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</parent>
3838

3939
<!-- [START compiler] -->
40-
<properties> <!-- App Engine Standard currently requires Java 7 -->
40+
<properties> <!-- App Engine Standard currently requires Java 8 -->
4141
<maven.compiler.target>1.8</maven.compiler.target>
4242
<maven.compiler.source>1.8</maven.compiler.source>
4343
</properties>

‎appengine/static-files/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Copyright 2015 Google Inc.
5959
<version>3.3</version>
6060
<artifactId>maven-compiler-plugin</artifactId>
6161
<configuration>
62-
<source>1.7</source>
63-
<target>1.7</target>
62+
<source>1.8</source>
63+
<target>1.8</target>
6464
</configuration>
6565
</plugin>
6666
</plugins>

‎appengine/taskqueue/defer-samples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</parent>
3232

3333
<prerequisites>
34-
<maven>3.0</maven>
34+
<maven>3.1.0</maven>
3535
</prerequisites>
3636

3737
<properties>
@@ -120,7 +120,7 @@
120120
<plugin>
121121
<groupId>com.google.appengine</groupId>
122122
<artifactId>appengine-maven-plugin</artifactId>
123-
<version>1.9.59</version>
123+
<version>1.9.76</version>
124124
<configuration>
125125
<enableJarClasses>false</enableJarClasses>
126126
<!-- Comment in the below snippet to bind to all IPs instead of just localhost -->

‎appengine/taskqueue/pull-samples/pom.xml

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ Copyright 2016 Google Inc.
2222
<groupId>com.example.taskqueue</groupId>
2323
<artifactId>taskqueue</artifactId>
2424

25+
<prerequisites>
26+
<maven>3.1.0</maven>
27+
</prerequisites>
2528
<!--
2629
The parent pom defines common style checks and testing strategies for our samples.
2730
Removing or replacing it should not effect the execution of the samples in anyway.
@@ -75,6 +78,26 @@ Copyright 2016 Google Inc.
7578
<!-- for hot reload of the web application-->
7679
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
7780
<plugins>
81+
<plugin>
82+
<groupId>org.apache.maven.plugins</groupId>
83+
<artifactId>maven-enforcer-plugin</artifactId>
84+
<version>3.0.0-M2</version>
85+
<executions>
86+
<execution>
87+
<id>enforce-maven</id>
88+
<goals>
89+
<goal>enforce</goal>
90+
</goals>
91+
<configuration>
92+
<rules>
93+
<requireMavenVersion>
94+
<version>3.0</version>
95+
</requireMavenVersion>
96+
</rules>
97+
</configuration>
98+
</execution>
99+
</executions>
100+
</plugin>
78101
<plugin>
79102
<groupId>org.codehaus.mojo</groupId>
80103
<artifactId>versions-maven-plugin</artifactId>
@@ -88,18 +111,10 @@ Copyright 2016 Google Inc.
88111
</execution>
89112
</executions>
90113
</plugin>
91-
<plugin>
92-
<groupId>org.apache.maven.plugins</groupId>
93-
<artifactId>maven-compiler-plugin</artifactId>
94-
<configuration>
95-
<source>1.7</source>
96-
<target>1.7</target>
97-
</configuration>
98-
</plugin>
99114
<plugin>
100115
<groupId>com.google.appengine</groupId>
101116
<artifactId>appengine-maven-plugin</artifactId>
102-
<version>1.9.59</version>
117+
<version>1.9.76</version>
103118
</plugin>
104119
<plugin>
105120
<groupId>com.google.appengine</groupId>

‎compute/cmdline/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ reuse an existing project by clicking on it.
5959
in to the newly created VM instance.
6060

6161
1. Code checkout instructions:
62-
1. Prerequisites: install [Java 7 or Java 8 JDK][2], [Git][7], and [Maven][8].
62+
1. Prerequisites: install [Java 8 JDK][2], [Git][7], and [Maven][8].
6363
You may need to set your `JAVA_HOME` environment variable as well.
6464
* To install these prerequisites on a Linux (Debian or Ubuntu) based Compute Engine VM
6565
instance, run these commands:

‎datastore/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ This directory contains sample code used in Google Cloud Datastore documentation
88
## Run the `TaskList` sample application.
99

1010
1. Ensure that you have:
11-
* Created a Google Developers Console project with the Datastore API enabled. Follow [these instructions](https://cloud.google.com/docs/authentication#preparation) to get your project set up.
11+
* Created a Google Developers Console project with the Datastore API enabled. Follow [these instructions](https://cloud.google.com/docs/authentication#preparation) to get your project set up.
1212
* Installed the Google Cloud SDK and run the following commands in command line: `gcloud auth application-default login` and `gcloud config set project [YOUR PROJECT ID]`.
13-
* Installed [Maven](https://maven.apache.org/) and Java 7 (or above).
13+
* Installed [Maven](https://maven.apache.org/) and Java 8 (or above).
1414

1515
2. Compile the program by typing `mvn clean compile` in command line.
1616

‎flexible/gaeinfo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Copyright 2017 Google Inc.
3030
<version>1.0.11</version>
3131
</parent>
3232

33-
<properties> <!-- App Engine Standard currently requires Java 7 -->
33+
<properties> <!-- App Engine Standard currently requires Java 8 -->
3434
<maven.compiler.target>1.8</maven.compiler.target>
3535
<maven.compiler.source>1.8</maven.compiler.source>
3636
</properties>

0 commit comments

Comments
 (0)