Skip to content

Commit 75e58e3

Browse files
jangalinskijangalinski
committed
Merge branch 'release/2025.5.0'
2 parents 5a13e0e + 26cbacb commit 75e58e3

File tree

6 files changed

+76
-40
lines changed

6 files changed

+76
-40
lines changed

‎.github/dependabot.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,13 @@ updates:
33
- package-ecosystem: "maven"
44
directory: "/"
55
schedule:
6-
interval: "daily"
7-
open-pull-requests-limit: 10
6+
interval: daily
7+
open-pull-requests-limit: 30
8+
labels: [ "Type: dependencies" ]
9+
10+
- package-ecosystem: "github-actions"
11+
directory: "/"
12+
schedule:
13+
interval: daily
14+
open-pull-requests-limit: 30
15+
labels: [ "Type: dependencies" ]

‎.github/workflows/development.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Development branches
22

3+
permissions:
4+
contents: read
5+
36
on:
47
push:
58
pull_request:

‎.github/workflows/master.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Produces and releases artifacts
22

3+
permissions:
4+
contents: read
5+
36
on:
47
push:
58
branches:
@@ -41,10 +44,11 @@ jobs:
4144

4245
# Publish release
4346
- name: Deploy a new release version to Maven Central
44-
run: ./mvnw clean deploy -B -ntp -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{ secrets.GPG_KEYNAME }}" -Dgpg.passphrase="${{ secrets.GPG_PASSPHRASE }}"
47+
run: ./mvnw clean deploy -B -ntp -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{ secrets.GPG_KEYNAME }}"
4548
env:
4649
OSS_CENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
4750
OSS_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
51+
MAVEN_GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}"
4852

4953
# - name: Upload coverage information
5054
# uses: codecov/codecov-action@v2

‎.github/workflows/release-notes.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
# Trigger the workflow on milestone events
1+
name: Milestone Closure
2+
3+
permissions:
4+
contents: write
5+
26
on:
37
milestone:
48
types: [closed]
5-
name: Milestone Closure
69
jobs:
710
create-release-notes:
811
runs-on: ubuntu-latest

‎README.md‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -51,50 +51,51 @@ are included.
5151

5252
| Type | Version | Info |
5353
|-----------------------|----------|-------------------------------------------|
54-
| kotlin | `2.1.20` | used in kotlin compiler und kotlin libs. |
54+
| kotlin | `2.1.21` | used in kotlin compiler und kotlin libs. |
5555
| java | `17` | compile target |
56-
| kotlinx-coroutines | `1.10.1` | all BOM libs explicitly listed |
56+
| kotlinx-coroutines | `1.10.2` | all BOM libs explicitly listed |
5757
| kotlinx-serialization | `1.8.1` | all BOM libs explicitly listed |
58-
| [kotlin-logging](https://github.com/oshai/kotlin-logging) | `7.0.6` | logging support |
58+
| [kotlin-logging](https://github.com/oshai/kotlin-logging) | `7.0.7` | logging support |
5959

6060
## Libs
6161

6262
| Lib | Version | Info |
6363
|--------|----------|--------------------------------------|
6464
| jetbrains-annotations | `26.0.1` | common annotations |
65-
| junit5 | `5.12.1` | bom dependency, unit testing |
65+
| junit5 | `5.12.2` | bom dependency, unit testing |
6666

6767
## Plugins
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.4.1` | 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-
| [build-helper](https://www.mojohaus.org/build-helper-maven-plugin/) | `3.6.0` | define source directories |
90-
| [gitflow-maven](https://aleksandr-m.github.io/gitflow-maven-plugin/) | `1.21.0` | gitflow relase master/develop/release |
91-
| [jacoco-maven](https://www.eclemma.org/jacoco/trunk/doc/maven.html) | `0.8.12` | test reports |
92-
| [jgiven-maven](https://jgiven.org/userguide/#_maven) | `2.0.2` | jgiven test reports |
93-
| [openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin) | `7.11.0` | openapi/swagger code generation |
94-
| [properties-maven](https://www.mojohaus.org/properties-maven-plugin/) | `1.2.1` | generate build properties for project |
95-
| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html) | `2.18.0` | modify versions of project |
96-
| [nexus-staging-maven](https://github.com/sonatype/nexus-maven-plugins/blob/main/staging/maven-plugin/README.md) | `1.6.13` | release on maven central |
97-
| [maven-wrapper](https://maven.apache.org/wrapper/maven-wrapper-plugin/plugin-info.html) | `3.3.2` | execute maven without central installation |
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.4.1` | 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.0` | 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 |
94+
| [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 |
9899

99100
## Release a new version
100101

‎pom.xml‎

Lines changed: 21 additions & 4 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.4.0</version>
7+
<version>2025.5.0</version>
88

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

4141
<!-- LANGUAGE VERSIONS -->
42-
<kotlin.version>2.1.20</kotlin.version>
42+
<kotlin.version>2.1.21</kotlin.version>
4343
<kotlin.compiler.apiVersion>2.1</kotlin.compiler.apiVersion>
4444
<kotlin.compiler.languageVersion>2.1</kotlin.compiler.languageVersion>
4545
<kotlin.compiler.incremental>${kp.compile.useIncrementalKotlinCompiler}</kotlin.compiler.incremental>
@@ -851,12 +851,11 @@
851851
</configuration>
852852
</plugin>
853853

854-
855854
<!-- [GENERATOR] OPENAPI (version) -->
856855
<plugin>
857856
<groupId>org.openapitools</groupId>
858857
<artifactId>openapi-generator-maven-plugin</artifactId>
859-
<version>7.12.0</version>
858+
<version>7.13.0</version>
860859
</plugin>
861860

862861
<!-- [GENERATOR]: PROPERTIES (writes maven properties to src) (version,execution) -->
@@ -877,6 +876,24 @@
877876
</executions>
878877
</plugin>
879878

879+
<plugin>
880+
<groupId>com.github.hazendaz.maven</groupId>
881+
<artifactId>directory-maven-plugin</artifactId>
882+
<version>1.2.1</version>
883+
<executions>
884+
<execution>
885+
<id>directories</id>
886+
<goals>
887+
<goal>execution-root</goal>
888+
</goals>
889+
<phase>initialize</phase>
890+
<configuration>
891+
<property>project.root.dir</property>
892+
</configuration>
893+
</execution>
894+
</executions>
895+
</plugin>
896+
880897
<!-- VERSIONS (version, config) -->
881898
<plugin>
882899
<groupId>org.codehaus.mojo</groupId>

0 commit comments

Comments
 (0)