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>

0 commit comments

Comments
 (0)