Skip to content

Commit

Permalink
Merge branch 'release/2024.12.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
jangalinski committed Dec 22, 2024
2 parents 0f69cc4 + c52ebae commit c61982f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,20 @@ are included.

### Language

| Type | Version | Info |
|-----------------------|----------|-------------------------------------------|
| kotlin | `2.0.21` | used in kotlin compiler und kotlin libs. |
| java | `17` | compile target |
| kotlinx-coroutines | `1.9.0` | all BOM libs explicitly listed |
| kotlinx-serialization | `1.7.3` | all BOM libs explicitly listed |
| kotlin-logging | `3.0.5` | logging support |
| Type | Version | Info |
|-----------------------|---------|-------------------------------------------|
| kotlin | `2.1.0` | used in kotlin compiler und kotlin libs. |
| java | `17` | compile target |
| kotlinx-coroutines | `1.9.1` | all BOM libs explicitly listed |
| kotlinx-serialization | `1.7.3` | all BOM libs explicitly listed |
| kotlin-logging | `3.0.5` | logging support |

## Libs

| Lib | Version | Info |
|--------|----------|--------------------------------------|
| jetbrains-annotations | `26.0.1` | common annotations |
| junit5 | `5.11.3` | bom dependency, unit testing |
| jetbrains-annotations | `26.0.1` | common annotations |
| junit5 | `5.11.4` | bom dependency, unit testing |

## Plugins

Expand All @@ -72,8 +72,8 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
|----------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------|
| [maven-compiler](https://maven.apache.org/plugins/maven-compiler-plugin/) | `3.13.0` | disabling java compiler for kotlin projects |
| [kotlin-maven-plugin](https://kotlinlang.org/docs/maven.html) | `2.0.0` | kotlin compiler plugin |
| [maven-javadoc](https://maven.apache.org/plugins/maven-javadoc-plugin/) | `3.11.1` | include javadoc |
| [dokka](https://kotlinlang.org/docs/dokka-maven.html#apply-dokka) | `1.9.20` | use dokka for javadoc |
| [maven-javadoc](https://maven.apache.org/plugins/maven-javadoc-plugin/) | `3.11.2` | include javadoc |
| [dokka](https://kotlinlang.org/docs/dokka-maven.html#apply-dokka) | `2.0.0` | use dokka for javadoc |
| [avro-maven](https://avro.apache.org/docs/1.11.1/getting-started-java/) | `1.12.0` | avro code generation |
| [maven-clean](https://maven.apache.org/plugins/maven-clean-plugin/) | `3.4.0` | clean project |
| [maven-dependency](https://maven.apache.org/plugins/maven-dependency-plugin/) | `3.8.1` | check/update dependency versions |
Expand All @@ -89,8 +89,8 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
| [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.9.0` | openapi/swagger code generation |
| [jgiven-maven](https://jgiven.org/userguide/#_maven) | `2.0.1` | jgiven test reports |
| [openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin) | `7.10.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.18.0` | 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 |
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>io.toolisticon.maven.parent</groupId>
<artifactId>maven-parent-kotlin-base</artifactId>
<version>2024.12.1</version>
<version>2024.12.2</version>

<name>Maven Parent - Kotlin Base</name>
<description>Maven parent for a holistic kotlin lib project.</description>
Expand Down Expand Up @@ -48,13 +48,13 @@
<jdk.version>17</jdk.version>

<kotlinx-serialization.version>1.7.3</kotlinx-serialization.version>
<kotlinx-coroutines.version>1.9.0</kotlinx-coroutines.version>
<kotlinx-coroutines.version>1.10.1</kotlinx-coroutines.version>
<kotlin-logging.version>3.0.5</kotlin-logging.version>

<jetbrains-annotations.version>26.0.1</jetbrains-annotations.version>

<!-- TEST -->
<junit5.version>5.11.3</junit5.version>
<junit5.version>5.11.4</junit5.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -527,7 +527,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.11.1</version>
<version>3.11.2</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -545,7 +545,7 @@
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>1.9.20</version>
<version>2.0.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -837,7 +837,7 @@
<plugin>
<groupId>com.tngtech.jgiven</groupId>
<artifactId>jgiven-maven-plugin</artifactId>
<version>1.3.1</version>
<version>2.0.1</version>
<executions>
<execution>
<id>generate-report</id>
Expand Down

0 comments on commit c61982f

Please sign in to comment.