Skip to content

Commit 4563c78

Browse files
AB-xdevAB-xdev
authored
Merge pull request #324 from xdev-software/develop
Release
2 parents 0dfd604 + c0c53b5 commit 4563c78

File tree

9 files changed

+53
-27
lines changed

9 files changed

+53
-27
lines changed

‎.config/pmd/java/ruleset.xml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204

205205
<rule name="AvoidStringBuilderOrBuffer"
206206
language="java"
207-
message="StringBuilder/ should not be used"
207+
message="StringBuilder/StringBuffer should not be used"
208208
class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
209209
<description>
210210
Usually all cases where `StringBuilder` (or the outdated `StringBuffer`) is used are either due to confusing (legacy) logic or may be replaced by a simpler string concatenation.
@@ -316,6 +316,28 @@
316316
</properties>
317317
</rule>
318318

319+
<rule name="EnsureZipEntryNameIsSanitized"
320+
language="java"
321+
message="ZipEntry name should be sanitized"
322+
class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
323+
<description>
324+
ZipEntry name should be sanitized.
325+
Unsanitized names may contain '..' which can result in path traversal ("ZipSlip").
326+
327+
You can suppress this warning when you properly sanitized the name.
328+
</description>
329+
<priority>4</priority>
330+
<properties>
331+
<property name="xpath">
332+
<value>
333+
<![CDATA[
334+
//MethodCall[pmd-java:matchesSig('java.util.zip.ZipEntry#getName()') or pmd-java:matchesSig('org.apache.commons.compress.archivers.ArchiveEntry#getName()')]
335+
]]>
336+
</value>
337+
</property>
338+
</properties>
339+
</rule>
340+
319341
<rule name="JavaObjectSerializationIsUnsafe"
320342
language="java"
321343
message="Using Java Object (De-)Serialization is unsafe and has led to too many security vulnerabilities"

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,9 @@ jobs:
312312
modules=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
313313
for m in "${modules[@]}"
314314
do
315-
echo "$m/target/site -> ./target/site/$m"
316-
cp -r $m/target/site ./target/site/$m
315+
echo "$m/target/site -> ./target/$m"
316+
mkdir -p ./target/$m
317+
cp -r $m/target/site ./target/$m
317318
done
318319
319320
- name: Deploy to Github pages

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 1.3.0
2+
* Update Testcontainers to v2
3+
14
# 1.2.0
25
* Updated docker image to use Java 25
36
* Use Ahead-of-Time (AoT) Class Loading & Linking

‎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>1.2.1-SNAPSHOT</version>
9+
<version>1.3.0-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>1.2.1-SNAPSHOT</version>
54+
<version>1.3.0-SNAPSHOT</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>software.xdev.mockserver</groupId>
5858
<artifactId>core</artifactId>
59-
<version>1.2.1-SNAPSHOT</version>
59+
<version>1.3.0-SNAPSHOT</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>software.xdev.mockserver</groupId>
6363
<artifactId>server</artifactId>
64-
<version>1.2.1-SNAPSHOT</version>
64+
<version>1.3.0-SNAPSHOT</version>
6565
</dependency>
6666
<dependency>
6767
<groupId>software.xdev.mockserver</groupId>
6868
<artifactId>testcontainers</artifactId>
69-
<version>1.2.1-SNAPSHOT</version>
69+
<version>1.3.0-SNAPSHOT</version>
7070
</dependency>
7171
</dependencies>
7272
</dependencyManagement>

‎client/pom.xml‎

Lines changed: 3 additions & 3 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>1.2.1-SNAPSHOT</version>
9+
<version>1.3.0-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>11.1.0</version>
226+
<version>12.0.1</version>
227227
</dependency>
228228
</dependencies>
229229
<configuration>
@@ -248,7 +248,7 @@
248248
<plugin>
249249
<groupId>org.apache.maven.plugins</groupId>
250250
<artifactId>maven-pmd-plugin</artifactId>
251-
<version>3.27.0</version>
251+
<version>3.28.0</version>
252252
<configuration>
253253
<analysisCache>true</analysisCache>
254254
<includeTests>true</includeTests>

‎core/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>core</artifactId>
9-
<version>1.2.1-SNAPSHOT</version>
9+
<version>1.3.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>core</name>
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>io.netty</groupId>
6363
<artifactId>netty-bom</artifactId>
64-
<version>4.2.6.Final</version>
64+
<version>4.2.7.Final</version>
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>
@@ -281,7 +281,7 @@
281281
<dependency>
282282
<groupId>com.puppycrawl.tools</groupId>
283283
<artifactId>checkstyle</artifactId>
284-
<version>11.1.0</version>
284+
<version>12.0.1</version>
285285
</dependency>
286286
</dependencies>
287287
<configuration>
@@ -306,7 +306,7 @@
306306
<plugin>
307307
<groupId>org.apache.maven.plugins</groupId>
308308
<artifactId>maven-pmd-plugin</artifactId>
309-
<version>3.27.0</version>
309+
<version>3.28.0</version>
310310
<configuration>
311311
<analysisCache>true</analysisCache>
312312
<includeTests>true</includeTests>

‎pom.xml‎

Lines changed: 3 additions & 3 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>1.2.1-SNAPSHOT</version>
9+
<version>1.3.0-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>11.1.0</version>
72+
<version>12.0.1</version>
7373
</dependency>
7474
</dependencies>
7575
<configuration>
@@ -94,7 +94,7 @@
9494
<plugin>
9595
<groupId>org.apache.maven.plugins</groupId>
9696
<artifactId>maven-pmd-plugin</artifactId>
97-
<version>3.27.0</version>
97+
<version>3.28.0</version>
9898
<configuration>
9999
<analysisCache>true</analysisCache>
100100
<includeTests>true</includeTests>

‎server/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>server</artifactId>
9-
<version>1.2.1-SNAPSHOT</version>
9+
<version>1.3.0-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.6.Final</version>
59+
<version>4.2.7.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>11.1.0</version>
293+
<version>12.0.1</version>
294294
</dependency>
295295
</dependencies>
296296
<configuration>
@@ -315,7 +315,7 @@
315315
<plugin>
316316
<groupId>org.apache.maven.plugins</groupId>
317317
<artifactId>maven-pmd-plugin</artifactId>
318-
<version>3.27.0</version>
318+
<version>3.28.0</version>
319319
<configuration>
320320
<analysisCache>true</analysisCache>
321321
<includeTests>true</includeTests>

‎testcontainers/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>testcontainers</artifactId>
9-
<version>1.2.1-SNAPSHOT</version>
9+
<version>1.3.0-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>1.21.3</version>
59+
<version>2.0.0</version>
6060
<scope>compile</scope>
6161
</dependency>
6262
<!-- Testcontainers is using outdated v1 -->
@@ -88,7 +88,7 @@
8888
<dependency>
8989
<groupId>software.xdev</groupId>
9090
<artifactId>testcontainers-advanced-imagebuilder</artifactId>
91-
<version>2.2.1</version>
91+
<version>2.4.0</version>
9292
<scope>test</scope>
9393
</dependency>
9494

@@ -282,7 +282,7 @@
282282
<dependency>
283283
<groupId>com.puppycrawl.tools</groupId>
284284
<artifactId>checkstyle</artifactId>
285-
<version>11.1.0</version>
285+
<version>12.0.1</version>
286286
</dependency>
287287
</dependencies>
288288
<configuration>
@@ -307,7 +307,7 @@
307307
<plugin>
308308
<groupId>org.apache.maven.plugins</groupId>
309309
<artifactId>maven-pmd-plugin</artifactId>
310-
<version>3.27.0</version>
310+
<version>3.28.0</version>
311311
<configuration>
312312
<analysisCache>true</analysisCache>
313313
<includeTests>true</includeTests>

0 commit comments

Comments
 (0)