Skip to content

Commit 442fbb7

Browse files
jangalinskijangalinski
committed
Merge branch 'release/2025.9.1'
2 parents f91c9b1 + 5f13a0c commit 442fbb7

File tree

2 files changed

+29
-12
lines changed

2 files changed

+29
-12
lines changed

‎README.md‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ A common maven parent for usage in kotlin library or application projects.
55
[![stable](https://img.shields.io/badge/lifecycle-STABLE-green.svg)](https://github.com/holisticon#open-source-lifecycle)
66
[![Build Status](https://github.com/toolisticon/maven-parent-kotlin-base/workflows/Development%20branches/badge.svg)](https://github.com/toolisticon/maven-parent-kotlin-base/actions)
77
[![sponsored](https://img.shields.io/badge/sponsoredBy-Holisticon-RED.svg)](https://holisticon.de/)
8-
[![Kotlin](https://img.shields.io/badge/kotlin-2.2.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
8+
[![Kotlin](https://img.shields.io/badge/kotlin-2.2.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
99
[![Maven Central Version](https://img.shields.io/maven-central/v/io.toolisticon.maven.parent/maven-parent-kotlin-base)](https://central.sonatype.com/artifact/io.toolisticon.maven.parent/maven-parent-kotlin-base)
1010

1111
## About
@@ -60,10 +60,12 @@ are included.
6060

6161
## Libs
6262

63-
| Lib | Version | Info |
64-
|--------|----------|--------------------------------------|
65-
| jetbrains-annotations | `26.0.2-1` | common annotations |
66-
| junit5 | `5.13.4` | bom dependency, unit testing |
63+
| Lib | Version | Info |
64+
|-----------------------|------------|----------------------|
65+
| jetbrains-annotations | `26.0.2-1` | common annotations |
66+
| junit5 | `5.13.4` | bom, unit testing |
67+
| assertj | `3.27.4` | bom, test assertions |
68+
| mockito-kotlin | `6.0.0` | test, mocking |
6769

6870
## Plugins
6971

@@ -80,13 +82,13 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
8082
| [maven-dependency](https://maven.apache.org/plugins/maven-dependency-plugin/) | `3.8.1` | check/update dependency versions |
8183
| [maven-deploy](https://maven.apache.org/plugins/maven-deploy-plugin/) | `3.1.4` | - |
8284
| [maven-enforcer](https://maven.apache.org/enforcer/maven-enforcer-plugin/) | `3.6.1` | enforce project setup |
83-
| [maven-failsafe](https://maven.apache.org/surefire/maven-failsafe-plugin/) | `3.5.3` | testing |
85+
| [maven-failsafe](https://maven.apache.org/surefire/maven-failsafe-plugin/) | `3.5.4` | testing |
8486
| [maven-gpg](https://maven.apache.org/plugins/maven-gpg-plugin/) | `3.2.8` | sign artifacts for release |
8587
| [maven-install](https://maven.apache.org/plugins/maven-install-plugin/) | `3.1.4` | - |
8688
| [maven-jar-plugin](https://maven.apache.org/plugins/maven-jar-plugin/) | `3.4.2` | - |
8789
| [maven-resources](https://maven.apache.org/plugins/maven-resources-plugin/) | `3.3.1` | filter resources |
8890
| [maven-source](https://maven.apache.org/plugins/maven-source-plugin/) | `3.3.1` | add sources to artifacts |
89-
| [maven-surefire](https://maven.apache.org/surefire/maven-surefire-plugin/) | `3.5.3` | testing |
91+
| [maven-surefire](https://maven.apache.org/surefire/maven-surefire-plugin/) | `3.5.4` | testing |
9092
| [directory-maven-plugin](https://github.com/hazendaz/directory-maven-plugin) | `1.2.1` | expose root dir for multimudule |
9193
| [build-helper](https://www.mojohaus.org/build-helper-maven-plugin/) | `3.6.1` | define source directories |
9294
| [gitflow-maven](https://aleksandr-m.github.io/gitflow-maven-plugin/) | `1.21.0` | gitflow relase master/develop/release |
@@ -96,7 +98,7 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
9698
| [properties-maven](https://www.mojohaus.org/properties-maven-plugin/) | `1.2.1` | generate build properties for project |
9799
| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html) | `2.19.0` | modify versions of project |
98100
| [nexus-staging-maven](https://github.com/sonatype/nexus-maven-plugins/blob/main/staging/maven-plugin/README.md) | `1.6.13` | release on maven central |
99-
| [maven-wrapper](https://maven.apache.org/wrapper/maven-wrapper-plugin/plugin-info.html) | `3.3.3` | execute maven without central installation |
101+
| [maven-wrapper](https://maven.apache.org/wrapper/maven-wrapper-plugin/plugin-info.html) | `3.3.4` | execute maven without central installation |
100102
| [flatten-maven](https://www.mojohaus.org/flatten-maven-plugin/) | `1.7.2` | flatten the released pom |
101103

102104
## Release a new version

‎pom.xml‎

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

88
<groupId>io.toolisticon.maven.parent</groupId>
99
<artifactId>maven-parent-kotlin-base</artifactId>
10-
<version>2025.9.0</version>
10+
<version>2025.9.1</version>
1111

1212
<name>Maven Parent - Kotlin Base</name>
1313
<description>Maven parent for a holistic kotlin lib project.</description>
@@ -57,7 +57,9 @@
5757
<jetbrains-annotations.version>26.0.2-1</jetbrains-annotations.version>
5858

5959
<!-- TEST -->
60+
<assertj.version>3.27.4</assertj.version>
6061
<junit5.version>5.13.4</junit5.version>
62+
<mockito-kotlin.version>6.0.0</mockito-kotlin.version>
6163
</properties>
6264

6365
<dependencyManagement>
@@ -374,6 +376,19 @@
374376
<type>pom</type>
375377
<scope>import</scope>
376378
</dependency>
379+
<dependency>
380+
<groupId>org.assertj</groupId>
381+
<artifactId>assertj-bom</artifactId>
382+
<version>${assertj.version}</version>
383+
<type>pom</type>
384+
<scope>import</scope>
385+
</dependency>
386+
<dependency>
387+
<groupId>org.mockito.kotlin</groupId>
388+
<artifactId>mockito-kotlin</artifactId>
389+
<version>${mockito-kotlin.version}</version>
390+
<scope>test</scope>
391+
</dependency>
377392
</dependencies>
378393
</dependencyManagement>
379394

@@ -603,7 +618,7 @@
603618
<plugin>
604619
<groupId>org.apache.maven.plugins</groupId>
605620
<artifactId>maven-wrapper-plugin</artifactId>
606-
<version>3.3.3</version>
621+
<version>3.3.4</version>
607622
</plugin>
608623

609624
<!-- ENFORCE (version, java target, maven target) -->
@@ -635,7 +650,7 @@
635650
<plugin>
636651
<groupId>org.apache.maven.plugins</groupId>
637652
<artifactId>maven-surefire-plugin</artifactId>
638-
<version>3.5.3</version>
653+
<version>3.5.4</version>
639654
<configuration>
640655
<useSystemClassLoader>false</useSystemClassLoader>
641656
<shutdown>kill</shutdown>
@@ -660,7 +675,7 @@
660675
<plugin>
661676
<groupId>org.apache.maven.plugins</groupId>
662677
<artifactId>maven-failsafe-plugin</artifactId>
663-
<version>3.5.3</version>
678+
<version>3.5.4</version>
664679
<executions>
665680
<execution>
666681
<id>integration-tests</id>

0 commit comments

Comments
 (0)