Skip to content

Commit c198cd5

Browse files
authored
Merge pull request #123 from mvallim/develop
Auto-created pull request into `release/1.10.1` from `develop`
2 parents 00e4994 + 9c58530 commit c198cd5

31 files changed

+970
-348
lines changed

pom.xml

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<mockito.version>4.11.0</mockito.version>
2525
<junit.jupiter.version>5.10.2</junit.jupiter.version>
2626
<awaitility.version>4.2.2</awaitility.version>
27-
<assertj-core.version>3.24.2</assertj-core.version>
27+
<assertj-core.version>3.27.7</assertj-core.version>
2828
<slf4j-api.version>2.0.6</slf4j-api.version>
2929
<hamcrest.version>3.0</hamcrest.version>
3030

@@ -34,10 +34,10 @@
3434
<maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
3535
<maven-install-plugin.version>3.1.0</maven-install-plugin.version>
3636
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
37-
<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
37+
<maven-resources-plugin.version>3.4.0</maven-resources-plugin.version>
3838
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
3939
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
40-
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
40+
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
4141
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
4242
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
4343
<sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
@@ -246,46 +246,10 @@
246246
<showWarnings>true</showWarnings>
247247
</configuration>
248248
</plugin>
249-
250-
<plugin>
251-
<groupId>org.codehaus.mojo</groupId>
252-
<artifactId>aspectj-maven-plugin</artifactId>
253-
<version>${aspectj-maven-plugin.version}</version>
254-
<configuration>
255-
<Xlint>ignore</Xlint>
256-
<complianceLevel>${java.version}</complianceLevel>
257-
<showWeaveInfo>false</showWeaveInfo>
258-
<verbose>false</verbose>
259-
<source>${java.version}</source>
260-
<target>${java.version}</target>
261-
</configuration>
262-
<dependencies>
263-
<dependency>
264-
<groupId>org.aspectj</groupId>
265-
<artifactId>aspectjtools</artifactId>
266-
<version>${aspectj.version}</version>
267-
</dependency>
268-
</dependencies>
269-
<executions>
270-
<execution>
271-
<phase>process-sources</phase>
272-
<goals>
273-
<goal>compile</goal>
274-
<goal>test-compile</goal>
275-
</goals>
276-
</execution>
277-
</executions>
278-
</plugin>
279249
</plugins>
280250
</build>
281251

282252
<dependencies>
283-
<dependency>
284-
<groupId>org.aspectj</groupId>
285-
<artifactId>aspectjrt</artifactId>
286-
<version>${aspectj.version}</version>
287-
</dependency>
288-
289253
<!-- Scope Test -->
290254
<dependency>
291255
<groupId>org.junit.jupiter</groupId>
@@ -373,8 +337,6 @@
373337
</activation>
374338
<properties>
375339
<java.version>8</java.version>
376-
<aspectj.version>1.9.7</aspectj.version>
377-
<aspectj-maven-plugin.version>1.14.0</aspectj-maven-plugin.version>
378340
</properties>
379341
</profile>
380342

@@ -385,8 +347,6 @@
385347
</activation>
386348
<properties>
387349
<java.version>11</java.version>
388-
<aspectj.version>1.9.7</aspectj.version>
389-
<aspectj-maven-plugin.version>1.14.0</aspectj-maven-plugin.version>
390350
</properties>
391351
</profile>
392352

@@ -397,8 +357,6 @@
397357
</activation>
398358
<properties>
399359
<java.version>17</java.version>
400-
<aspectj.version>1.9.25.1</aspectj.version>
401-
<aspectj-maven-plugin.version>1.16.0</aspectj-maven-plugin.version>
402360
</properties>
403361
</profile>
404362

@@ -409,8 +367,6 @@
409367
</activation>
410368
<properties>
411369
<java.version>21</java.version>
412-
<aspectj.version>1.9.25.1</aspectj.version>
413-
<aspectj-maven-plugin.version>1.16.0</aspectj-maven-plugin.version>
414370
</properties>
415371
</profile>
416372

0 commit comments

Comments
 (0)