Skip to content

Commit 243838c

Browse files
AB-xdevAB-xdev
authored
Merge pull request #410 from xdev-software/develop
Release
2 parents 77d685f + b5df1ea commit 243838c

8 files changed

Lines changed: 36 additions & 30 deletions

File tree

‎.config/topo/upstream.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- url: https://github.com/xdev-software/standard-maven-template.git
2+
branch: master

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 2.50.5
2+
* Bumped version to one that does not conflict with testcontainers (and will likely not do so in the foreseeable future) #403
3+
* Updated dependencies
4+
15
# 2.0.4
26
* Updated dependencies
37

‎bom/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev.mockserver</groupId>
88
<artifactId>bom</artifactId>
9-
<version>2.0.5-SNAPSHOT</version>
9+
<version>2.50.5-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<name>bom</name>
@@ -51,22 +51,22 @@
5151
<dependency>
5252
<groupId>software.xdev.mockserver</groupId>
5353
<artifactId>client</artifactId>
54-
<version>2.0.5-SNAPSHOT</version>
54+
<version>2.50.5-SNAPSHOT</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>software.xdev.mockserver</groupId>
5858
<artifactId>core</artifactId>
59-
<version>2.0.5-SNAPSHOT</version>
59+
<version>2.50.5-SNAPSHOT</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>software.xdev.mockserver</groupId>
6363
<artifactId>server</artifactId>
64-
<version>2.0.5-SNAPSHOT</version>
64+
<version>2.50.5-SNAPSHOT</version>
6565
</dependency>
6666
<dependency>
6767
<groupId>software.xdev.mockserver</groupId>
6868
<artifactId>testcontainers</artifactId>
69-
<version>2.0.5-SNAPSHOT</version>
69+
<version>2.50.5-SNAPSHOT</version>
7070
</dependency>
7171
</dependencies>
7272
</dependencyManagement>

‎client/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev.mockserver</groupId>
88
<artifactId>client</artifactId>
9-
<version>2.0.5-SNAPSHOT</version>
9+
<version>2.50.5-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>client</name>
@@ -223,7 +223,7 @@
223223
<dependency>
224224
<groupId>com.puppycrawl.tools</groupId>
225225
<artifactId>checkstyle</artifactId>
226-
<version>13.3.0</version>
226+
<version>13.4.0</version>
227227
</dependency>
228228
</dependencies>
229229
<configuration>
@@ -261,12 +261,12 @@
261261
<dependency>
262262
<groupId>net.sourceforge.pmd</groupId>
263263
<artifactId>pmd-core</artifactId>
264-
<version>7.22.0</version>
264+
<version>7.23.0</version>
265265
</dependency>
266266
<dependency>
267267
<groupId>net.sourceforge.pmd</groupId>
268268
<artifactId>pmd-java</artifactId>
269-
<version>7.22.0</version>
269+
<version>7.23.0</version>
270270
</dependency>
271271
</dependencies>
272272
</plugin>

‎core/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev.mockserver</groupId>
88
<artifactId>core</artifactId>
9-
<version>2.0.5-SNAPSHOT</version>
9+
<version>2.50.5-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>core</name>
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>io.netty</groupId>
5656
<artifactId>netty-bom</artifactId>
57-
<version>4.2.10.Final</version>
57+
<version>4.2.12.Final</version>
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>tools.jackson.core</groupId>
6767
<artifactId>jackson-databind</artifactId>
68-
<version>3.1.0</version>
68+
<version>3.1.1</version>
6969
</dependency>
7070

7171
<dependency>
@@ -271,7 +271,7 @@
271271
<dependency>
272272
<groupId>com.puppycrawl.tools</groupId>
273273
<artifactId>checkstyle</artifactId>
274-
<version>13.3.0</version>
274+
<version>13.4.0</version>
275275
</dependency>
276276
</dependencies>
277277
<configuration>
@@ -309,12 +309,12 @@
309309
<dependency>
310310
<groupId>net.sourceforge.pmd</groupId>
311311
<artifactId>pmd-core</artifactId>
312-
<version>7.22.0</version>
312+
<version>7.23.0</version>
313313
</dependency>
314314
<dependency>
315315
<groupId>net.sourceforge.pmd</groupId>
316316
<artifactId>pmd-java</artifactId>
317-
<version>7.22.0</version>
317+
<version>7.23.0</version>
318318
</dependency>
319319
</dependencies>
320320
</plugin>

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev.mockserver</groupId>
88
<artifactId>root</artifactId>
9-
<version>2.0.5-SNAPSHOT</version>
9+
<version>2.50.5-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<name>MockServer NeoLight</name>
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>com.puppycrawl.tools</groupId>
7171
<artifactId>checkstyle</artifactId>
72-
<version>13.3.0</version>
72+
<version>13.4.0</version>
7373
</dependency>
7474
</dependencies>
7575
<configuration>
@@ -107,12 +107,12 @@
107107
<dependency>
108108
<groupId>net.sourceforge.pmd</groupId>
109109
<artifactId>pmd-core</artifactId>
110-
<version>7.22.0</version>
110+
<version>7.23.0</version>
111111
</dependency>
112112
<dependency>
113113
<groupId>net.sourceforge.pmd</groupId>
114114
<artifactId>pmd-java</artifactId>
115-
<version>7.22.0</version>
115+
<version>7.23.0</version>
116116
</dependency>
117117
</dependencies>
118118
</plugin>

‎server/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev.mockserver</groupId>
88
<artifactId>server</artifactId>
9-
<version>2.0.5-SNAPSHOT</version>
9+
<version>2.50.5-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>server</name>
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>io.netty</groupId>
5858
<artifactId>netty-bom</artifactId>
59-
<version>4.2.10.Final</version>
59+
<version>4.2.12.Final</version>
6060
<type>pom</type>
6161
<scope>import</scope>
6262
</dependency>
@@ -290,7 +290,7 @@
290290
<dependency>
291291
<groupId>com.puppycrawl.tools</groupId>
292292
<artifactId>checkstyle</artifactId>
293-
<version>13.3.0</version>
293+
<version>13.4.0</version>
294294
</dependency>
295295
</dependencies>
296296
<configuration>
@@ -328,12 +328,12 @@
328328
<dependency>
329329
<groupId>net.sourceforge.pmd</groupId>
330330
<artifactId>pmd-core</artifactId>
331-
<version>7.22.0</version>
331+
<version>7.23.0</version>
332332
</dependency>
333333
<dependency>
334334
<groupId>net.sourceforge.pmd</groupId>
335335
<artifactId>pmd-java</artifactId>
336-
<version>7.22.0</version>
336+
<version>7.23.0</version>
337337
</dependency>
338338
</dependencies>
339339
</plugin>

‎testcontainers/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev.mockserver</groupId>
88
<artifactId>testcontainers</artifactId>
9-
<version>2.0.5-SNAPSHOT</version>
9+
<version>2.50.5-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>testcontainers</name>
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>org.testcontainers</groupId>
5858
<artifactId>testcontainers</artifactId>
59-
<version>2.0.3</version>
59+
<version>2.0.4</version>
6060
<scope>compile</scope>
6161
</dependency>
6262
<!-- Testcontainers is using outdated v1 -->
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>tools.jackson.core</groupId>
8080
<artifactId>jackson-databind</artifactId>
81-
<version>3.1.0</version>
81+
<version>3.1.1</version>
8282
<scope>test</scope>
8383
</dependency>
8484
<dependency>
@@ -282,7 +282,7 @@
282282
<dependency>
283283
<groupId>com.puppycrawl.tools</groupId>
284284
<artifactId>checkstyle</artifactId>
285-
<version>13.3.0</version>
285+
<version>13.4.0</version>
286286
</dependency>
287287
</dependencies>
288288
<configuration>
@@ -320,12 +320,12 @@
320320
<dependency>
321321
<groupId>net.sourceforge.pmd</groupId>
322322
<artifactId>pmd-core</artifactId>
323-
<version>7.22.0</version>
323+
<version>7.23.0</version>
324324
</dependency>
325325
<dependency>
326326
<groupId>net.sourceforge.pmd</groupId>
327327
<artifactId>pmd-java</artifactId>
328-
<version>7.22.0</version>
328+
<version>7.23.0</version>
329329
</dependency>
330330
</dependencies>
331331
</plugin>

0 commit comments

Comments
 (0)