Merge branch 'release/2024.7.0'

toolisticon · Jul 16, 2024 · ed98cf6 · ed98cf6
2 parents 4ffd841 + 5c77375
commit ed98cf6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 33 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,19 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
-
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
diff --git a/README.md b/README.md
@@ -52,15 +52,15 @@ are included.
 | kotlin                | `2.0.0` | used in kotlin compiler und kotlin libs. |
 | java                  | `17`    | compile target                           |
 | kotlinx-coroutines    | `1.8.1` | BOM                                      |
-| kotlinx-serialization | `1.7.0` | BOM                                      |
+| kotlinx-serialization | `1.7.1` | BOM                                      |
 | kotlin-logging        | `3.0.5` | logging support                          |
 
 ## Libs
 
 | Lib    | Version  | Info                         |
 |--------|----------|------------------------------|
 | jetbrains-annotations | `24.1.0`   | common annotations |
-| junit5 | `5.10.2`   | bom dependency, unit testing |
+| junit5 | `5.10.3`   | bom dependency, unit testing |
 
 ## Plugins
 
@@ -77,20 +77,20 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
 | [maven-dependency](https://maven.apache.org/plugins/maven-dependency-plugin/)                                             | `3.7.1`  | check/update dependency versions            |
 | [maven-deploy](https://maven.apache.org/plugins/maven-deploy-plugin/)                                                     | `3.1.2`  | -                                           |
 | [maven-enforcer](https://maven.apache.org/enforcer/maven-enforcer-plugin/)                                                | `3.4.1`  | enforce project setup                       |
-| [maven-failsafe](https://maven.apache.org/surefire/maven-failsafe-plugin/)                                                | `3.3.0`  | testing                                     |
+| [maven-failsafe](https://maven.apache.org/surefire/maven-failsafe-plugin/)                                                | `3.3.1`  | testing                                     |
 | [maven-gpg](https://maven.apache.org/plugins/maven-gpg-plugin/)                                                           | `3.2.4`  | sign artifacts for release                  |
 | [maven-install](https://maven.apache.org/plugins/maven-install-plugin/)                                                   | `3.1.2`  | -                                           |
 | [maven-jar-plugin](https://maven.apache.org/plugins/maven-jar-plugin/)                                                    | `3.4.2`  | -                                           |
 | [maven-resources](https://maven.apache.org/plugins/maven-resources-plugin/)                                               | `3.3.1`  | filter resources                            |
 | [maven-surce](https://maven.apache.org/plugins/maven-source-plugin/)                                                      | `3.3.1`  | add sources to artifacts                    |
-| [maven-surefire](https://maven.apache.org/surefire/maven-surefire-plugin/)                                                | `3.3.0`  | testing                                     |
+| [maven-surefire](https://maven.apache.org/surefire/maven-surefire-plugin/)                                                | `3.3.1`  | testing                                     |
 | [build-helper](https://www.mojohaus.org/build-helper-maven-plugin/)                                                       | `3.6.0`  | define source directories                   |
 | [gitflow-maven](https://aleksandr-m.github.io/gitflow-maven-plugin/)                                                      | `1.21.0` | gitflow relase master/develop/release       |
 | [jacoco-maven](https://www.eclemma.org/jacoco/trunk/doc/maven.html)                                                       | `0.8.12` | test reports                                |
 | [jgiven-maven](https://jgiven.org/userguide/#_maven)                                                                      | `1.3.1`  | jgiven test reports                         |
 | [openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin) | `7.6.0`  | openapi/swagger code generation             |
 | [properties-maven](https://www.mojohaus.org/properties-maven-plugin/)                                                     | `1.2.1`  | generate build properties for project       |
-| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html)                                      | `2.16.2` | modify versions of project                  |
+| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html)                                      | `2.17.1` | modify versions of project                  |
 | [nexus-staging-maven](https://github.com/sonatype/nexus-maven-plugins/blob/main/staging/maven-plugin/README.md)           | `1.6.13` | release on maven central                    |
 
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>io.toolisticon.maven.parent</groupId>
   <artifactId>maven-parent-kotlin-base</artifactId>
-  <version>2024.6.1</version>
+  <version>2024.7.0</version>
 
   <name>Maven Parent - Kotlin Base</name>
   <description>Maven parent for a holistic kotlin lib project.</description>
@@ -40,8 +40,8 @@
 
     <!-- LANGUAGE VERSIONS -->
     <kotlin.version>2.0.0</kotlin.version>
-    <kotlin.compiler.languageVersion>1.9</kotlin.compiler.languageVersion>
-    <kotlin.compiler.apiVersion>1.9</kotlin.compiler.apiVersion>
+    <kotlin.compiler.apiVersion>2.0</kotlin.compiler.apiVersion>
+    <kotlin.compiler.languageVersion>2.0</kotlin.compiler.languageVersion>
     <kotlin.compiler.incremental>${kp.compile.useIncrementalKotlinCompiler}</kotlin.compiler.incremental>
     <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
     <java.version>17</java.version>
@@ -267,8 +267,8 @@
 
           <configuration>
             <jvmTarget>${java.version}</jvmTarget>
-            <apiVersion>1.9</apiVersion>
-            <languageVersion>1.9</languageVersion>
+            <apiVersion>${kotlin.compiler.apiVersion}</apiVersion>
+            <languageVersion>${kotlin.compiler.languageVersion}</languageVersion>
 
             <!-- Compiler plugins need to be configured on this level for IntelliJ to recognize them -->
             <compilerPlugins>
@@ -473,7 +473,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.3.1</version>
           <configuration>
             <useSystemClassLoader>false</useSystemClassLoader>
             <shutdown>kill</shutdown>
@@ -494,7 +494,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.3.1</version>
           <executions>
             <execution>
               <id>integration-tests</id>
@@ -696,7 +696,7 @@
         <plugin>
           <groupId>org.openapitools</groupId>
           <artifactId>openapi-generator-maven-plugin</artifactId>
-          <version>7.6.0</version>
+          <version>7.7.0</version>
         </plugin>
 
         <!-- [GENERATOR]: PROPERTIES (writes maven properties to src) (version,execution) -->
@@ -721,7 +721,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>versions-maven-plugin</artifactId>
-          <version>2.16.2</version>
+          <version>2.17.1</version>
           <configuration>
             <generateBackupPoms>${kp.plugin.generateBackupPoms}</generateBackupPoms>
           </configuration>