Skip to content

Commit 2cfe0b6

Browse files
ludochgae-java-bot
authored andcommitted
Upgrade App Engine Standard components to Java 17, using parent inherited compiler configs.
PiperOrigin-RevId: 856225844 Change-Id: I08b9a01aa672a269989ae343e20e7f989af81d51
1 parent 38a02bd commit 2cfe0b6

File tree

6 files changed

+1
-33
lines changed

6 files changed

+1
-33
lines changed

api/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@
227227
<projectname>${project.artifactId}</projectname>
228228
<excludeclasses />
229229
<excludePackages>com\.google\.appengine\.httpapiproxy.*:com\.google\.appengine\.api\.internal.*:com\.google\.storage\.onestore.*:com\.google\.api\.client\.findbugs.*:com\.google\.apphosting\.utils.*</excludePackages>
230-
<source>8</source>
231230
<!-- Filed https://github.com/googleapis/java-docfx-doclet/issues/105 -->
232231
<docletPath>${user.home}/Downloads/java-docfx-doclet-1.8.0-jar-with-dependencies.jar</docletPath>
233232
</properties>
@@ -236,7 +235,6 @@
236235
<plugin>
237236
<groupId>org.apache.maven.plugins</groupId>
238237
<artifactId>maven-javadoc-plugin</artifactId>
239-
<version>3.12.0</version>
240238
<configuration>
241239
<doclet>com.microsoft.doclet.DocFxDoclet</doclet>
242240
<useStandardDocletOptions>false</useStandardDocletOptions>
@@ -255,8 +253,6 @@
255253
<doclint>none</doclint>
256254
<show>protected</show>
257255
<nohelp>true</nohelp>
258-
<source>${source}</source>
259-
260256
</configuration>
261257
</plugin>
262258
<plugin>

appengine_jsr107/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,4 @@
6767
<scope>test</scope>
6868
</dependency>
6969
</dependencies>
70-
<properties>
71-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
72-
<maven.compiler.source>8</maven.compiler.source>
73-
<maven.compiler.target>8</maven.compiler.target>
74-
</properties>
7570
</project>

appengine_setup/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
<description>DO NOT USE - Presently in Beta Mode. Library to help setup AppEngine features (bundled services, session management, etc).</description>
3838

3939
<properties>
40-
<maven.compiler.source>8</maven.compiler.source>
41-
<maven.compiler.target>8</maven.compiler.target>
4240
<maven.deploy.skip>true</maven.deploy.skip>
4341
</properties>
4442
</project>

applications/proberapp/pom.xml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<DB_PASSOWRD>prober_connectivity_test_database</DB_PASSOWRD>
4343
<gax.version>2.72.2</gax.version>
4444
<appengine.target.version>${project.version}</appengine.target.version>
45-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4645
<appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
4746
</properties>
4847

@@ -213,8 +212,6 @@
213212
<plugin>
214213
<groupId>org.apache.maven.plugins</groupId>
215214
<artifactId>maven-dependency-plugin</artifactId>
216-
<!-- TODO it would good to have this version only in pluginManagement in top pom -->
217-
<version>3.9.0</version>
218215
<executions>
219216
<execution>
220217
<id>copy-file</id>
@@ -261,17 +258,10 @@
261258
<automaticRestart>true</automaticRestart>
262259
</configuration>
263260
</plugin>
264-
<plugin>
265-
<artifactId>maven-compiler-plugin</artifactId>
266-
<version>3.14.1</version>
267-
<configuration>
268-
<release>8</release>
269-
</configuration>
270-
</plugin>
261+
271262
<plugin>
272263
<groupId>org.apache.maven.plugins</groupId>
273264
<artifactId>maven-enforcer-plugin</artifactId>
274-
<version>3.6.2</version>
275265
<executions>
276266
<execution>
277267
<id>enforce-maven</id>

e2etests/testlocalapps/bundle_standard/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@
3333
<description>A sample application that bundles the standard App Engine API.</description>
3434

3535
<properties>
36-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3736
<maven.deploy.skip>true</maven.deploy.skip>
3837
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
39-
<maven.compiler.target>1.8</maven.compiler.target>
40-
<maven.compiler.source>1.8</maven.compiler.source>
4138
</properties>
4239

4340
<dependencies>

runtime/nogaeapiswebappjakarta/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<properties>
3535
<maven.deploy.skip>true</maven.deploy.skip>
3636
<appengine.app.version>1</appengine.app.version>
37-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3837
</properties>
3938

4039
<dependencies>
@@ -64,13 +63,6 @@
6463
</webResources>
6564
</configuration>
6665
</plugin>
67-
<plugin>
68-
<artifactId>maven-compiler-plugin</artifactId>
69-
<version>3.14.1</version>
70-
<configuration>
71-
<release>8</release>
72-
</configuration>
73-
</plugin>
7466
</plugins>
7567
</build>
7668

0 commit comments

Comments
 (0)