|
70 | 70 | <groupId>org.gwtproject</groupId> |
71 | 71 | <artifactId>gwt-user</artifactId> |
72 | 72 | <version>${gwt.version}</version> |
73 | | - <scope>test</scope> |
| 73 | + <scope>provided</scope> |
74 | 74 | </dependency> |
75 | 75 | <dependency> |
76 | 76 | <groupId>com.google.truth</groupId> |
|
302 | 302 | </execution> |
303 | 303 | </executions> |
304 | 304 | </plugin> |
305 | | - <!-- TODO(cpovirk): We really should try tbroyer's plugin instead of this legacy one. --> |
306 | 305 | <plugin> |
307 | | - <groupId>org.codehaus.mojo</groupId> |
| 306 | + <groupId>net.ltgt.gwt.maven</groupId> |
308 | 307 | <artifactId>gwt-maven-plugin</artifactId> |
309 | 308 | <version>${gwt-maven-plugin.version}</version> |
310 | 309 | <executions> |
|
314 | 313 | <goal>compile</goal> |
315 | 314 | </goals> |
316 | 315 | <configuration> |
317 | | - <module>com.google.common.ForceGuavaCompilation</module> |
| 316 | + <moduleName>com.google.common.ForceGuavaCompilation</moduleName> |
318 | 317 | <failOnError>true</failOnError> |
319 | 318 | <logLevel>${gwt.logLevel}</logLevel> |
320 | | - <generateJsInteropExports>true</generateJsInteropExports> |
321 | | - <validateOnly>true</validateOnly> |
| 319 | + <compilerArgs> |
| 320 | + <arg>-generateJsInteropExports</arg> |
| 321 | + <arg>-validateOnly</arg> |
| 322 | + </compilerArgs> |
322 | 323 | <sourceLevel>1.8</sourceLevel> |
323 | 324 | <!-- |
324 | 325 | To avoid "java.io.IOException: User limit of inotify watches reached" under JDK10. |
325 | 326 | Presumably we don't need inotify, since we don't intend to change files during the |
326 | 327 | build? |
327 | 328 | --> |
328 | | - <extraJvmArgs>-Dgwt.watchFileChanges=false</extraJvmArgs> |
| 329 | + <jvmArgs> |
| 330 | + <arg>-Dgwt.watchFileChanges=false</arg> |
| 331 | + </jvmArgs> |
329 | 332 | </configuration> |
330 | 333 | </execution> |
331 | 334 | <!-- |
|
367 | 370 | <goal>test</goal> |
368 | 371 | </goals> |
369 | 372 | <configuration> |
370 | | - <module>com.google.common.GuavaTests</module> |
| 373 | + <moduleName>com.google.common.GuavaTests</moduleName> |
371 | 374 | <includes>**/GwtTestSuite.java</includes> |
372 | 375 | <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> |
382 | 386 | <!-- 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> |
384 | 389 | </configuration> |
385 | 390 | </execution> |
386 | 391 | </executions> |
|
0 commit comments