Skip to content

Commit 8855c0c

Browse files
AB-xdevAB-xdev
authored
Merge pull request #441 from xdev-software/develop
Release
2 parents 6877428 + 04491d7 commit 8855c0c

26 files changed

Lines changed: 112 additions & 107 deletions

File tree

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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
@@ -202,8 +202,9 @@ jobs:
202202
modules=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
203203
for m in "${modules[@]}"
204204
do
205-
echo "$m/target/site -> ./target/site/$m"
206-
cp -r $m/target/site ./target/site/$m
205+
echo "$m/target/site -> ./target/$m"
206+
mkdir -p ./target/$m
207+
cp -r $m/target/site ./target/$m
207208
done
208209
209210
- 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+
# 2.9.0
2+
* Update to Testcontainers v2
3+
14
# 2.8.2
25
* Updated dependencies
36

‎advanced-demo/entities-metamodel/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.xdev.tci.demo</groupId>
99
<artifactId>advanced-demo</artifactId>
10-
<version>2.8.3-SNAPSHOT</version>
10+
<version>2.9.0-SNAPSHOT</version>
1111
</parent>
1212
<artifactId>entities-metamodel</artifactId>
1313

‎advanced-demo/entities/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.xdev.tci.demo</groupId>
99
<artifactId>advanced-demo</artifactId>
10-
<version>2.8.3-SNAPSHOT</version>
10+
<version>2.9.0-SNAPSHOT</version>
1111
</parent>
1212
<artifactId>entities</artifactId>
1313

‎advanced-demo/integration-tests/persistence-it/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.xdev.tci.demo.it</groupId>
99
<artifactId>integration-tests</artifactId>
10-
<version>2.8.3-SNAPSHOT</version>
10+
<version>2.9.0-SNAPSHOT</version>
1111
</parent>
1212
<artifactId>persistence-it</artifactId>
1313

‎advanced-demo/integration-tests/pom.xml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>software.xdev.tci.demo</groupId>
99
<artifactId>advanced-demo</artifactId>
10-
<version>2.8.3-SNAPSHOT</version>
10+
<version>2.9.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<groupId>software.xdev.tci.demo.it</groupId>
1414
<artifactId>integration-tests</artifactId>
15-
<version>2.8.3-SNAPSHOT</version>
15+
<version>2.9.0-SNAPSHOT</version>
1616
<packaging>pom</packaging>
1717

1818
<modules>
@@ -28,13 +28,13 @@
2828
<dependency>
2929
<groupId>software.xdev.tci.demo.it</groupId>
3030
<artifactId>tci-db</artifactId>
31-
<version>2.8.3-SNAPSHOT</version>
31+
<version>2.9.0-SNAPSHOT</version>
3232
</dependency>
3333

3434
<dependency>
3535
<groupId>software.xdev.tci.demo.it</groupId>
3636
<artifactId>tci-webapp</artifactId>
37-
<version>2.8.3-SNAPSHOT</version>
37+
<version>2.9.0-SNAPSHOT</version>
3838
</dependency>
3939

4040
<dependency>
@@ -71,6 +71,13 @@
7171
<type>pom</type>
7272
<scope>import</scope>
7373
</dependency>
74+
<dependency>
75+
<groupId>org.testcontainers</groupId>
76+
<artifactId>testcontainers-bom</artifactId>
77+
<version>2.0.0</version>
78+
<type>pom</type>
79+
<scope>import</scope>
80+
</dependency>
7481

7582
<!-- Tests -->
7683
<!-- Unit-Tests -->
@@ -86,7 +93,7 @@
8693
<dependency>
8794
<groupId>software.xdev</groupId>
8895
<artifactId>testcontainers-advanced-imagebuilder</artifactId>
89-
<version>2.3.0</version>
96+
<version>2.4.0</version>
9097
</dependency>
9198

9299
<!-- Utility for proxies in tests -->

‎advanced-demo/integration-tests/tci-db/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.xdev.tci.demo.it</groupId>
99
<artifactId>integration-tests</artifactId>
10-
<version>2.8.3-SNAPSHOT</version>
10+
<version>2.9.0-SNAPSHOT</version>
1111
</parent>
1212
<artifactId>tci-db</artifactId>
1313

@@ -35,7 +35,7 @@
3535
<!-- TestContainers -->
3636
<dependency>
3737
<groupId>org.testcontainers</groupId>
38-
<artifactId>jdbc</artifactId>
38+
<artifactId>testcontainers-jdbc</artifactId>
3939
<scope>compile</scope>
4040
</dependency>
4141

‎advanced-demo/integration-tests/tci-webapp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.xdev.tci.demo.it</groupId>
99
<artifactId>integration-tests</artifactId>
10-
<version>2.8.3-SNAPSHOT</version>
10+
<version>2.9.0-SNAPSHOT</version>
1111
</parent>
1212
<artifactId>tci-webapp</artifactId>
1313

‎advanced-demo/integration-tests/webapp-it/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.xdev.tci.demo.it</groupId>
99
<artifactId>integration-tests</artifactId>
10-
<version>2.8.3-SNAPSHOT</version>
10+
<version>2.9.0-SNAPSHOT</version>
1111
</parent>
1212
<artifactId>webapp-it</artifactId>
1313

0 commit comments

Comments
 (0)