Skip to content

Commit 6affb7c

Browse files
committed
Update IT tests for JDK 17
* switch some BeanShell scripts to Groovy to avoid some unneeded/unwanted reflection * update m-invoker-p for Groovy * update m-war-p in e2e for XStream * switch groovy-m-p to m-antrun-p in staleness-check-2 to avoid the old Groovy version
1 parent 961578b commit 6affb7c

File tree

7 files changed

+15
-10
lines changed

7 files changed

+15
-10
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
<plugin>
213213
<groupId>org.apache.maven.plugins</groupId>
214214
<artifactId>maven-invoker-plugin</artifactId>
215-
<version>3.1.0</version>
215+
<version>3.2.2</version>
216216
<executions>
217217
<execution>
218218
<goals>
@@ -233,7 +233,7 @@
233233
<artifact>org.apache.maven.plugins:maven-compiler-plugin:3.8.0:maven-plugin</artifact>
234234
<artifact>org.apache.maven.plugins:maven-source-plugin:3.0.1:maven-plugin</artifact>
235235
<artifact>org.codehaus.mojo:build-helper-maven-plugin:3.0.0:maven-plugin</artifact>
236-
<artifact>org.codehaus.gmaven:groovy-maven-plugin:2.0:maven-plugin</artifact>
236+
<artifact>org.apache.maven.plugins:maven-antrun-plugin:3.0.0:maven-plugin</artifact>
237237
<artifact>com.google.guava:guava:19.0</artifact>
238238
<artifact>com.google.guava:guava-gwt:19.0</artifact>
239239
<artifact>com.google.auto.value:auto-value:1.6.2</artifact>

src/it/e2e/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@
8787
</execution>
8888
</executions>
8989
</plugin>
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-war-plugin</artifactId>
93+
<version>3.3.2</version>
94+
</plugin>
9095
</plugins>
9196
</pluginManagement>
9297
</build>
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
invoker.goals.1 = prepare-package
2-
invoker.goals.2 = groovy:execute prepare-package
2+
invoker.goals.2 = antrun:run prepare-package

src/it/staleness-check-2/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@
4343
</configuration>
4444
</plugin>
4545
<plugin>
46-
<groupId>org.codehaus.gmaven</groupId>
47-
<artifactId>groovy-maven-plugin</artifactId>
48-
<version>2.0</version>
46+
<groupId>org.apache.maven.plugins</groupId>
47+
<artifactId>maven-antrun-plugin</artifactId>
48+
<version>3.0.0</version>
4949
<executions>
5050
<execution>
5151
<id>default-cli</id>
5252
<configuration>
53-
<source><![CDATA[
54-
def f = new File('src/main/java/it/test/client/Test.ui.xml')
55-
f.text = f.text.replace('Hello World!', 'Bonjour le monde&#160;!')
56-
]]></source>
53+
<target>
54+
<replace file="src/main/java/it/test/client/Test.ui.xml"
55+
token="Hello World!" value="Bonjour le monde&#160;!" />
56+
</target>
5757
</configuration>
5858
</execution>
5959
</executions>

0 commit comments

Comments
 (0)