Skip to content

Commit e8662d4

Browse files
jangalinskijangalinski
committed
Merge branch 'release/2025.6.1'
2 parents 813ab32 + 6973b81 commit e8662d4

File tree

2 files changed

+43
-32
lines changed

2 files changed

+43
-32
lines changed

‎README.md‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -68,34 +68,35 @@ are included.
6868

6969
see [official plugins](https://maven.apache.org/plugins/index.html)
7070

71-
| Plugin | Version | Info |
72-
|-------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------|
73-
| [maven-compiler](https://maven.apache.org/plugins/maven-compiler-plugin/) | `3.14.0` | disabling java compiler for kotlin projects |
74-
| [kotlin-maven-plugin](https://kotlinlang.org/docs/maven.html) | `2.0.0` | kotlin compiler plugin |
75-
| [maven-javadoc](https://maven.apache.org/plugins/maven-javadoc-plugin/) | `3.11.2` | include javadoc |
76-
| [dokka](https://kotlinlang.org/docs/dokka-maven.html#apply-dokka) | `2.0.0` | use dokka for javadoc |
77-
| [avro-maven](https://avro.apache.org/docs/1.11.1/getting-started-java/) | `1.12.0` | avro code generation |
78-
| [maven-clean](https://maven.apache.org/plugins/maven-clean-plugin/) | `3.5.0` | clean project |
79-
| [maven-dependency](https://maven.apache.org/plugins/maven-dependency-plugin/) | `3.8.1` | check/update dependency versions |
80-
| [maven-deploy](https://maven.apache.org/plugins/maven-deploy-plugin/) | `3.1.4` | - |
81-
| [maven-enforcer](https://maven.apache.org/enforcer/maven-enforcer-plugin/) | `3.4.1` | enforce project setup |
82-
| [maven-failsafe](https://maven.apache.org/surefire/maven-failsafe-plugin/) | `3.5.3` | testing |
83-
| [maven-gpg](https://maven.apache.org/plugins/maven-gpg-plugin/) | `3.2.7` | sign artifacts for release |
84-
| [maven-install](https://maven.apache.org/plugins/maven-install-plugin/) | `3.1.4` | - |
85-
| [maven-jar-plugin](https://maven.apache.org/plugins/maven-jar-plugin/) | `3.4.2` | - |
86-
| [maven-resources](https://maven.apache.org/plugins/maven-resources-plugin/) | `3.3.1` | filter resources |
87-
| [maven-source](https://maven.apache.org/plugins/maven-source-plugin/) | `3.3.1` | add sources to artifacts |
88-
| [maven-surefire](https://maven.apache.org/surefire/maven-surefire-plugin/) | `3.5.3` | testing |
89-
| [directory-maven-plugin](https://github.com/hazendaz/directory-maven-plugin) | `1.2.1` | expose root dir for multimudule |
90-
| [build-helper](https://www.mojohaus.org/build-helper-maven-plugin/) | `3.6.1` | define source directories |
91-
| [gitflow-maven](https://aleksandr-m.github.io/gitflow-maven-plugin/) | `1.21.0` | gitflow relase master/develop/release |
92-
| [jacoco-maven](https://www.eclemma.org/jacoco/trunk/doc/maven.html) | `0.8.13` | test reports |
93-
| [jgiven-maven](https://jgiven.org/userguide/#_maven) | `2.0.2` | jgiven test reports |
71+
| Plugin | Version | Info |
72+
|---------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------|
73+
| [maven-compiler](https://maven.apache.org/plugins/maven-compiler-plugin/) | `3.14.0` | disabling java compiler for kotlin projects |
74+
| [kotlin-maven-plugin](https://kotlinlang.org/docs/maven.html) | `2.0.0` | kotlin compiler plugin |
75+
| [maven-javadoc](https://maven.apache.org/plugins/maven-javadoc-plugin/) | `3.11.2` | include javadoc |
76+
| [dokka](https://kotlinlang.org/docs/dokka-maven.html#apply-dokka) | `2.0.0` | use dokka for javadoc |
77+
| [avro-maven](https://avro.apache.org/docs/1.11.1/getting-started-java/) | `1.12.0` | avro code generation |
78+
| [maven-clean](https://maven.apache.org/plugins/maven-clean-plugin/) | `3.5.0` | clean project |
79+
| [maven-dependency](https://maven.apache.org/plugins/maven-dependency-plugin/) | `3.8.1` | check/update dependency versions |
80+
| [maven-deploy](https://maven.apache.org/plugins/maven-deploy-plugin/) | `3.1.4` | - |
81+
| [maven-enforcer](https://maven.apache.org/enforcer/maven-enforcer-plugin/) | `3.4.1` | enforce project setup |
82+
| [maven-failsafe](https://maven.apache.org/surefire/maven-failsafe-plugin/) | `3.5.3` | testing |
83+
| [maven-gpg](https://maven.apache.org/plugins/maven-gpg-plugin/) | `3.2.7` | sign artifacts for release |
84+
| [maven-install](https://maven.apache.org/plugins/maven-install-plugin/) | `3.1.4` | - |
85+
| [maven-jar-plugin](https://maven.apache.org/plugins/maven-jar-plugin/) | `3.4.2` | - |
86+
| [maven-resources](https://maven.apache.org/plugins/maven-resources-plugin/) | `3.3.1` | filter resources |
87+
| [maven-source](https://maven.apache.org/plugins/maven-source-plugin/) | `3.3.1` | add sources to artifacts |
88+
| [maven-surefire](https://maven.apache.org/surefire/maven-surefire-plugin/) | `3.5.3` | testing |
89+
| [directory-maven-plugin](https://github.com/hazendaz/directory-maven-plugin) | `1.2.1` | expose root dir for multimudule |
90+
| [build-helper](https://www.mojohaus.org/build-helper-maven-plugin/) | `3.6.1` | define source directories |
91+
| [gitflow-maven](https://aleksandr-m.github.io/gitflow-maven-plugin/) | `1.21.0` | gitflow relase master/develop/release |
92+
| [jacoco-maven](https://www.eclemma.org/jacoco/trunk/doc/maven.html) | `0.8.13` | test reports |
93+
| [jgiven-maven](https://jgiven.org/userguide/#_maven) | `2.0.2` | jgiven test reports |
9494
| [openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin) | `7.11.0` | openapi/swagger code generation |
95-
| [properties-maven](https://www.mojohaus.org/properties-maven-plugin/) | `1.2.1` | generate build properties for project |
96-
| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html) | `2.18.0` | modify versions of project |
97-
| [nexus-staging-maven](https://github.com/sonatype/nexus-maven-plugins/blob/main/staging/maven-plugin/README.md) | `1.6.13` | release on maven central |
98-
| [maven-wrapper](https://maven.apache.org/wrapper/maven-wrapper-plugin/plugin-info.html) | `3.3.2` | execute maven without central installation |
95+
| [properties-maven](https://www.mojohaus.org/properties-maven-plugin/) | `1.2.1` | generate build properties for project |
96+
| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html) | `2.18.0` | modify versions of project |
97+
| [nexus-staging-maven](https://github.com/sonatype/nexus-maven-plugins/blob/main/staging/maven-plugin/README.md) | `1.6.13` | release on maven central |
98+
| [maven-wrapper](https://maven.apache.org/wrapper/maven-wrapper-plugin/plugin-info.html) | `3.3.2` | execute maven without central installation |
99+
| [flatten-maven](https://www.mojohaus.org/flatten-maven-plugin/) | `1.7.0` | flatten the released pom |
99100

100101
## Release a new version
101102

‎pom.xml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>io.toolisticon.maven.parent</groupId>
66
<artifactId>maven-parent-kotlin-base</artifactId>
7-
<version>2025.6.0</version>
7+
<version>2025.6.1</version>
88

99
<name>Maven Parent - Kotlin Base</name>
1010
<description>Maven parent for a holistic kotlin lib project.</description>
@@ -39,7 +39,11 @@
3939
<kp.skipITests>false</kp.skipITests>
4040

4141
<!-- LANGUAGE VERSIONS -->
42-
<kotlin.version>2.1.21</kotlin.version>
42+
<kotlin.version>2.2.0</kotlin.version>
43+
44+
<!-- FIXME: 2.1.21 was the last release with kotlin-annotation-processing-compiler -->
45+
<kotlin-annotation-processing-compiler.version>2.1.21</kotlin-annotation-processing-compiler.version>
46+
<version>${kotlin.version}</version>
4347
<kotlin.compiler.apiVersion>2.1</kotlin.compiler.apiVersion>
4448
<kotlin.compiler.languageVersion>2.1</kotlin.compiler.languageVersion>
4549
<kotlin.compiler.incremental>${kp.compile.useIncrementalKotlinCompiler}</kotlin.compiler.incremental>
@@ -54,7 +58,7 @@
5458
<jetbrains-annotations.version>26.0.2</jetbrains-annotations.version>
5559

5660
<!-- TEST -->
57-
<junit5.version>5.13.1</junit5.version>
61+
<junit5.version>5.13.2</junit5.version>
5862
</properties>
5963

6064
<dependencyManagement>
@@ -196,7 +200,7 @@
196200
<dependency>
197201
<groupId>org.jetbrains.kotlin</groupId>
198202
<artifactId>kotlin-annotation-processing-compiler</artifactId>
199-
<version>${kotlin.version}</version>
203+
<version>${kotlin-annotation-processing-compiler.version}</version>
200204
</dependency>
201205

202206
<!-- KOTLIN SERIALIZATION -->
@@ -833,6 +837,12 @@
833837
</configuration>
834838
</plugin>
835839

840+
<plugin>
841+
<groupId>org.codehaus.mojo</groupId>
842+
<artifactId>flatten-maven-plugin</artifactId>
843+
<version>1.7.1</version>
844+
</plugin>
845+
836846
<!-- [TEST] - JGIVEN (version, configuration, execution) -->
837847
<plugin>
838848
<groupId>com.tngtech.jgiven</groupId>
@@ -855,7 +865,7 @@
855865
<plugin>
856866
<groupId>org.openapitools</groupId>
857867
<artifactId>openapi-generator-maven-plugin</artifactId>
858-
<version>7.13.0</version>
868+
<version>7.14.0</version>
859869
</plugin>
860870

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

0 commit comments

Comments
 (0)