Skip to content

Commit e624c21

Browse files
jangalinskijangalinski
committed
Merge branch 'release/2025.8.0'
2 parents dfc666b + a80c5bb commit e624c21

File tree

4 files changed

+78
-47
lines changed

4 files changed

+78
-47
lines changed

‎.github/workflows/development.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
# Checkout the code
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Expose branch name
2020
run: echo ${{ github.ref }}

‎.github/workflows/master.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Build and run tests
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
# Get GPG private key into GPG
2020
- name: Import GPG Owner Trust

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,18 @@ are included.
5252

5353
| Type | Version | Info |
5454
|-----------------------|----------|-------------------------------------------|
55-
| kotlin | `2.2.0` | used in kotlin compiler und kotlin libs. |
55+
| kotlin | `2.2.10` | 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 |
59-
| [kotlin-logging](https://github.com/oshai/kotlin-logging) | `7.0.7` | logging support |
59+
| [kotlin-logging](https://github.com/oshai/kotlin-logging) | `7.0.13` | logging support |
6060

6161
## Libs
6262

6363
| Lib | Version | Info |
6464
|--------|----------|--------------------------------------|
6565
| jetbrains-annotations | `26.0.1` | common annotations |
66-
| junit5 | `5.13.2` | bom dependency, unit testing |
66+
| junit5 | `5.13.4` | bom dependency, unit testing |
6767

6868
## Plugins
6969

@@ -73,13 +73,13 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
7373
|---------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------|
7474
| [maven-compiler](https://maven.apache.org/plugins/maven-compiler-plugin/) | `3.14.0` | disabling java compiler for kotlin projects |
7575
| [kotlin-maven-plugin](https://kotlinlang.org/docs/maven.html) | `2.0.0` | kotlin compiler plugin |
76-
| [maven-javadoc](https://maven.apache.org/plugins/maven-javadoc-plugin/) | `3.11.2` | include javadoc |
76+
| [maven-javadoc](https://maven.apache.org/plugins/maven-javadoc-plugin/) | `3.11.3` | include javadoc |
7777
| [dokka](https://kotlinlang.org/docs/dokka-maven.html#apply-dokka) | `2.0.0` | use dokka for javadoc |
7878
| [avro-maven](https://avro.apache.org/docs/1.11.1/getting-started-java/) | `1.12.0` | avro code generation |
7979
| [maven-clean](https://maven.apache.org/plugins/maven-clean-plugin/) | `3.5.0` | clean project |
8080
| [maven-dependency](https://maven.apache.org/plugins/maven-dependency-plugin/) | `3.8.1` | check/update dependency versions |
8181
| [maven-deploy](https://maven.apache.org/plugins/maven-deploy-plugin/) | `3.1.4` | - |
82-
| [maven-enforcer](https://maven.apache.org/enforcer/maven-enforcer-plugin/) | `3.6.0` | enforce project setup |
82+
| [maven-enforcer](https://maven.apache.org/enforcer/maven-enforcer-plugin/) | `3.6.1` | enforce project setup |
8383
| [maven-failsafe](https://maven.apache.org/surefire/maven-failsafe-plugin/) | `3.5.3` | testing |
8484
| [maven-gpg](https://maven.apache.org/plugins/maven-gpg-plugin/) | `3.2.8` | sign artifacts for release |
8585
| [maven-install](https://maven.apache.org/plugins/maven-install-plugin/) | `3.1.4` | - |
@@ -97,7 +97,7 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
9797
| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html) | `2.18.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 |
9999
| [maven-wrapper](https://maven.apache.org/wrapper/maven-wrapper-plugin/plugin-info.html) | `3.3.2` | execute maven without central installation |
100-
| [flatten-maven](https://www.mojohaus.org/flatten-maven-plugin/) | `1.7.1` | flatten the released pom |
100+
| [flatten-maven](https://www.mojohaus.org/flatten-maven-plugin/) | `1.7.2` | flatten the released pom |
101101

102102
## Release a new version
103103

‎pom.xml‎

Lines changed: 70 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project
2+
xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
5+
>
36
<modelVersion>4.0.0</modelVersion>
47

58
<groupId>io.toolisticon.maven.parent</groupId>
69
<artifactId>maven-parent-kotlin-base</artifactId>
7-
<version>2025.7.2</version>
10+
<version>2025.8.0</version>
811

912
<name>Maven Parent - Kotlin Base</name>
1013
<description>Maven parent for a holistic kotlin lib project.</description>
@@ -14,14 +17,20 @@
1417
<properties>
1518
<!-- MAVEN PROJECT SETTINGS -->
1619
<project.encoding>UTF-8</project.encoding>
17-
<project.build.sourceEncoding>${project.encoding}</project.build.sourceEncoding>
18-
<project.reporting.outputEncoding>${project.encoding}</project.reporting.outputEncoding>
20+
<project.build.sourceEncoding
21+
>${project.encoding}</project.build.sourceEncoding>
22+
<project.reporting.outputEncoding
23+
>${project.encoding}</project.reporting.outputEncoding>
1924

2025
<!-- KOTLIN PROJECT (KP) CUSTOM SETTINGS -->
21-
<kp.generatedSources>${project.build.directory}/generated-sources</kp.generatedSources>
22-
<kp.generatedTestSources>${project.build.directory}/generated-test-sources</kp.generatedTestSources>
23-
<kp.generatedResources>${project.build.directory}/generated-resources</kp.generatedResources>
24-
<kp.generatedTestResources>${project.build.directory}/generated-test-resources</kp.generatedTestResources>
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>
2534

2635
<kp.mainSources>${project.basedir}/src/main/kotlin</kp.mainSources>
2736
<kp.mainResources>${project.basedir}/src/main/resources</kp.mainResources>
@@ -31,31 +40,34 @@
3140
<!-- set to true to skip deployment (of submodule e.g.) -->
3241
<kp.plugin.skipDeploy>false</kp.plugin.skipDeploy>
3342
<kp.plugin.generateBackupPoms>false</kp.plugin.generateBackupPoms>
34-
<kp.compile.useIncrementalKotlinCompiler>false</kp.compile.useIncrementalKotlinCompiler>
43+
<kp.compile.useIncrementalKotlinCompiler
44+
>false</kp.compile.useIncrementalKotlinCompiler>
3545
<kp.patternClassITest>**/*ITest.*</kp.patternClassITest>
3646
<kp.patternClassTCTest>**/*TCTest.*</kp.patternClassTCTest>
37-
<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
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
3849
</kp.javaOpenModules>
3950
<kp.skipITests>false</kp.skipITests>
4051

4152
<!-- LANGUAGE VERSIONS -->
42-
<kotlin.version>2.2.0</kotlin.version>
53+
<kotlin.version>2.2.10</kotlin.version>
4354

44-
<kotlin.compiler.apiVersion>2.1</kotlin.compiler.apiVersion>
45-
<kotlin.compiler.languageVersion>2.1</kotlin.compiler.languageVersion>
46-
<kotlin.compiler.incremental>${kp.compile.useIncrementalKotlinCompiler}</kotlin.compiler.incremental>
55+
<kotlin.compiler.apiVersion>2.2</kotlin.compiler.apiVersion>
56+
<kotlin.compiler.languageVersion>2.2</kotlin.compiler.languageVersion>
57+
<kotlin.compiler.incremental
58+
>${kp.compile.useIncrementalKotlinCompiler}</kotlin.compiler.incremental>
4759
<kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
4860
<java.version>17</java.version>
4961
<jdk.version>17</jdk.version>
5062

5163
<kotlinx-serialization.version>1.9.0</kotlinx-serialization.version>
5264
<kotlinx-coroutines.version>1.10.2</kotlinx-coroutines.version>
53-
<kotlin-logging.version>7.0.7</kotlin-logging.version>
65+
<kotlin-logging.version>7.0.13</kotlin-logging.version>
5466

5567
<jetbrains-annotations.version>26.0.2</jetbrains-annotations.version>
5668

5769
<!-- TEST -->
58-
<junit5.version>5.13.3</junit5.version>
70+
<junit5.version>5.13.4</junit5.version>
5971
</properties>
6072

6173
<dependencyManagement>
@@ -417,7 +429,8 @@
417429
<configuration>
418430
<jvmTarget>${java.version}</jvmTarget>
419431
<apiVersion>${kotlin.compiler.apiVersion}</apiVersion>
420-
<languageVersion>${kotlin.compiler.languageVersion}</languageVersion>
432+
<languageVersion
433+
>${kotlin.compiler.languageVersion}</languageVersion>
421434

422435
<!-- Compiler plugins need to be configured on this level for IntelliJ to recognize them -->
423436
<compilerPlugins>
@@ -431,7 +444,8 @@
431444
<!-- <option>all-open:annotation=javax.persistence.Entity</option>-->
432445
<!-- <option>all-open:annotation=javax.persistence.MappedSuperclass</option>-->
433446
<!-- <option>all-open:annotation=javax.persistence.Embeddable</option>-->
434-
<option>all-open:annotation=io.toolisticon.testing.jgiven.JGivenKotlinStage</option>
447+
<option
448+
>all-open:annotation=io.toolisticon.testing.jgiven.JGivenKotlinStage</option>
435449
</pluginOptions>
436450
</configuration>
437451

@@ -523,7 +537,7 @@
523537
<plugin>
524538
<groupId>org.apache.maven.plugins</groupId>
525539
<artifactId>maven-javadoc-plugin</artifactId>
526-
<version>3.11.2</version>
540+
<version>3.11.3</version>
527541
<executions>
528542
<execution>
529543
<id>attach-javadocs</id>
@@ -604,7 +618,7 @@
604618
<plugin>
605619
<groupId>org.apache.maven.plugins</groupId>
606620
<artifactId>maven-enforcer-plugin</artifactId>
607-
<version>3.6.0</version>
621+
<version>3.6.1</version>
608622
<executions>
609623
<execution>
610624
<id>enforce-maven</id>
@@ -639,9 +653,11 @@
639653
<exclude>${kp.patternClassTCTest}</exclude>
640654
</excludes>
641655
<!--suppress UnresolvedMavenProperty -->
642-
<argLine>${surefireArgLine} ${kp.javaOpenModules} -Djava.awt.headless=true -XX:+StartAttachListener</argLine>
656+
<argLine
657+
>${surefireArgLine} ${kp.javaOpenModules} -Djava.awt.headless=true -XX:+StartAttachListener</argLine>
643658
<systemPropertyVariables>
644-
<jgiven.report.dir>${project.build.directory}/jgiven-reports/json</jgiven.report.dir>
659+
<jgiven.report.dir
660+
>${project.build.directory}/jgiven-reports/json</jgiven.report.dir>
645661
</systemPropertyVariables>
646662
</configuration>
647663
</plugin>
@@ -659,15 +675,18 @@
659675
</goals>
660676
<configuration>
661677
<skip>${kp.skipITests}</skip>
662-
<classesDirectory>${project.build.outputDirectory}</classesDirectory>
678+
<classesDirectory
679+
>${project.build.outputDirectory}</classesDirectory>
663680
<includes>
664681
<include>${kp.patternClassITest}</include>
665682
<include>${kp.patternClassTCTest}</include>
666683
</includes>
667684
<!--suppress UnresolvedMavenProperty -->
668-
<argLine>${failsafeArgLine} ${kp.javaOpenModules} -Djava.awt.headless=true -XX:+StartAttachListener</argLine>
685+
<argLine
686+
>${failsafeArgLine} ${kp.javaOpenModules} -Djava.awt.headless=true -XX:+StartAttachListener</argLine>
669687
<systemPropertyVariables>
670-
<jgiven.report.dir>${project.build.directory}/jgiven-reports/json</jgiven.report.dir>
688+
<jgiven.report.dir
689+
>${project.build.directory}/jgiven-reports/json</jgiven.report.dir>
671690
</systemPropertyVariables>
672691
</configuration>
673692
</execution>
@@ -758,7 +777,8 @@
758777
<configuration>
759778
<!--suppress UnresolvedMavenProperty -->
760779
<skip>${skipTests}</skip>
761-
<destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
780+
<destFile
781+
>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
762782
<propertyName>surefireArgLine</propertyName>
763783
</configuration>
764784
</execution>
@@ -769,7 +789,8 @@
769789
</goals>
770790
<configuration>
771791
<skip>${kp.skipITests}</skip>
772-
<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
792+
<destFile
793+
>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
773794
<propertyName>failsafeArgLine</propertyName>
774795
</configuration>
775796
</execution>
@@ -781,8 +802,10 @@
781802
</goals>
782803
<configuration>
783804
<skip>${skipTests}</skip>
784-
<dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
785-
<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
805+
<dataFile
806+
>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
807+
<outputDirectory
808+
>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
786809
</configuration>
787810
</execution>
788811
<execution>
@@ -793,8 +816,10 @@
793816
</goals>
794817
<configuration>
795818
<skip>${kp.skipITests}</skip>
796-
<dataFile>${project.build.directory}/coverage-reports/jacoco-it.exec</dataFile>
797-
<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
819+
<dataFile
820+
>${project.build.directory}/coverage-reports/jacoco-it.exec</dataFile>
821+
<outputDirectory
822+
>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
798823
</configuration>
799824
</execution>
800825
</executions>
@@ -832,7 +857,7 @@
832857
<plugin>
833858
<groupId>org.codehaus.mojo</groupId>
834859
<artifactId>flatten-maven-plugin</artifactId>
835-
<version>1.7.1</version>
860+
<version>1.7.2</version>
836861
</plugin>
837862

838863
<!-- [TEST] - JGIVEN (version, configuration, execution) -->
@@ -872,7 +897,8 @@
872897
<goal>write-project-properties</goal>
873898
</goals>
874899
<configuration>
875-
<outputFile>${project.build.outputDirectory}/${project.artifactId}-maven.properties</outputFile>
900+
<outputFile
901+
>${project.build.outputDirectory}/${project.artifactId}-maven.properties</outputFile>
876902
</configuration>
877903
</execution>
878904
</executions>
@@ -902,7 +928,8 @@
902928
<artifactId>versions-maven-plugin</artifactId>
903929
<version>2.18.0</version>
904930
<configuration>
905-
<generateBackupPoms>${kp.plugin.generateBackupPoms}</generateBackupPoms>
931+
<generateBackupPoms
932+
>${kp.plugin.generateBackupPoms}</generateBackupPoms>
906933
</configuration>
907934
</plugin>
908935

@@ -1004,8 +1031,10 @@
10041031
<configuration>
10051032
<archive>
10061033
<manifest>
1007-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
1008-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
1034+
<addDefaultImplementationEntries
1035+
>true</addDefaultImplementationEntries>
1036+
<addDefaultSpecificationEntries
1037+
>true</addDefaultSpecificationEntries>
10091038
</manifest>
10101039
</archive>
10111040
</configuration>
@@ -1042,9 +1071,11 @@
10421071
</licenses>
10431072

10441073
<scm>
1045-
<connection>scm:git:[email protected]:toolisticon/maven-parent-kotlin-base.git</connection>
1074+
<connection
1075+
>scm:git:[email protected]:toolisticon/maven-parent-kotlin-base.git</connection>
10461076
<url>scm:git:[email protected]:toolisticon/maven-parent-kotlin-base.git</url>
1047-
<developerConnection>scm:git:[email protected]:toolisticon/maven-parent-kotlin-base.git</developerConnection>
1077+
<developerConnection
1078+
>scm:git:[email protected]:toolisticon/maven-parent-kotlin-base.git</developerConnection>
10481079
<tag>HEAD</tag>
10491080
</scm>
10501081

0 commit comments

Comments
 (0)