Skip to content

Commit 2e3b15b

Browse files
committed
Upgrade from Groovy 3 to 4
1 parent 95833c3 commit 2e3b15b

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

log4j-core-test/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@
174174
<scope>test</scope>
175175
</dependency>
176176
<dependency>
177-
<groupId>org.codehaus.groovy</groupId>
177+
<groupId>org.apache.groovy</groupId>
178178
<artifactId>groovy-dateutil</artifactId>
179179
<scope>test</scope>
180180
</dependency>
181181
<dependency>
182-
<groupId>org.codehaus.groovy</groupId>
182+
<groupId>org.apache.groovy</groupId>
183183
<artifactId>groovy-jsr223</artifactId>
184184
<scope>test</scope>
185185
</dependency>

log4j-parent/pom.xml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
5454
<docker-maven-plugin.version>0.45.0</docker-maven-plugin.version>
5555
<exam-maven-plugin.version>4.13.5</exam-maven-plugin.version>
56-
<gmavenplus-plugin.version>3.0.2</gmavenplus-plugin.version>
5756
<maven-taglib-plugin.version>2.4</maven-taglib-plugin.version>
5857
<!-- `surefire.version` property used in `apache.org:apache`: -->
5958
<surefire.version>3.5.0</surefire.version>
@@ -81,7 +80,7 @@
8180
<disruptor.version>3.4.4</disruptor.version>
8281
<embedded-ldap.version>0.9.0</embedded-ldap.version>
8382
<felix.version>7.0.5</felix.version>
84-
<groovy.version>3.0.22</groovy.version>
83+
<groovy.version>4.0.22</groovy.version>
8584
<guava.version>33.3.0-jre</guava.version>
8685
<h2.version>2.2.224</h2.version>
8786
<hamcrest.version>3.0</hamcrest.version>
@@ -175,7 +174,7 @@
175174
<!-- END: Modules that are not published (and hence missing in the BOM) -->
176175

177176
<dependency>
178-
<groupId>org.codehaus.groovy</groupId>
177+
<groupId>org.apache.groovy</groupId>
179178
<artifactId>groovy-bom</artifactId>
180179
<version>${groovy.version}</version>
181180
<type>pom</type>
@@ -972,21 +971,6 @@
972971
<plugin>
973972
<groupId>org.codehaus.gmavenplus</groupId>
974973
<artifactId>gmavenplus-plugin</artifactId>
975-
<version>${gmavenplus-plugin.version}</version>
976-
<dependencies>
977-
<dependency>
978-
<groupId>org.codehaus.groovy</groupId>
979-
<artifactId>groovy-ant</artifactId>
980-
<version>${groovy.version}</version>
981-
<scope>runtime</scope>
982-
</dependency>
983-
<dependency>
984-
<groupId>org.codehaus.groovy</groupId>
985-
<artifactId>groovy</artifactId>
986-
<version>${groovy.version}</version>
987-
<scope>runtime</scope>
988-
</dependency>
989-
</dependencies>
990974
<executions>
991975
<execution>
992976
<id>ban-static-transitive</id>

0 commit comments

Comments
 (0)