Skip to content

Commit 6ca6ea4

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
I diffed the resulting jars before and after this change, and they match. RELNOTES=n/a PiperOrigin-RevId: 903233368
1 parent 1273831 commit 6ca6ea4

3 files changed

Lines changed: 25 additions & 20 deletions

File tree

android/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
6565
<failureaccess.version>1.0.3</failureaccess.version>
6666
<gummy-bears-api-23-version>0.12.0</gummy-bears-api-23-version>
67-
<gwt-maven-plugin.version>2.10.0</gwt-maven-plugin.version>
67+
<gwt-maven-plugin.version>1.1.0</gwt-maven-plugin.version>
6868
<gwt.version>2.13.0</gwt.version>
6969
<j2objc.version>3.1</j2objc.version>
7070
<java18-signature.version>1.0</java18-signature.version>

guava-gwt/pom.xml

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<groupId>org.gwtproject</groupId>
7171
<artifactId>gwt-user</artifactId>
7272
<version>${gwt.version}</version>
73-
<scope>test</scope>
73+
<scope>provided</scope>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.google.truth</groupId>
@@ -302,9 +302,8 @@
302302
</execution>
303303
</executions>
304304
</plugin>
305-
<!-- TODO(cpovirk): We really should try tbroyer's plugin instead of this legacy one. -->
306305
<plugin>
307-
<groupId>org.codehaus.mojo</groupId>
306+
<groupId>net.ltgt.gwt.maven</groupId>
308307
<artifactId>gwt-maven-plugin</artifactId>
309308
<version>${gwt-maven-plugin.version}</version>
310309
<executions>
@@ -314,18 +313,22 @@
314313
<goal>compile</goal>
315314
</goals>
316315
<configuration>
317-
<module>com.google.common.ForceGuavaCompilation</module>
316+
<moduleName>com.google.common.ForceGuavaCompilation</moduleName>
318317
<failOnError>true</failOnError>
319318
<logLevel>${gwt.logLevel}</logLevel>
320-
<generateJsInteropExports>true</generateJsInteropExports>
321-
<validateOnly>true</validateOnly>
319+
<compilerArgs>
320+
<arg>-generateJsInteropExports</arg>
321+
<arg>-validateOnly</arg>
322+
</compilerArgs>
322323
<sourceLevel>1.8</sourceLevel>
323324
<!--
324325
To avoid "java.io.IOException: User limit of inotify watches reached" under JDK10.
325326
Presumably we don't need inotify, since we don't intend to change files during the
326327
build?
327328
-->
328-
<extraJvmArgs>-Dgwt.watchFileChanges=false</extraJvmArgs>
329+
<jvmArgs>
330+
<arg>-Dgwt.watchFileChanges=false</arg>
331+
</jvmArgs>
329332
</configuration>
330333
</execution>
331334
<!--
@@ -367,20 +370,22 @@
367370
<goal>test</goal>
368371
</goals>
369372
<configuration>
370-
<module>com.google.common.GuavaTests</module>
373+
<moduleName>com.google.common.GuavaTests</moduleName>
371374
<includes>**/GwtTestSuite.java</includes>
372375
<logLevel>${gwt.logLevel}</logLevel>
373-
<mode>htmlunit</mode>
374-
<htmlunit>FF38</htmlunit>
375-
<productionMode>true</productionMode>
376-
<!-- Fix OutOfMemoryError under Travis. -->
377-
<extraJvmArgs>-Xms3500m -Xmx3500m -Xss1024k</extraJvmArgs>
378-
<sourceLevel>1.8</sourceLevel>
379-
<!-- Keep these timeouts very large because, if we hit the timeout, the tests silently pass :( -->
380-
<testTimeOut>86400 <!-- seconds --></testTimeOut>
381-
<testMethodTimeout>1440 <!-- minutes --></testMethodTimeout>
376+
<testArgs>
377+
<arg>-prod</arg>
378+
<arg>-runStyle</arg>
379+
<arg>HtmlUnit:FF38</arg>
380+
<!-- Keep these timeouts very large because, if we hit the timeout, the tests silently pass :( -->
381+
<arg>-testTimeOut</arg>
382+
<arg>86400 <!-- seconds --></arg>
383+
<arg>-testMethodTimeout</arg>
384+
<arg>1440 <!-- minutes --></arg>
385+
</testArgs>
382386
<!-- Presumably we want watchFileChanges=false here, since we want it for compile: -->
383-
<extraJvmArgs>-Dgwt.watchFileChanges=false</extraJvmArgs>
387+
<argLine>-Xms3500m -Xmx3500m -Xss1024k -Dgwt.watchFileChanges=false</argLine>
388+
<sourceLevel>1.8</sourceLevel>
384389
</configuration>
385390
</execution>
386391
</executions>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
6666
<failureaccess.version>1.0.3</failureaccess.version>
6767
<gummy-bears-api-23-version>0.12.0</gummy-bears-api-23-version>
68-
<gwt-maven-plugin.version>2.10.0</gwt-maven-plugin.version>
68+
<gwt-maven-plugin.version>1.1.0</gwt-maven-plugin.version>
6969
<gwt.version>2.13.0</gwt.version>
7070
<j2objc.version>3.1</j2objc.version>
7171
<java18-signature.version>1.0</java18-signature.version>

0 commit comments

Comments
 (0)