Skip to content

Commit d114d80

Browse files
eshryaneMiguelAHM
eshryane
and
MiguelAHM
authored
Java 21 Support (#1440)
* Switch back to Mojo aspectj plugin for Java 21 support * Update AspectJ * Update Jacoco plugin to support Java 21 * Update to Mockito 5 for Java 21 support * update dependencies * feat: use java 21 image * Update spring framework dependency * Explicitly enable annotation processing during compilation. [INFO] Annotation processing is enabled because one or more processors were found on the class path. A future release of javac may disable annotation processing unless at least one processor is specified by name (-processor), or a search path is specified (--processor-path, --processor-module-path), or annotation processing is enabled explicitly (-proc:only, -proc:full). Use -Xlint:-options to suppress this message. Use -proc:none to disable annotation processing. * Mock and Spy integration test components * Rename duplicate classes * Fix Tag import * Use MockFactoryBean everywhere * Upgraded shedlock to latest "If you are using JDK >17 and up-to-date libraries like Spring 6, use version 5.1.0 (Release Notes)" according to https://github.com/lukas-krecan/ShedLock * Shedlock breaks with latest Spring * Specify aspectj mode for cache configuration * Specify aspectj mode for scheduler config * Updated Spring by applying AOP workaround suggested in spring-projects/spring-framework#32882 (comment) "These problems come from mixed AspectJ weaving and proxying. In your scenario, you seem to be using @EnableTransactionManagement in AspectJ mode but @EnableCaching in proxy mode. For the time being, you could try to switch @EnableCaching and any other aspect-related functionality to AspectJ mode as well and remove any variant of@EnableAspectJAutoProxy completely, if that is feasible for your application." * Replace deprecated thread.getId() with threadId(). * use whois-build:v0.0.5 - java21, amazoncorretto, node18, firefox114 --------- Co-authored-by: mherran <[email protected]>
1 parent 9c309d0 commit d114d80

File tree

35 files changed

+137
-70
lines changed

35 files changed

+137
-70
lines changed

‎.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: $CI_REGISTRY/swe-database-team/gitlab-ci/whois-build:21fc0efa
1+
image: $CI_REGISTRY/swe-database-team/gitlab-ci/whois-build:v0.0.5
22

33
variables:
44
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"

‎pom.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2626

2727
<!-- JAVA version -->
28-
<java.version>17</java.version>
28+
<java.version>21</java.version>
2929

3030
<!-- dependencies -->
3131

32-
<aspectj.version>1.9.21.1</aspectj.version>
32+
<aspectj.version>1.9.22.1</aspectj.version>
3333
<awaitility.version>4.2.0</awaitility.version>
3434

3535
<bouncycastle.version>1.77</bouncycastle.version>
@@ -80,7 +80,7 @@
8080
<mail.version>2.0.3</mail.version>
8181
<!-- TODO: update mariadb to 3.x -->
8282
<mariadb-java-client.version>2.7.12</mariadb-java-client.version>
83-
<mockito.version>3.12.4</mockito.version>
83+
<mockito.version>5.12.0</mockito.version>
8484

8585
<netty.version>4.1.107.Final</netty.version>
8686

@@ -89,10 +89,10 @@
8989
<proprot.version>1.0</proprot.version>
9090

9191
<sentry.version>6.26.0</sentry.version>
92-
<shedlock.version>4.46.0</shedlock.version>
92+
<shedlock.version>5.13.0</shedlock.version>
9393
<slf4j.version>2.0.12</slf4j.version>
9494
<solrj.version>1.4.1</solrj.version>
95-
<spring.version>6.1.4</spring.version>
95+
<spring.version>6.1.8</spring.version>
9696
<spock.version>2.3-groovy-3.0</spock.version>
9797
<stax-utils.version>20070216</stax-utils.version>
9898

@@ -818,7 +818,7 @@
818818
<plugin>
819819
<groupId>org.jacoco</groupId>
820820
<artifactId>jacoco-maven-plugin</artifactId>
821-
<version>0.8.8</version>
821+
<version>0.8.12</version>
822822
<executions>
823823
<execution>
824824
<id>before-unit-test-execution</id>
@@ -926,6 +926,8 @@
926926
<arg>-Xlint:-processing</arg>
927927
<arg>--add-modules</arg>
928928
<arg>java.sql,java.xml</arg>
929+
<!-- explicitly enable annotation processing. -->
930+
<arg>-proc:full</arg>
929931
</compilerArgs>
930932
<showWarnings>true</showWarnings>
931933
<showDeprecation>true</showDeprecation>
@@ -1036,10 +1038,9 @@
10361038
</executions>
10371039
</plugin>
10381040
<plugin>
1039-
<!-- Plugin forked from mojohaus project to add Java 11 support -->
1040-
<groupId>io.starter</groupId>
1041+
<groupId>org.codehaus.mojo</groupId>
10411042
<artifactId>aspectj-maven-plugin</artifactId>
1042-
<version>1.12.9</version>
1043+
<version>1.15.0</version>
10431044
<configuration>
10441045
<source>${java.version}</source>
10451046
<target>${java.version}</target>

‎whois-api/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@
197197
</resources>
198198
<plugins>
199199
<plugin>
200-
<groupId>io.starter</groupId>
200+
<groupId>org.codehaus.mojo</groupId>
201201
<artifactId>aspectj-maven-plugin</artifactId>
202-
<version>1.12.9</version>
202+
<version>1.15.0</version>
203203
<configuration>
204204
<aspectLibraries>
205205
<aspectLibrary>

‎whois-api/src/main/java/net/ripe/db/whois/api/mail/dao/MailMessageDaoJdbc.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public MailMessageDaoJdbc(
4848
@CheckForNull
4949
public String claimMessage() {
5050
final String uuid = UUID.randomUUID().toString();
51-
LOGGER.debug("[{}] about to claim message with uuid {}", Thread.currentThread().getId(), uuid);
51+
LOGGER.debug("[{}] about to claim message with uuid {}", Thread.currentThread().threadId(), uuid);
5252
final int rows = jdbcTemplate.update("" +
5353
"update mailupdates " +
5454
"set status = ?, changed = ?, claim_host = ?, claim_uuid = ? " +
@@ -62,7 +62,7 @@ public String claimMessage() {
6262
case 0:
6363
return null;
6464
case 1:
65-
LOGGER.debug("[{}] claimed message with uuid {}", Thread.currentThread().getId(), uuid);
65+
LOGGER.debug("[{}] claimed message with uuid {}", Thread.currentThread().threadId(), uuid);
6666
return uuid;
6767
default:
6868
throw new IllegalStateException("Should never claim more than 1 row");
@@ -88,7 +88,7 @@ public void addMessage(final MimeMessage message) {
8888

8989
@Override
9090
public MimeMessage getMessage(final String messageUuid) {
91-
LOGGER.debug("[{}] get message with uuid {}", Thread.currentThread().getId(), messageUuid);
91+
LOGGER.debug("[{}] get message with uuid {}", Thread.currentThread().threadId(), messageUuid);
9292

9393
final byte[] bytes = jdbcTemplate.queryForObject("select message from mailupdates where claim_uuid = ?", byte[].class, messageUuid);
9494

@@ -101,7 +101,7 @@ public MimeMessage getMessage(final String messageUuid) {
101101

102102
@Override
103103
public void deleteMessage(final String messageUuid) {
104-
LOGGER.debug("[{}] delete message with uuid {}", Thread.currentThread().getId(), messageUuid);
104+
LOGGER.debug("[{}] delete message with uuid {}", Thread.currentThread().threadId(), messageUuid);
105105

106106
int rows = jdbcTemplate.update("delete from mailupdates where claim_uuid = ?", messageUuid);
107107
if (rows != 1) {
@@ -111,7 +111,7 @@ public void deleteMessage(final String messageUuid) {
111111

112112
@Override
113113
public void setStatus(final String messageUuid, final DequeueStatus status) {
114-
LOGGER.debug("[{}] set status uuid {} status {}", Thread.currentThread().getId(), messageUuid, status);
114+
LOGGER.debug("[{}] set status uuid {} status {}", Thread.currentThread().threadId(), messageUuid, status);
115115

116116
final int rows = jdbcTemplate.update(
117117
"update mailupdates set status = ?, changed = ? where claim_uuid = ?",

‎whois-api/src/test/resources/applicationContext-api-test-message-dequeue-mock.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
location="classpath:whois.version.properties,classpath:whois.properties"
1111
system-properties-mode="OVERRIDE"/>
1212

13-
<bean id="messageDequeue" class="org.mockito.Mockito" factory-method="mock" primary="true">
14-
<constructor-arg value="net.ripe.db.whois.api.mail.dequeue.MessageDequeue"/>
13+
<bean id="messageDequeue" class="net.ripe.db.whois.query.support.MockFactoryBean" primary="true">
14+
<constructor-arg name="mock" value="net.ripe.db.whois.api.mail.dequeue.MessageDequeue" />
1515
</bean>
1616

17+
1718
</beans>

‎whois-api/src/test/resources/applicationContext-api-test-update-request-handler-mock.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
location="classpath:whois.version.properties,classpath:whois.properties"
1111
system-properties-mode="OVERRIDE"/>
1212

13-
<bean id="updateRequestHandler" class="org.mockito.Mockito" factory-method="mock" primary="true">
14-
<constructor-arg value="net.ripe.db.whois.update.handler.UpdateRequestHandler"/>
13+
<bean id="updateRequestHandler" class="net.ripe.db.whois.query.support.MockFactoryBean" primary="true">
14+
<constructor-arg name="mock" value="net.ripe.db.whois.update.handler.UpdateRequestHandler" />
1515
</bean>
1616

1717
</beans>

‎whois-commons/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<plugin>
129129
<groupId>org.jacoco</groupId>
130130
<artifactId>jacoco-maven-plugin</artifactId>
131-
<version>0.8.8</version>
131+
<version>0.8.12</version>
132132
<!-- TODO: Including this in jacoco plugin throws Can't add different class with same name: org/apache/commons/collections/ArrayStack
133133
I tried to exclude this file, package and dependency also still from some other dependency tree it gets included
134134
-->

‎whois-commons/src/main/resources/applicationContext-commons.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:tx="http://www.springframework.org/schema/tx"
55
xmlns:context="http://www.springframework.org/schema/context"
6-
xmlns:cache="http://www.springframework.org/schema/cache"
6+
xmlns:cache="http://www.springframework.org/schema/cache" xmlns:aop="http://www.springframework.org/schema/aop"
77
xsi:schemaLocation="http://www.springframework.org/schema/beans
88
http://www.springframework.org/schema/beans/spring-beans.xsd
99
http://www.springframework.org/schema/tx
1010
http://www.springframework.org/schema/tx/spring-tx.xsd
1111
http://www.springframework.org/schema/context
1212
http://www.springframework.org/schema/context/spring-context.xsd
1313
http://www.springframework.org/schema/cache
14-
http://www.springframework.org/schema/cache/spring-cache.xsd">
14+
http://www.springframework.org/schema/cache/spring-cache.xsd http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd">
1515

1616
<!-- TODO: this is loaded many many times on context init, which slows down startup process -->
1717
<!-- @Transactional CAN be used on private methods with mode="aspectj". However, annotations on interfaces will NOT work! -->
@@ -21,7 +21,9 @@
2121
<context:component-scan base-package="net.ripe.db.whois.common"/>
2222

2323
<context:annotation-config/>
24-
<cache:annotation-driven/>
24+
<cache:annotation-driven mode="aspectj"/>
25+
26+
<!-- <aop:aspectj-autoproxy proxy-target-class="true"/>-->
2527

2628
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
2729
<property name="dataSource" ref="sourceAwareDataSource"/>

‎whois-commons/src/test/java/net/ripe/db/whois/common/aspects/RetryForAspectMethodImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.util.concurrent.atomic.AtomicInteger;
77

88
@Component
9-
@RetryFor(value = IOException.class, attempts = RetryForAspectIntegrationTest.ATTEMPTS, intervalMs = 0)
9+
@RetryFor(value = IOException.class, attempts = RetryForAspectMethodTypeIntegrationTest.ATTEMPTS, intervalMs = 0)
1010
class RetryForAspectMethodImpl implements RetryForAspectMethod {
1111
@Override
1212
public void incrementAndThrowException(final AtomicInteger counter, final Exception e) throws Exception {

‎whois-commons/src/test/java/net/ripe/db/whois/common/aspects/RetryForAspectIntegrationTest.java renamed to ‎whois-commons/src/test/java/net/ripe/db/whois/common/aspects/RetryForAspectMethodTypeIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import static org.junit.jupiter.api.Assertions.fail;
1717

1818
@Tag("IntegrationTest")
19-
public class RetryForAspectIntegrationTest extends AbstractDaoIntegrationTest {
19+
public class RetryForAspectMethodTypeIntegrationTest extends AbstractDaoIntegrationTest {
2020
static final int ATTEMPTS = 5;
2121

2222
AtomicInteger attemptCounter;

‎whois-commons/src/test/java/net/ripe/db/whois/common/aspects/RetryForAspectType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
import java.util.concurrent.atomic.AtomicInteger;
55

66
public interface RetryForAspectType {
7-
@RetryFor(value = IOException.class, attempts = RetryForAspectIntegrationTest.ATTEMPTS, intervalMs = 0)
7+
@RetryFor(value = IOException.class, attempts = RetryForAspectMethodTypeIntegrationTest.ATTEMPTS, intervalMs = 0)
88
void incrementAndThrowException(AtomicInteger counter, Exception e) throws Exception;
99
}

‎whois-commons/src/test/java/net/ripe/db/whois/common/aspects/RetryForAspectTypeImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@Component
99
class RetryForAspectTypeImpl implements RetryForAspectType {
1010
@Override
11-
@RetryFor(value = IOException.class, attempts = RetryForAspectIntegrationTest.ATTEMPTS, intervalMs = 0)
11+
@RetryFor(value = IOException.class, attempts = RetryForAspectMethodTypeIntegrationTest.ATTEMPTS, intervalMs = 0)
1212
public void incrementAndThrowException(final AtomicInteger counter, final Exception e) throws Exception {
1313
counter.incrementAndGet();
1414
throw e;

‎whois-db/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@
125125
<build>
126126
<plugins>
127127
<plugin>
128-
<groupId>io.starter</groupId>
128+
<groupId>org.codehaus.mojo</groupId>
129129
<artifactId>aspectj-maven-plugin</artifactId>
130-
<version>1.12.9</version>
130+
<version>1.15.0</version>
131131
<configuration>
132132
<aspectLibraries>
133133
<aspectLibrary>

‎whois-db/src/test/java/net/ripe/db/whois/db/RetryForAspectIntegrationTest.java renamed to ‎whois-db/src/test/java/net/ripe/db/whois/db/RetryForAspectClassIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
@Tag("IntegrationTest")
2828
@ContextConfiguration(locations = {"classpath:applicationContext-whois-test.xml"})
29-
public class RetryForAspectIntegrationTest extends AbstractDaoIntegrationTest {
29+
public class RetryForAspectClassIntegrationTest extends AbstractDaoIntegrationTest {
3030
static final int ATTEMPTS = 5;
3131

3232
AtomicInteger attemptCounter;
@@ -90,7 +90,7 @@ private void retryForAnnotatedType(final Exception e, final int expectedAttempts
9090
assertThat(attemptCounter.get(), is(expectedAttempts));
9191
}
9292

93-
@RetryFor(value = IOException.class, attempts = RetryForAspectIntegrationTest.ATTEMPTS, intervalMs = 0)
93+
@RetryFor(value = IOException.class, attempts = RetryForAspectClassIntegrationTest.ATTEMPTS, intervalMs = 0)
9494
public void incrementAndThrowException(final AtomicInteger counter, final Exception e) throws Exception {
9595
counter.incrementAndGet();
9696
throw e;

‎whois-db/src/test/java/net/ripe/db/whois/db/RetryForAspectOnClass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.concurrent.atomic.AtomicInteger;
88

99
@Component
10-
@RetryFor(value = IOException.class, attempts = RetryForAspectIntegrationTest.ATTEMPTS, intervalMs = 0)
10+
@RetryFor(value = IOException.class, attempts = RetryForAspectClassIntegrationTest.ATTEMPTS, intervalMs = 0)
1111
class RetryForAspectOnClass {
1212
public void incrementAndThrowException(final AtomicInteger counter, final Exception e) throws Exception {
1313
counter.incrementAndGet();

‎whois-endtoend/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@
127127
<build>
128128
<plugins>
129129
<plugin>
130-
<groupId>io.starter</groupId>
130+
<groupId>org.codehaus.mojo</groupId>
131131
<artifactId>aspectj-maven-plugin</artifactId>
132-
<version>1.12.9</version>
132+
<version>1.15.0</version>
133133
<configuration>
134134
<skip>true</skip>
135135
<aspectLibraries>

‎whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/update/lireditable/BaseLirEditableAttributes.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ package net.ripe.db.whois.spec.update.lireditable
22

33

44
import net.ripe.db.whois.spec.BaseQueryUpdateSpec
5+
import org.junit.jupiter.api.Tag
56

6-
@org.junit.jupiter.api.Tag("IntegrationTest")
7+
@Tag("IntegrationTest")
78
class BaseLirEditableAttributes extends BaseQueryUpdateSpec {
89

910
def createMandatory(String type,

‎whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/update/lireditable/LirEditableAllocation6AttributeValidationSpec.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package net.ripe.db.whois.spec.update.lireditable
22

3+
import org.junit.jupiter.api.Tag
34

45

5-
@org.junit.jupiter.api.Tag("IntegrationTest")
6+
@Tag("IntegrationTest")
67
class LirEditableAllocation6AttributeValidationSpec extends BaseLirEditableAttributeValidation {
78

89
// data for tests

‎whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/update/lireditable/LirEditableAllocationAttributeValidationSpec.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package net.ripe.db.whois.spec.update.lireditable
22

3+
import org.junit.jupiter.api.Tag
34

45

5-
@org.junit.jupiter.api.Tag("IntegrationTest")
6+
@Tag("IntegrationTest")
67
class LirEditableAllocationAttributeValidationSpec extends BaseLirEditableAttributeValidation {
78

89
// data for tests

‎whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/update/lireditable/LirEditableInet6numAssignedAttributeValidationSpec.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package net.ripe.db.whois.spec.update.lireditable
22

3+
import org.junit.jupiter.api.Tag
34

45

5-
@org.junit.jupiter.api.Tag("IntegrationTest")
6+
@Tag("IntegrationTest")
67
class LirEditableInet6numAssignedAttributeValidationSpec extends BaseLirEditableAttributeValidation {
78

89
// data for tests

‎whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/update/lireditable/LirEditableInet6numAssignedPiAttributeValidationSpec.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package net.ripe.db.whois.spec.update.lireditable
22

3+
import org.junit.jupiter.api.Tag
34

45

5-
@org.junit.jupiter.api.Tag("IntegrationTest")
6+
@Tag("IntegrationTest")
67
class LirEditableInet6numAssignedPiAttributeValidationSpec extends BaseLirEditableAttributeValidation {
78

89
// data for tests

‎whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/update/lireditable/LirEditableInetnumAssignedPaAttributeValidationSpec.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package net.ripe.db.whois.spec.update.lireditable
22

3-
@org.junit.jupiter.api.Tag("IntegrationTest")
3+
import org.junit.jupiter.api.Tag
4+
5+
@Tag("IntegrationTest")
46
class LirEditableInetnumAssignedPaAttributeValidationSpec extends BaseLirEditableAttributeValidation {
57

68
// data for tests

‎whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/update/lireditable/LirEditableInetnumAssignedPiAttributeValidationSpec.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package net.ripe.db.whois.spec.update.lireditable
22

3+
import org.junit.jupiter.api.Tag
34

45

5-
@org.junit.jupiter.api.Tag("IntegrationTest")
6+
@Tag("IntegrationTest")
67
class LirEditableInetnumAssignedPiAttributeValidationSpec extends BaseLirEditableAttributeValidation {
78

89
// data for tests

‎whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/update/lireditable/LirEditableLegacyAttributeValidationSpec.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package net.ripe.db.whois.spec.update.lireditable
22

3+
import org.junit.jupiter.api.Tag
34

45

5-
@org.junit.jupiter.api.Tag("IntegrationTest")
6+
@Tag("IntegrationTest")
67
class LirEditableLegacyAttributeValidationSpec extends BaseLirEditableAttributeValidation {
78

89
// data for tests

‎whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/update/lireditable/LirEditableOrganisationAttributeValidationSpec.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ package net.ripe.db.whois.spec.update.lireditable
22

33

44
import net.ripe.db.whois.spec.BaseQueryUpdateSpec
5+
import org.junit.jupiter.api.Tag
56

67

7-
@org.junit.jupiter.api.Tag("IntegrationTest")
8+
@Tag("IntegrationTest")
89
class LirEditableOrganisationAttributeValidationSpec extends BaseQueryUpdateSpec {
910

1011
@Override

‎whois-nrtm/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@
7373
</resources>
7474
<plugins>
7575
<plugin>
76-
<groupId>io.starter</groupId>
76+
<groupId>org.codehaus.mojo</groupId>
7777
<artifactId>aspectj-maven-plugin</artifactId>
78-
<version>1.12.9</version>
78+
<version>1.15.0</version>
7979
<configuration>
8080
<aspectLibraries>
8181
<aspectLibrary>

‎whois-nrtm4/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
<build>
5151
<plugins>
5252
<plugin>
53-
<groupId>io.starter</groupId>
53+
<groupId>org.codehaus.mojo</groupId>
5454
<artifactId>aspectj-maven-plugin</artifactId>
55-
<version>1.12.9</version>
55+
<version>1.15.0</version>
5656
<configuration>
5757
<aspectLibraries>
5858
<aspectLibrary>

0 commit comments

Comments
 (0)