Skip to content

Release #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AB-xdev merged 27 commits into from
Mar 31, 2026
Merged

Release #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
356755e
Merge pull request #401 from xdev-software/master
AB-xdev Mar 16, 2026
d993830
Update dependency org.testcontainers:testcontainers to v2.0.4
xdev-renovate Mar 19, 2026
54101b8
Update dependency io.netty:netty-bom to v4.2.12.Final
xdev-renovate Mar 26, 2026
03772b7
Update dependency tools.jackson.core:jackson-databind to v3.1.1
xdev-renovate Mar 28, 2026
b6c60e6
Update net.sourceforge.pmd to v7.23.0
xdev-renovate Mar 28, 2026
7192c1a
Update dependency com.puppycrawl.tools:checkstyle to v13.4.0
xdev-renovate Mar 30, 2026
33cd0ba
Merge pull request #262 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Mar 30, 2026
c2bcba6
Merge pull request #261 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Mar 30, 2026
225c79b
Prepare for new templating system
AB-xdev Mar 30, 2026
fdda8ee
Merge branch 'master' into update-from-template-xdev-software/base-te…
xdev-gh-bot Mar 30, 2026
38677a8
Merge branch 'master' into update-from-template-xdev-software/java-te…
xdev-gh-bot Mar 30, 2026
fcf8b93
Update upstream.yml
AB-xdev Mar 30, 2026
687c673
Update upstream.yml
AB-xdev Mar 30, 2026
e041eb1
Merge branch 'master' into update-from-template-xdev-software/java-te…
xdev-gh-bot Mar 30, 2026
4bf7267
Bump version to not conflict with testcontainers
AB-xdev Mar 31, 2026
f57deb9
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Mar 31, 2026
3bd9e0b
Merge pull request #404 from xdev-software/renovate/io.netty-netty-bo…
AB-xdev Mar 31, 2026
8a45522
Merge pull request #405 from xdev-software/renovate/tools.jackson.cor…
AB-xdev Mar 31, 2026
e31d480
Merge pull request #402 from xdev-software/renovate/org.testcontainer…
AB-xdev Mar 31, 2026
fa9ccfa
Update upstream.yml
AB-xdev Mar 31, 2026
a810502
Merge remote-tracking branch 'origin/update-from-template-merged' int…
xdev-gh-bot Mar 31, 2026
5eaedcf
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Mar 31, 2026
fb98e73
Merge pull request #409 from xdev-software/update-from-template-merged
AB-xdev Mar 31, 2026
90e450f
Update dependency com.puppycrawl.tools:checkstyle to v13.4.0
xdev-renovate Mar 31, 2026
38ab841
Update net.sourceforge.pmd to v7.23.0
xdev-renovate Mar 31, 2026
43647f2
Merge pull request #407 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Mar 31, 2026
b5df1ea
Merge pull request #406 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Mar 31, 2026
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: 2 additions & 0 deletions .config/topo/upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- url: https://github.com/xdev-software/standard-maven-template.git
branch: master
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 2.50.5
* Bumped version to one that does not conflict with testcontainers (and will likely not do so in the foreseeable future) #403
* Updated dependencies

# 2.0.4
* Updated dependencies

Expand Down
10 changes: 5 additions & 5 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev.mockserver</groupId>
<artifactId>bom</artifactId>
<version>2.0.5-SNAPSHOT</version>
<version>2.50.5-SNAPSHOT</version>
<packaging>pom</packaging>

<name>bom</name>
Expand Down Expand Up @@ -51,22 +51,22 @@
<dependency>
<groupId>software.xdev.mockserver</groupId>
<artifactId>client</artifactId>
<version>2.0.5-SNAPSHOT</version>
<version>2.50.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>software.xdev.mockserver</groupId>
<artifactId>core</artifactId>
<version>2.0.5-SNAPSHOT</version>
<version>2.50.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>software.xdev.mockserver</groupId>
<artifactId>server</artifactId>
<version>2.0.5-SNAPSHOT</version>
<version>2.50.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>software.xdev.mockserver</groupId>
<artifactId>testcontainers</artifactId>
<version>2.0.5-SNAPSHOT</version>
<version>2.50.5-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
8 changes: 4 additions & 4 deletions client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev.mockserver</groupId>
<artifactId>client</artifactId>
<version>2.0.5-SNAPSHOT</version>
<version>2.50.5-SNAPSHOT</version>
<packaging>jar</packaging>

<name>client</name>
Expand Down Expand Up @@ -223,7 +223,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>13.3.0</version>
<version>13.4.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -261,12 +261,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.22.0</version>
<version>7.23.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.22.0</version>
<version>7.23.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
12 changes: 6 additions & 6 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev.mockserver</groupId>
<artifactId>core</artifactId>
<version>2.0.5-SNAPSHOT</version>
<version>2.50.5-SNAPSHOT</version>
<packaging>jar</packaging>

<name>core</name>
Expand Down Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.2.10.Final</version>
<version>4.2.12.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -65,7 +65,7 @@
<dependency>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -271,7 +271,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>13.3.0</version>
<version>13.4.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -309,12 +309,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.22.0</version>
<version>7.23.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.22.0</version>
<version>7.23.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev.mockserver</groupId>
<artifactId>root</artifactId>
<version>2.0.5-SNAPSHOT</version>
<version>2.50.5-SNAPSHOT</version>
<packaging>pom</packaging>

<name>MockServer NeoLight</name>
Expand Down Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>13.3.0</version>
<version>13.4.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -107,12 +107,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.22.0</version>
<version>7.23.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.22.0</version>
<version>7.23.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
10 changes: 5 additions & 5 deletions server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev.mockserver</groupId>
<artifactId>server</artifactId>
<version>2.0.5-SNAPSHOT</version>
<version>2.50.5-SNAPSHOT</version>
<packaging>jar</packaging>

<name>server</name>
Expand Down Expand Up @@ -56,7 +56,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.2.10.Final</version>
<version>4.2.12.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -290,7 +290,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>13.3.0</version>
<version>13.4.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -328,12 +328,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.22.0</version>
<version>7.23.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.22.0</version>
<version>7.23.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
12 changes: 6 additions & 6 deletions testcontainers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev.mockserver</groupId>
<artifactId>testcontainers</artifactId>
<version>2.0.5-SNAPSHOT</version>
<version>2.50.5-SNAPSHOT</version>
<packaging>jar</packaging>

<name>testcontainers</name>
Expand Down Expand Up @@ -56,7 +56,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>2.0.3</version>
<version>2.0.4</version>
<scope>compile</scope>
</dependency>
<!-- Testcontainers is using outdated v1 -->
Expand All @@ -78,7 +78,7 @@
<dependency>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -282,7 +282,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>13.3.0</version>
<version>13.4.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -320,12 +320,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.22.0</version>
<version>7.23.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.22.0</version>
<version>7.23.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down