Skip to content

Commit f91c9b1

Browse files
jangalinskijangalinski
committed
Merge branch 'release/2025.9.0'
2 parents e624c21 + 61175e2 commit f91c9b1

File tree

4 files changed

+61
-52
lines changed

4 files changed

+61
-52
lines changed

‎.github/workflows/development.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
# Setup JDK and Maven
2323
- name: Set up JDK 17
24-
uses: actions/setup-java@v4
24+
uses: actions/setup-java@v5
2525
with:
2626
java-version: 17
2727
distribution: 'zulu'

‎.github/workflows/master.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
# Setup JDK and .m2/settings.xml
2727
- name: Set up JDK 17
28-
uses: actions/setup-java@v4
28+
uses: actions/setup-java@v5
2929
with:
3030
java-version: 17
3131
distribution: 'zulu'

‎README.md‎

Lines changed: 6 additions & 6 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.0-blue.svg?logo=kotlin)](http://kotlinlang.org)
8+
[![Kotlin](https://img.shields.io/badge/kotlin-2.2.10-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.10` | used in kotlin compiler und kotlin libs. |
55+
| kotlin | `2.2.20` | 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 |
@@ -62,7 +62,7 @@ are included.
6262

6363
| Lib | Version | Info |
6464
|--------|----------|--------------------------------------|
65-
| jetbrains-annotations | `26.0.1` | common annotations |
65+
| jetbrains-annotations | `26.0.2-1` | common annotations |
6666
| junit5 | `5.13.4` | bom dependency, unit testing |
6767

6868
## Plugins
@@ -92,11 +92,11 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
9292
| [gitflow-maven](https://aleksandr-m.github.io/gitflow-maven-plugin/) | `1.21.0` | gitflow relase master/develop/release |
9393
| [jacoco-maven](https://www.eclemma.org/jacoco/trunk/doc/maven.html) | `0.8.13` | test reports |
9494
| [jgiven-maven](https://jgiven.org/userguide/#_maven) | `2.0.2` | jgiven test reports |
95-
| [openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin) | `7.14.0` | openapi/swagger code generation |
95+
| [openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin) | `7.15.0` | openapi/swagger code generation |
9696
| [properties-maven](https://www.mojohaus.org/properties-maven-plugin/) | `1.2.1` | generate build properties for project |
97-
| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html) | `2.18.0` | modify versions of project |
97+
| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html) | `2.19.0` | modify versions of project |
9898
| [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.2` | execute maven without central installation |
99+
| [maven-wrapper](https://maven.apache.org/wrapper/maven-wrapper-plugin/plugin-info.html) | `3.3.3` | execute maven without central installation |
100100
| [flatten-maven](https://www.mojohaus.org/flatten-maven-plugin/) | `1.7.2` | flatten the released pom |
101101

102102
## Release a new version

‎pom.xml‎

Lines changed: 53 additions & 44 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.8.0</version>
10+
<version>2025.9.0</version>
1111

1212
<name>Maven Parent - Kotlin Base</name>
1313
<description>Maven parent for a holistic kotlin lib project.</description>
@@ -17,20 +17,14 @@
1717
<properties>
1818
<!-- MAVEN PROJECT SETTINGS -->
1919
<project.encoding>UTF-8</project.encoding>
20-
<project.build.sourceEncoding
21-
>${project.encoding}</project.build.sourceEncoding>
22-
<project.reporting.outputEncoding
23-
>${project.encoding}</project.reporting.outputEncoding>
20+
<project.build.sourceEncoding>${project.encoding}</project.build.sourceEncoding>
21+
<project.reporting.outputEncoding>${project.encoding}</project.reporting.outputEncoding>
2422

2523
<!-- KOTLIN PROJECT (KP) CUSTOM SETTINGS -->
26-
<kp.generatedSources
27-
>${project.build.directory}/generated-sources</kp.generatedSources>
28-
<kp.generatedTestSources
29-
>${project.build.directory}/generated-test-sources</kp.generatedTestSources>
30-
<kp.generatedResources
31-
>${project.build.directory}/generated-resources</kp.generatedResources>
32-
<kp.generatedTestResources
33-
>${project.build.directory}/generated-test-resources</kp.generatedTestResources>
24+
<kp.generatedSources>${project.build.directory}/generated-sources</kp.generatedSources>
25+
<kp.generatedTestSources>${project.build.directory}/generated-test-sources</kp.generatedTestSources>
26+
<kp.generatedResources>${project.build.directory}/generated-resources</kp.generatedResources>
27+
<kp.generatedTestResources>${project.build.directory}/generated-test-resources</kp.generatedTestResources>
3428

3529
<kp.mainSources>${project.basedir}/src/main/kotlin</kp.mainSources>
3630
<kp.mainResources>${project.basedir}/src/main/resources</kp.mainResources>
@@ -40,22 +34,18 @@
4034
<!-- set to true to skip deployment (of submodule e.g.) -->
4135
<kp.plugin.skipDeploy>false</kp.plugin.skipDeploy>
4236
<kp.plugin.generateBackupPoms>false</kp.plugin.generateBackupPoms>
43-
<kp.compile.useIncrementalKotlinCompiler
44-
>false</kp.compile.useIncrementalKotlinCompiler>
37+
<kp.compile.useIncrementalKotlinCompiler>false</kp.compile.useIncrementalKotlinCompiler>
4538
<kp.patternClassITest>**/*ITest.*</kp.patternClassITest>
4639
<kp.patternClassTCTest>**/*TCTest.*</kp.patternClassTCTest>
47-
<kp.javaOpenModules
48-
>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED
49-
</kp.javaOpenModules>
40+
<kp.javaOpenModules>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED</kp.javaOpenModules>
5041
<kp.skipITests>false</kp.skipITests>
5142

5243
<!-- LANGUAGE VERSIONS -->
53-
<kotlin.version>2.2.10</kotlin.version>
44+
<kotlin.version>2.2.20</kotlin.version>
5445

5546
<kotlin.compiler.apiVersion>2.2</kotlin.compiler.apiVersion>
5647
<kotlin.compiler.languageVersion>2.2</kotlin.compiler.languageVersion>
57-
<kotlin.compiler.incremental
58-
>${kp.compile.useIncrementalKotlinCompiler}</kotlin.compiler.incremental>
48+
<kotlin.compiler.incremental>${kp.compile.useIncrementalKotlinCompiler}</kotlin.compiler.incremental>
5949
<kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
6050
<java.version>17</java.version>
6151
<jdk.version>17</jdk.version>
@@ -64,7 +54,7 @@
6454
<kotlinx-coroutines.version>1.10.2</kotlinx-coroutines.version>
6555
<kotlin-logging.version>7.0.13</kotlin-logging.version>
6656

67-
<jetbrains-annotations.version>26.0.2</jetbrains-annotations.version>
57+
<jetbrains-annotations.version>26.0.2-1</jetbrains-annotations.version>
6858

6959
<!-- TEST -->
7060
<junit5.version>5.13.4</junit5.version>
@@ -430,7 +420,8 @@
430420
<jvmTarget>${java.version}</jvmTarget>
431421
<apiVersion>${kotlin.compiler.apiVersion}</apiVersion>
432422
<languageVersion
433-
>${kotlin.compiler.languageVersion}</languageVersion>
423+
>${kotlin.compiler.languageVersion}
424+
</languageVersion>
434425

435426
<!-- Compiler plugins need to be configured on this level for IntelliJ to recognize them -->
436427
<compilerPlugins>
@@ -445,7 +436,8 @@
445436
<!-- <option>all-open:annotation=javax.persistence.MappedSuperclass</option>-->
446437
<!-- <option>all-open:annotation=javax.persistence.Embeddable</option>-->
447438
<option
448-
>all-open:annotation=io.toolisticon.testing.jgiven.JGivenKotlinStage</option>
439+
>all-open:annotation=io.toolisticon.testing.jgiven.JGivenKotlinStage
440+
</option>
449441
</pluginOptions>
450442
</configuration>
451443

@@ -611,7 +603,7 @@
611603
<plugin>
612604
<groupId>org.apache.maven.plugins</groupId>
613605
<artifactId>maven-wrapper-plugin</artifactId>
614-
<version>3.3.2</version>
606+
<version>3.3.3</version>
615607
</plugin>
616608

617609
<!-- ENFORCE (version, java target, maven target) -->
@@ -654,10 +646,12 @@
654646
</excludes>
655647
<!--suppress UnresolvedMavenProperty -->
656648
<argLine
657-
>${surefireArgLine} ${kp.javaOpenModules} -Djava.awt.headless=true -XX:+StartAttachListener</argLine>
649+
>${surefireArgLine} ${kp.javaOpenModules} -Djava.awt.headless=true -XX:+StartAttachListener
650+
</argLine>
658651
<systemPropertyVariables>
659652
<jgiven.report.dir
660-
>${project.build.directory}/jgiven-reports/json</jgiven.report.dir>
653+
>${project.build.directory}/jgiven-reports/json
654+
</jgiven.report.dir>
661655
</systemPropertyVariables>
662656
</configuration>
663657
</plugin>
@@ -676,17 +670,20 @@
676670
<configuration>
677671
<skip>${kp.skipITests}</skip>
678672
<classesDirectory
679-
>${project.build.outputDirectory}</classesDirectory>
673+
>${project.build.outputDirectory}
674+
</classesDirectory>
680675
<includes>
681676
<include>${kp.patternClassITest}</include>
682677
<include>${kp.patternClassTCTest}</include>
683678
</includes>
684679
<!--suppress UnresolvedMavenProperty -->
685680
<argLine
686-
>${failsafeArgLine} ${kp.javaOpenModules} -Djava.awt.headless=true -XX:+StartAttachListener</argLine>
681+
>${failsafeArgLine} ${kp.javaOpenModules} -Djava.awt.headless=true -XX:+StartAttachListener
682+
</argLine>
687683
<systemPropertyVariables>
688684
<jgiven.report.dir
689-
>${project.build.directory}/jgiven-reports/json</jgiven.report.dir>
685+
>${project.build.directory}/jgiven-reports/json
686+
</jgiven.report.dir>
690687
</systemPropertyVariables>
691688
</configuration>
692689
</execution>
@@ -778,7 +775,8 @@
778775
<!--suppress UnresolvedMavenProperty -->
779776
<skip>${skipTests}</skip>
780777
<destFile
781-
>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
778+
>${project.build.directory}/coverage-reports/jacoco-ut.exec
779+
</destFile>
782780
<propertyName>surefireArgLine</propertyName>
783781
</configuration>
784782
</execution>
@@ -790,7 +788,8 @@
790788
<configuration>
791789
<skip>${kp.skipITests}</skip>
792790
<destFile
793-
>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
791+
>${project.build.directory}/coverage-reports/jacoco-it.exec
792+
</destFile>
794793
<propertyName>failsafeArgLine</propertyName>
795794
</configuration>
796795
</execution>
@@ -803,9 +802,11 @@
803802
<configuration>
804803
<skip>${skipTests}</skip>
805804
<dataFile
806-
>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
805+
>${project.build.directory}/coverage-reports/jacoco-ut.exec
806+
</dataFile>
807807
<outputDirectory
808-
>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
808+
>${project.reporting.outputDirectory}/jacoco-ut
809+
</outputDirectory>
809810
</configuration>
810811
</execution>
811812
<execution>
@@ -817,9 +818,11 @@
817818
<configuration>
818819
<skip>${kp.skipITests}</skip>
819820
<dataFile
820-
>${project.build.directory}/coverage-reports/jacoco-it.exec</dataFile>
821+
>${project.build.directory}/coverage-reports/jacoco-it.exec
822+
</dataFile>
821823
<outputDirectory
822-
>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
824+
>${project.reporting.outputDirectory}/jacoco-it
825+
</outputDirectory>
823826
</configuration>
824827
</execution>
825828
</executions>
@@ -882,7 +885,7 @@
882885
<plugin>
883886
<groupId>org.openapitools</groupId>
884887
<artifactId>openapi-generator-maven-plugin</artifactId>
885-
<version>7.14.0</version>
888+
<version>7.15.0</version>
886889
</plugin>
887890

888891
<!-- [GENERATOR]: PROPERTIES (writes maven properties to src) (version,execution) -->
@@ -898,7 +901,8 @@
898901
</goals>
899902
<configuration>
900903
<outputFile
901-
>${project.build.outputDirectory}/${project.artifactId}-maven.properties</outputFile>
904+
>${project.build.outputDirectory}/${project.artifactId}-maven.properties
905+
</outputFile>
902906
</configuration>
903907
</execution>
904908
</executions>
@@ -926,10 +930,11 @@
926930
<plugin>
927931
<groupId>org.codehaus.mojo</groupId>
928932
<artifactId>versions-maven-plugin</artifactId>
929-
<version>2.18.0</version>
933+
<version>2.19.0</version>
930934
<configuration>
931935
<generateBackupPoms
932-
>${kp.plugin.generateBackupPoms}</generateBackupPoms>
936+
>${kp.plugin.generateBackupPoms}
937+
</generateBackupPoms>
933938
</configuration>
934939
</plugin>
935940

@@ -1032,9 +1037,11 @@
10321037
<archive>
10331038
<manifest>
10341039
<addDefaultImplementationEntries
1035-
>true</addDefaultImplementationEntries>
1040+
>true
1041+
</addDefaultImplementationEntries>
10361042
<addDefaultSpecificationEntries
1037-
>true</addDefaultSpecificationEntries>
1043+
>true
1044+
</addDefaultSpecificationEntries>
10381045
</manifest>
10391046
</archive>
10401047
</configuration>
@@ -1072,10 +1079,12 @@
10721079

10731080
<scm>
10741081
<connection
1075-
>scm:git:[email protected]:toolisticon/maven-parent-kotlin-base.git</connection>
1082+
>scm:git:[email protected]:toolisticon/maven-parent-kotlin-base.git
1083+
</connection>
10761084
<url>scm:git:[email protected]:toolisticon/maven-parent-kotlin-base.git</url>
10771085
<developerConnection
1078-
>scm:git:[email protected]:toolisticon/maven-parent-kotlin-base.git</developerConnection>
1086+
>scm:git:[email protected]:toolisticon/maven-parent-kotlin-base.git
1087+
</developerConnection>
10791088
<tag>HEAD</tag>
10801089
</scm>
10811090

0 commit comments

Comments
 (0)