Skip to content

Commit 521ee9f

Browse files
committed
Bump dependencies and fix module plugin
1 parent 021c28a commit 521ee9f

4 files changed

Lines changed: 70 additions & 44 deletions

File tree

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The project is based on [Maven] and is available form central Maven repository.
2727
Add
2828

2929
```xml
30-
<mockito-soap-cxf.version>2.0.0</mockito-soap-cxf.version>
30+
<mockito-soap-cxf.version>2.0.1</mockito-soap-cxf.version>
3131
```
3232

3333
and
@@ -51,7 +51,7 @@ For
5151

5252
```groovy
5353
ext {
54-
mockitoSoapCxfVersion = '2.0.0'
54+
mockitoSoapCxfVersion = '2.0.1'
5555
}
5656
```
5757

@@ -249,8 +249,13 @@ If you see exception cause by
249249
250250
then you're mixing CXF version 2 and 3 - see above about excluding `cxf-core` artifact.
251251

252+
# See also
253+
254+
* [mockito-rest-spring](https://github.com/skjolber/mockito-rest-spring) for REST / GraphQL mocking.
255+
252256
# History
253257

258+
- 2.0.1: Maintenance release (bump dependencies). Thank you @RufManuel for help.
254259
- 2.0.0: Move to JDK 17 and Spring 6.x and Mockito 5.x.
255260
- 1.2.1: Maintainence release. JDK 8 (with CXF 3.x and Spring 5.3.x now live at jdk8 branch, on version 1.2.x).
256261
- 1.2.0: JUnit 5 support.

pom.xml

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@
1414
<maven.compiler.target>17</maven.compiler.target>
1515

1616
<junit.version>4.13.2</junit.version>
17-
<junit5.version>5.9.2</junit5.version>
17+
<junit5.version>5.12.0</junit5.version>
1818

19-
<mockito.version>5.1.1</mockito.version>
19+
<mockito.version>5.16.0</mockito.version>
2020
<hamcrest.version>2.2</hamcrest.version>
21-
<commons-io.version>2.14.0</commons-io.version>
21+
<commons-io.version>2.18.0</commons-io.version>
2222

23-
<cxf.version>4.1.0</cxf.version>
24-
<spring.version>6.1.14</spring.version>
23+
<cxf.version>4.1.1</cxf.version>
24+
<spring.version>6.2.3</spring.version>
2525

26-
<logback.version>1.2.13</logback.version>
27-
<slf4j.version>1.7.32</slf4j.version>
28-
26+
<logback.version>1.5.17</logback.version>
27+
<slf4j.version>2.0.17</slf4j.version>
28+
2929
<!-- plugins -->
3030
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
31-
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
32-
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
33-
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
34-
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
35-
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
36-
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
37-
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
38-
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
39-
<owasp-dependency-check.version>8.1.0</owasp-dependency-check.version>
31+
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
32+
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
33+
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
34+
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
35+
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
36+
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
37+
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
38+
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
39+
<owasp-dependency-check.version>12.1.0</owasp-dependency-check.version>
4040
</properties>
4141

4242
<licenses>
@@ -84,7 +84,7 @@
8484
<version>${junit.version}</version>
8585
<scope>compile</scope>
8686
<optional>true</optional>
87-
</dependency>
87+
</dependency>
8888
<dependency>
8989
<groupId>org.mockito</groupId>
9090
<artifactId>mockito-core</artifactId>
@@ -220,7 +220,7 @@
220220
<plugin>
221221
<groupId>org.apache.maven.plugins</groupId>
222222
<artifactId>maven-jar-plugin</artifactId>
223-
<version>3.3.0</version>
223+
<version>3.4.2</version>
224224
</plugin>
225225
<plugin>
226226
<groupId>org.apache.cxf</groupId>
@@ -398,6 +398,27 @@
398398
<artifactId>dependency-check-maven</artifactId>
399399
<version>${owasp-dependency-check.version}</version>
400400
</plugin>
401+
<plugin>
402+
<groupId>org.moditect</groupId>
403+
<artifactId>moditect-maven-plugin</artifactId>
404+
<version>1.2.2.Final</version>
405+
<executions>
406+
<execution>
407+
<id>add-module-infos</id>
408+
<phase>package</phase>
409+
<goals>
410+
<goal>add-module-info</goal>
411+
</goals>
412+
<configuration>
413+
<jvmVersion>${java.module.version}</jvmVersion>
414+
<overwriteExistingFiles>true</overwriteExistingFiles>
415+
<module>
416+
<moduleInfoFile>src/main/java9/module-info.java</moduleInfoFile>
417+
</module>
418+
</configuration>
419+
</execution>
420+
</executions>
421+
</plugin>
401422
</plugins>
402423
</build>
403424

src/main/java/com/github/skjolber/mockito/soap/module-info.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/main/java9/module-info.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
module com.github.skjolber.mockito.soap {
2+
3+
requires junit;
4+
requires org.junit.jupiter.api;
5+
requires org.mockito;
6+
7+
requires jakarta.xml.bind;
8+
requires jakarta.activation;
9+
requires jakarta.xml.ws;
10+
11+
requires java.net.http;
12+
requires java.base;
13+
14+
requires org.apache.cxf.core;
15+
requires org.apache.cxf.binding.soap;
16+
requires org.apache.cxf.frontend.jaxws;
17+
requires org.apache.cxf.transport.http;
18+
requires org.apache.cxf.frontend.jaxrs;
19+
requires org.apache.cxf.frontend.simple;
20+
21+
exports com.github.skjolber.mockito.soap;
22+
23+
}

0 commit comments

Comments
 (0)