Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integration-tests/jakarta-ee/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<version>${mockito-inline.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jaxrs/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<properties>
<module.name>its.jaxrs.tests</module.name>
<jaxrs.api.version>2.1.1</jaxrs.api.version>
<johnzon.version>1.2.20</johnzon.version>
<johnzon.version>1.2.21</johnzon.version>
</properties>

<dependencies>
Expand Down
21 changes: 6 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>29</version>
<version>30</version>
</parent>

<groupId>org.apache.shiro</groupId>
Expand Down Expand Up @@ -71,7 +71,6 @@
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
<project.build.outputTimestamp>2022-03-22T23:08:15Z</project.build.outputTimestamp>
<jacoco.skip>true</jacoco.skip>
<surefire.version>3.0.0</surefire.version>
<!--suppress CheckTagEmptyBody -->
<surefire.argLine></surefire.argLine>
<!--suppress CheckTagEmptyBody -->
Expand Down Expand Up @@ -119,9 +118,10 @@

<!-- Test 3rd-party dependencies: -->
<easymock.version>5.1.0</easymock.version>
<mockito.version>5.2.0</mockito.version>
<mockito.version>5.4.0</mockito.version>
<mockito-inline.version>5.2.0</mockito-inline.version>
<gmaven.version>3.0.0</gmaven.version>
<groovy.version>4.0.12</groovy.version>
<groovy.version>4.0.13</groovy.version>
<junit.version>5.9.3</junit.version>
<junit.server.jetty.version>3.0.0</junit.server.jetty.version>
<hibernate.version>5.6.15.Final</hibernate.version>
Expand Down Expand Up @@ -371,11 +371,6 @@
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down Expand Up @@ -441,10 +436,6 @@
</parameter>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
Expand Down Expand Up @@ -542,7 +533,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.0</version>
<configuration>
<configLocation>${checkstyle.configLocation}</configLocation>
<suppressionsLocation>${checkstyle.supressionsLocation}</suppressionsLocation>
Expand Down Expand Up @@ -1524,7 +1515,7 @@
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.20.0</version>
<version>3.21.0</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion samples/spring-boot-3-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<spring-boot3.version>3.1.2</spring-boot3.version>
<spring-boot.version>${spring-boot3.version}</spring-boot.version>
<!-- below versions are not necessary in "real" applications -->
<spring.version>6.0.10</spring.version>
<spring.version>6.0.11</spring.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion support/cdi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<version>${mockito-inline.version}</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion support/jakarta-ee/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<version>${mockito-inline.version}</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion support/spring-boot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.2.0</version>
<version>${mockito.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down