Skip to content

Commit

Permalink
ARTEMIS-3667: update to Groovy 4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@gemmellr @clebertsuconic
gemmellr authored and clebertsuconic committed Feb 4, 2022
1 parent e184038 commit 2c1afc4
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
<version.batavia>1.0.10.Final</version.batavia>

<!-- used on tests -->
<groovy.version>2.5.10</groovy.version>
<groovy.version>4.0.0</groovy.version>
<vertx.version>3.9.4</vertx.version>
<hadoop.minikdc.version>3.3.1</hadoop.minikdc.version>

Expand Down
33 changes: 19 additions & 14 deletions tests/compatibility-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,17 +163,22 @@
<version>2.21.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-test-junit5</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-testng</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-junit</artifactId>
Expand Down Expand Up @@ -342,7 +347,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:${project.version}</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:${project.version}</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:${project.version}</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
Expand All @@ -364,7 +369,7 @@
<arg>org.apache.activemq:artemis-server:${project.version}</arg>
<arg>org.apache.activemq:artemis-journal:${project.version}</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:${project.version}</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>jakarta.jms:jakarta.jms-api:3.0.0</arg>
Expand Down Expand Up @@ -392,7 +397,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:2.6.3</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:2.6.3</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.6.3</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
Expand All @@ -416,7 +421,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:2.7.0</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:2.7.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.7.0</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
Expand All @@ -441,7 +446,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:2.10.0</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:2.10.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.10.0</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final</arg>
</libListWithDeps>
<libList>
Expand All @@ -467,7 +472,7 @@
<arg>org.apache.activemq:artemis-amqp-protocol:2.4.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.4.0</arg>
<arg>org.apache.qpid:qpid-jms-client:0.26.0</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
Expand All @@ -492,7 +497,7 @@
<arg>org.apache.activemq:artemis-amqp-protocol:2.1.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.1.0</arg>
<arg>org.apache.qpid:qpid-jms-client:0.22.0</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
Expand All @@ -517,7 +522,7 @@
<arg>org.apache.activemq:artemis-amqp-protocol:2.0.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.0.0</arg>
<arg>org.apache.qpid:qpid-jms-client:0.20.0</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
Expand All @@ -541,7 +546,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:1.4.0</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:1.4.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:1.4.0</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
Expand All @@ -565,7 +570,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:1.5.5</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:1.5.5</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:1.5.5</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final</arg>
</libListWithDeps>
<libList>
Expand All @@ -591,7 +596,7 @@
</extraRepositories>
<libListWithDeps>
<arg>org.hornetq:hornetq-jms-server:2.3.5.Final</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
Expand All @@ -616,7 +621,7 @@
</extraRepositories>
<libListWithDeps>
<arg>org.hornetq:hornetq-jms-server:2.4.7.Final</arg>
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
Expand Down

0 comments on commit 2c1afc4

Please sign in to comment.