Skip to content

Commit fe6ff37

Browse files
committed
WELD-2820 Upgrade Groovy version
1 parent eb89f0c commit fe6ff37

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

environments/se/core/pom.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,18 @@
9898
<scope>test</scope>
9999
</dependency>
100100
<dependency>
101-
<groupId>org.codehaus.groovy</groupId>
101+
<groupId>org.apache.groovy</groupId>
102102
<artifactId>groovy-all</artifactId>
103103
<optional>true</optional>
104104
<type>pom</type>
105105
<exclusions>
106106
<!-- Exclude these otherwise surefire doesn't find any tests to run -->
107107
<exclusion>
108-
<groupId>org.codehaus.groovy</groupId>
108+
<groupId>org.apache.groovy</groupId>
109109
<artifactId>groovy-test-junit5</artifactId>
110110
</exclusion>
111111
<exclusion>
112-
<groupId>org.codehaus.groovy</groupId>
112+
<groupId>org.apache.groovy</groupId>
113113
<artifactId>groovy-testng</artifactId>
114114
</exclusion>
115115
</exclusions>
@@ -149,6 +149,8 @@
149149
</execution>
150150
</executions>
151151
<configuration>
152+
<!-- IIUIC, this should be the same as what we compile Weld into -->
153+
<targetBytecode>${maven.compiler.argument.target}</targetBytecode>
152154
<testSources>
153155
<testSource>
154156
<directory>${project.basedir}/src/test/groovy</directory>
@@ -169,10 +171,6 @@
169171
<goals>
170172
<goal>compile</goal>
171173
</goals>
172-
<configuration>
173-
<source>${maven.compiler.source}</source>
174-
<target>${maven.compiler.target}</target>
175-
</configuration>
176174
</execution>
177175
</executions>
178176
</plugin>

examples/se/groovy-numberguess/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</dependency>
3232

3333
<dependency>
34-
<groupId>org.codehaus.groovy</groupId>
34+
<groupId>org.apache.groovy</groupId>
3535
<artifactId>groovy-all</artifactId>
3636
<type>pom</type>
3737
</dependency>
@@ -72,6 +72,7 @@
7272
</execution>
7373
</executions>
7474
<configuration>
75+
<targetBytecode>${maven.compiler.argument.target}</targetBytecode>
7576
<sources>
7677
<source>
7778
<directory>${project.basedir}/src/main/java</directory>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<!-- Our variant is under src/test/tck/tck-tests.xml -->
7070
<cdi.tck.suite.xml.file />
7171
<classfilewriter.version>1.3.1.Final</classfilewriter.version>
72-
<groovy.version>3.0.25</groovy.version>
72+
<groovy.version>5.0.2</groovy.version>
7373
<htmlunit.version>2.70.0</htmlunit.version>
7474
<jacoco.version>0.8.13</jacoco.version>
7575
<jandex.version>3.5.0</jandex.version>
@@ -118,7 +118,7 @@
118118
</dependency>
119119

120120
<dependency>
121-
<groupId>org.codehaus.groovy</groupId>
121+
<groupId>org.apache.groovy</groupId>
122122
<artifactId>groovy-all</artifactId>
123123
<version>${groovy.version}</version>
124124
<type>pom</type>

0 commit comments

Comments
 (0)