Skip to content

Commit 2a16d2d

Browse files
jangalinskijangalinski
committed
Merge branch 'release/2025.10.2'
2 parents ca0c529 + 4802e8f commit 2a16d2d

File tree

2 files changed

+60
-44
lines changed

2 files changed

+60
-44
lines changed

‎README.md‎

Lines changed: 6 additions & 4 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.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
8+
[![Kotlin](https://img.shields.io/badge/kotlin-2.2.21-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
@@ -52,7 +52,7 @@ are included.
5252

5353
| Type | Version | Info |
5454
|-----------------------|----------|-------------------------------------------|
55-
| kotlin | `2.2.20` | used in kotlin compiler und kotlin libs. |
55+
| kotlin | `2.2.21` | used in kotlin compiler und kotlin libs. |
5656
| java | `17` | compile target |
5757
| kotlinx-coroutines | `1.10.2` | all BOM libs explicitly listed |
5858
| kotlinx-serialization | `1.9.0` | all BOM libs explicitly listed |
@@ -65,8 +65,10 @@ are included.
6565
| api-guardian | `1.1.2` | api annotations |
6666
| jetbrains-annotations | `26.0.2-1` | common annotations |
6767
| logback-classic | `1.5.20` | logging |
68+
| slf4j | `2.0.17` | logging |
6869
| assertj | `3.27.6` | bom, test assertions |
6970
| awaitility | `4.3.0` | async testing |
71+
| equalsverifier | `4.2.1` | test |
7072
| jgiven | `2.0.3` | BDD testing |
7173
| junit | `6.0.0` | bom, unit testing |
7274
| mockito-kotlin | `6.1.0` | test, mocking |
@@ -78,7 +80,7 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
7880
| Plugin | Version | Info |
7981
|---------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------|
8082
| [maven-compiler](https://maven.apache.org/plugins/maven-compiler-plugin/) | `3.14.1` | disabling java compiler for kotlin projects |
81-
| [kotlin-maven-plugin](https://kotlinlang.org/docs/maven.html) | `2.2.0` | kotlin compiler plugin |
83+
| [kotlin-maven-plugin](https://kotlinlang.org/docs/maven.html) | `2.2.21` | kotlin compiler plugin |
8284
| [maven-javadoc](https://maven.apache.org/plugins/maven-javadoc-plugin/) | `3.12.0` | include javadoc |
8385
| [dokka](https://kotlinlang.org/docs/dokka-maven.html#apply-dokka) | `2.1.0` | use dokka for javadoc |
8486
| [avro-maven](https://avro.apache.org/docs/1.12.0/getting-started-java/) | `1.12.1` | avro code generation |
@@ -98,7 +100,7 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
98100
| [gitflow-maven](https://aleksandr-m.github.io/gitflow-maven-plugin/) | `1.21.0` | gitflow relase master/develop/release |
99101
| [jacoco-maven](https://www.eclemma.org/jacoco/trunk/doc/maven.html) | `0.8.14` | test reports |
100102
| [jgiven-maven](https://jgiven.org/userguide/#_maven) | `2.0.3` | jgiven test reports |
101-
| [openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin) | `7.16.0` | openapi/swagger code generation |
103+
| [openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin) | `7.17.0` | openapi/swagger code generation |
102104
| [properties-maven](https://www.mojohaus.org/properties-maven-plugin/) | `1.2.1` | generate build properties for project |
103105
| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html) | `2.19.1` | modify versions of project |
104106
| [central-publishing](https://central.sonatype.org/publish/publish-portal-maven/) | `0.9.0` | release on maven central |

‎pom.xml‎

Lines changed: 54 additions & 40 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.10.1</version>
10+
<version>2025.10.2</version>
1111

1212
<name>Maven Parent - Kotlin Base</name>
1313
<description>Maven parent for a holistic kotlin lib project.</description>
@@ -44,35 +44,17 @@
4444
<!-- endregion [KOTLIN PROJECT (KP) CUSTOM SETTINGS] -->
4545

4646
<!-- region [LANGUAGE VERSIONS] -->
47-
<kotlin.version>2.2.20</kotlin.version>
47+
<kotlin.version>2.2.21</kotlin.version>
4848

4949
<kotlin.compiler.apiVersion>2.2</kotlin.compiler.apiVersion>
5050
<kotlin.compiler.languageVersion>2.2</kotlin.compiler.languageVersion>
5151
<kotlin.compiler.incremental>${kp.compile.useIncrementalKotlinCompiler}</kotlin.compiler.incremental>
5252
<kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
5353
<java.version>17</java.version>
5454
<jdk.version>17</jdk.version>
55-
<!-- endregion [LANGUAGE VERSIONS] -->
56-
57-
<!-- region [KOTLIN VERSIONS] -->
5855
<kotlinx-serialization.version>1.9.0</kotlinx-serialization.version>
5956
<kotlinx-coroutines.version>1.10.2</kotlinx-coroutines.version>
60-
<kotlin-logging.version>7.0.13</kotlin-logging.version>
61-
<!-- endregion [KOTLIN VERSIONS] -->
62-
63-
<!-- region [RUNTIME VERSIONS] -->
64-
<apiguardian.version>1.1.2</apiguardian.version>
65-
<jetbrains-annotations.version>26.0.2-1</jetbrains-annotations.version>
66-
<logback.version>1.5.20</logback.version>
67-
<!-- endregion [RUNTIME VERSIONS] -->
68-
69-
<!-- region [TEST VERSIONS] -->
70-
<assertj.version>3.27.6</assertj.version>
71-
<awaitility.version>4.3.0</awaitility.version>
72-
<jgiven.version>2.0.3</jgiven.version>
73-
<junit5.version>6.0.0</junit5.version>
74-
<mockito-kotlin.version>6.1.0</mockito-kotlin.version>
75-
<!-- endregion [TEST VERSIONS] -->
57+
<!-- endregion [LANGUAGE VERSIONS] -->
7658
</properties>
7759

7860
<dependencyManagement>
@@ -374,53 +356,85 @@
374356
<dependency>
375357
<groupId>io.github.oshai</groupId>
376358
<artifactId>kotlin-logging-jvm</artifactId>
377-
<version>${kotlin-logging.version}</version>
359+
<version>7.0.13</version>
378360
</dependency>
379361

380362
<dependency>
381363
<groupId>ch.qos.logback</groupId>
382364
<artifactId>logback-classic</artifactId>
383-
<version>${logback.version}</version>
365+
<version>1.5.20</version>
384366
</dependency>
385367

386368
<dependency>
387369
<groupId>org.apiguardian</groupId>
388370
<artifactId>apiguardian-api</artifactId>
389-
<version>${apiguardian.version}</version>
371+
<version>1.1.2</version>
390372
</dependency>
391373

392374
<dependency>
393375
<groupId>org.jetbrains</groupId>
394376
<artifactId>annotations</artifactId>
395-
<version>${jetbrains-annotations.version}</version>
377+
<version>26.0.2-1</version>
396378
</dependency>
397-
<!-- endregion [RUNTIME DEPENDENCIES] -->
398379

399-
<!-- region [TEST DEPENDENCIES] -->
400380
<dependency>
401-
<groupId>org.junit</groupId>
402-
<artifactId>junit-bom</artifactId>
403-
<version>${junit5.version}</version>
404-
<type>pom</type>
381+
<groupId>org.slf4j</groupId>
382+
<artifactId>slf4j-bom</artifactId>
383+
<version>2.0.17</version>
405384
<scope>import</scope>
385+
<type>pom</type>
406386
</dependency>
387+
<!-- endregion [RUNTIME DEPENDENCIES] -->
388+
389+
<!-- region [TEST DEPENDENCIES] -->
407390
<dependency>
408391
<groupId>org.assertj</groupId>
409392
<artifactId>assertj-bom</artifactId>
410-
<version>${assertj.version}</version>
393+
<version>3.27.6</version>
411394
<type>pom</type>
412395
<scope>import</scope>
413396
</dependency>
397+
414398
<dependency>
415-
<groupId>org.mockito.kotlin</groupId>
416-
<artifactId>mockito-kotlin</artifactId>
417-
<version>${mockito-kotlin.version}</version>
399+
<groupId>org.awaitility</groupId>
400+
<artifactId>awaitility-kotlin</artifactId>
401+
<version>4.3.0</version>
418402
<scope>test</scope>
419403
</dependency>
404+
420405
<dependency>
421-
<groupId>org.awaitility</groupId>
422-
<artifactId>awaitility-kotlin</artifactId>
423-
<version>${awaitility.version}</version>
406+
<groupId>nl.jqno.equalsverifier</groupId>
407+
<artifactId>equalsverifier</artifactId>
408+
<version>4.2.1</version>
409+
<scope>test</scope>
410+
</dependency>
411+
412+
<dependency>
413+
<groupId>com.tngtech.jgiven</groupId>
414+
<artifactId>jgiven-junit5</artifactId>
415+
<version>2.0.3</version>
416+
<scope>test</scope>
417+
</dependency>
418+
419+
<dependency>
420+
<groupId>com.tngtech.jgiven</groupId>
421+
<artifactId>jgiven-spring-junit5</artifactId>
422+
<version>2.0.3</version>
423+
<scope>test</scope>
424+
</dependency>
425+
426+
<dependency>
427+
<groupId>org.junit</groupId>
428+
<artifactId>junit-bom</artifactId>
429+
<version>6.0.0</version>
430+
<type>pom</type>
431+
<scope>import</scope>
432+
</dependency>
433+
434+
<dependency>
435+
<groupId>org.mockito.kotlin</groupId>
436+
<artifactId>mockito-kotlin</artifactId>
437+
<version>6.1.0</version>
424438
<scope>test</scope>
425439
</dependency>
426440
<!-- endregion [TEST DEPENDENCIES] -->
@@ -917,7 +931,7 @@
917931
<plugin>
918932
<groupId>com.tngtech.jgiven</groupId>
919933
<artifactId>jgiven-maven-plugin</artifactId>
920-
<version>${jgiven.version}</version>
934+
<version>2.0.3</version>
921935
<executions>
922936
<execution>
923937
<id>generate-report</id>
@@ -935,7 +949,7 @@
935949
<plugin>
936950
<groupId>org.openapitools</groupId>
937951
<artifactId>openapi-generator-maven-plugin</artifactId>
938-
<version>7.16.0</version>
952+
<version>7.17.0</version>
939953
</plugin>
940954

941955
<!-- [GENERATOR]: PROPERTIES (writes maven properties to src) (version,execution) -->

0 commit comments

Comments
 (0)