Skip to content

Commit 299c68e

Browse files
jangalinskijangalinski
committed
Merge branch 'release/2024.7.1'
2 parents ed98cf6 + 26c7108 commit 299c68e

File tree

2 files changed

+186
-49
lines changed

2 files changed

+186
-49
lines changed

‎README.md‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -47,52 +47,51 @@ are included.
4747

4848
### Language
4949

50-
| Type | Version | Info |
51-
|-----------------------|---------|------------------------------------------|
52-
| kotlin | `2.0.0` | used in kotlin compiler und kotlin libs. |
53-
| java | `17` | compile target |
54-
| kotlinx-coroutines | `1.8.1` | BOM |
55-
| kotlinx-serialization | `1.7.1` | BOM |
56-
| kotlin-logging | `3.0.5` | logging support |
50+
| Type | Version | Info |
51+
|-----------------------|---------|-------------------------------------------|
52+
| kotlin | `2.0.0` | used in kotlin compiler und kotlin libs. |
53+
| java | `17` | compile target |
54+
| kotlinx-coroutines | `1.8.1` | all BOM libs explicitly listed |
55+
| kotlinx-serialization | `1.7.1` | all BOM libs explicitly listed |
56+
| kotlin-logging | `3.0.5` | logging support |
5757

5858
## Libs
5959

60-
| Lib | Version | Info |
61-
|--------|----------|------------------------------|
62-
| jetbrains-annotations | `24.1.0` | common annotations |
63-
| junit5 | `5.10.3` | bom dependency, unit testing |
60+
| Lib | Version | Info |
61+
|--------|----------|--------------------------------------|
62+
| jetbrains-annotations | `24.1.0` | common annotations |
63+
| junit5 | `5.10.3` | bom dependency, unit testing |
6464

6565
## Plugins
6666

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

69-
| Plugin | Version | Info |
70-
|---------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------|
71-
| [maven-compiler](https://maven.apache.org/plugins/maven-compiler-plugin/) | `3.13.0` | disabling java compiler for kotlin projects |
72-
| [kotlin-maven-plugin](https://kotlinlang.org/docs/maven.html) | `2.0.0` | kotlin compiler plugin |
73-
| [maven-javadoc](https://maven.apache.org/plugins/maven-javadoc-plugin/) | `3.6.3` | include javadoc |
74-
| [dokka](https://kotlinlang.org/docs/dokka-maven.html#apply-dokka) | `1.9.20` | use dokka for javadoc |
75-
| [avro-maven](https://avro.apache.org/docs/1.11.1/getting-started-java/) | `1.11.3` | avro code generation |
76-
| [maven-clean](https://maven.apache.org/plugins/maven-clean-plugin/) | `3.4.0` | clean project |
77-
| [maven-dependency](https://maven.apache.org/plugins/maven-dependency-plugin/) | `3.7.1` | check/update dependency versions |
78-
| [maven-deploy](https://maven.apache.org/plugins/maven-deploy-plugin/) | `3.1.2` | - |
79-
| [maven-enforcer](https://maven.apache.org/enforcer/maven-enforcer-plugin/) | `3.4.1` | enforce project setup |
80-
| [maven-failsafe](https://maven.apache.org/surefire/maven-failsafe-plugin/) | `3.3.1` | testing |
81-
| [maven-gpg](https://maven.apache.org/plugins/maven-gpg-plugin/) | `3.2.4` | sign artifacts for release |
82-
| [maven-install](https://maven.apache.org/plugins/maven-install-plugin/) | `3.1.2` | - |
83-
| [maven-jar-plugin](https://maven.apache.org/plugins/maven-jar-plugin/) | `3.4.2` | - |
84-
| [maven-resources](https://maven.apache.org/plugins/maven-resources-plugin/) | `3.3.1` | filter resources |
85-
| [maven-surce](https://maven.apache.org/plugins/maven-source-plugin/) | `3.3.1` | add sources to artifacts |
86-
| [maven-surefire](https://maven.apache.org/surefire/maven-surefire-plugin/) | `3.3.1` | testing |
87-
| [build-helper](https://www.mojohaus.org/build-helper-maven-plugin/) | `3.6.0` | define source directories |
88-
| [gitflow-maven](https://aleksandr-m.github.io/gitflow-maven-plugin/) | `1.21.0` | gitflow relase master/develop/release |
89-
| [jacoco-maven](https://www.eclemma.org/jacoco/trunk/doc/maven.html) | `0.8.12` | test reports |
90-
| [jgiven-maven](https://jgiven.org/userguide/#_maven) | `1.3.1` | jgiven test reports |
91-
| [openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin) | `7.6.0` | openapi/swagger code generation |
92-
| [properties-maven](https://www.mojohaus.org/properties-maven-plugin/) | `1.2.1` | generate build properties for project |
93-
| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html) | `2.17.1` | modify versions of project |
94-
| [nexus-staging-maven](https://github.com/sonatype/nexus-maven-plugins/blob/main/staging/maven-plugin/README.md) | `1.6.13` | release on maven central |
95-
69+
| Plugin | Version | Info |
70+
|----------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------|
71+
| [maven-compiler](https://maven.apache.org/plugins/maven-compiler-plugin/) | `3.13.0` | disabling java compiler for kotlin projects |
72+
| [kotlin-maven-plugin](https://kotlinlang.org/docs/maven.html) | `2.0.0` | kotlin compiler plugin |
73+
| [maven-javadoc](https://maven.apache.org/plugins/maven-javadoc-plugin/) | `3.8.0` | include javadoc |
74+
| [dokka](https://kotlinlang.org/docs/dokka-maven.html#apply-dokka) | `1.9.20` | use dokka for javadoc |
75+
| [avro-maven](https://avro.apache.org/docs/1.11.1/getting-started-java/) | `1.11.3` | avro code generation |
76+
| [maven-clean](https://maven.apache.org/plugins/maven-clean-plugin/) | `3.4.0` | clean project |
77+
| [maven-dependency](https://maven.apache.org/plugins/maven-dependency-plugin/) | `3.7.1` | check/update dependency versions |
78+
| [maven-deploy](https://maven.apache.org/plugins/maven-deploy-plugin/) | `3.1.2` | - |
79+
| [maven-enforcer](https://maven.apache.org/enforcer/maven-enforcer-plugin/) | `3.4.1` | enforce project setup |
80+
| [maven-failsafe](https://maven.apache.org/surefire/maven-failsafe-plugin/) | `3.3.1` | testing |
81+
| [maven-gpg](https://maven.apache.org/plugins/maven-gpg-plugin/) | `3.2.4` | sign artifacts for release |
82+
| [maven-install](https://maven.apache.org/plugins/maven-install-plugin/) | `3.1.2` | - |
83+
| [maven-jar-plugin](https://maven.apache.org/plugins/maven-jar-plugin/) | `3.4.2` | - |
84+
| [maven-resources](https://maven.apache.org/plugins/maven-resources-plugin/) | `3.3.1` | filter resources |
85+
| [maven-surce](https://maven.apache.org/plugins/maven-source-plugin/) | `3.3.1` | add sources to artifacts |
86+
| [maven-surefire](https://maven.apache.org/surefire/maven-surefire-plugin/) | `3.3.1` | testing |
87+
| [build-helper](https://www.mojohaus.org/build-helper-maven-plugin/) | `3.6.0` | define source directories |
88+
| [gitflow-maven](https://aleksandr-m.github.io/gitflow-maven-plugin/) | `1.21.0` | gitflow relase master/develop/release |
89+
| [jacoco-maven](https://www.eclemma.org/jacoco/trunk/doc/maven.html) | `0.8.12` | test reports |
90+
| [jgiven-maven](https://jgiven.org/userguide/#_maven) | `1.3.1` | jgiven test reports |
91+
| [openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin) | `7.6.0` | openapi/swagger code generation |
92+
| [properties-maven](https://www.mojohaus.org/properties-maven-plugin/) | `1.2.1` | generate build properties for project |
93+
| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html) | `2.17.1` | modify versions of project |
94+
| [nexus-staging-maven](https://github.com/sonatype/nexus-maven-plugins/blob/main/staging/maven-plugin/README.md) | `1.6.13` | release on maven central |
9695

9796
## Release a new version
9897

‎pom.xml‎

Lines changed: 149 additions & 11 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>2024.7.0</version>
7+
<version>2024.7.1</version>
88

99
<name>Maven Parent - Kotlin Base</name>
1010
<description>Maven parent for a holistic kotlin lib project.</description>
@@ -184,22 +184,161 @@
184184
</dependency>
185185
<!-- // KOTLIN (from kotlin-bom) -->
186186

187+
<!-- KOTLIN SERIALIZATION -->
187188
<dependency>
188189
<groupId>org.jetbrains.kotlinx</groupId>
189-
<artifactId>kotlinx-coroutines-bom</artifactId>
190-
<version>${kotlinx-coroutines.version}</version>
191-
<scope>import</scope>
192-
<type>pom</type>
190+
<artifactId>kotlinx-serialization-cbor-jvm</artifactId>
191+
<version>${kotlinx-serialization.version}</version>
193192
</dependency>
194-
195193
<dependency>
196194
<groupId>org.jetbrains.kotlinx</groupId>
197-
<artifactId>kotlinx-serialization-bom</artifactId>
195+
<artifactId>kotlinx-serialization-cbor</artifactId>
196+
<version>${kotlinx-serialization.version}</version>
197+
</dependency>
198+
<dependency>
199+
<groupId>org.jetbrains.kotlinx</groupId>
200+
<artifactId>kotlinx-serialization-core-jvm</artifactId>
201+
<version>${kotlinx-serialization.version}</version>
202+
</dependency>
203+
<dependency>
204+
<groupId>org.jetbrains.kotlinx</groupId>
205+
<artifactId>kotlinx-serialization-core</artifactId>
206+
<version>${kotlinx-serialization.version}</version>
207+
</dependency>
208+
<dependency>
209+
<groupId>org.jetbrains.kotlinx</groupId>
210+
<artifactId>kotlinx-serialization-hocon</artifactId>
211+
<version>${kotlinx-serialization.version}</version>
212+
</dependency>
213+
<dependency>
214+
<groupId>org.jetbrains.kotlinx</groupId>
215+
<artifactId>kotlinx-serialization-json-jvm</artifactId>
216+
<version>${kotlinx-serialization.version}</version>
217+
</dependency>
218+
<dependency>
219+
<groupId>org.jetbrains.kotlinx</groupId>
220+
<artifactId>kotlinx-serialization-json</artifactId>
221+
<version>${kotlinx-serialization.version}</version>
222+
</dependency>
223+
<dependency>
224+
<groupId>org.jetbrains.kotlinx</groupId>
225+
<artifactId>kotlinx-serialization-json-okio-jvm</artifactId>
226+
<version>${kotlinx-serialization.version}</version>
227+
</dependency>
228+
<dependency>
229+
<groupId>org.jetbrains.kotlinx</groupId>
230+
<artifactId>kotlinx-serialization-json-okio</artifactId>
231+
<version>${kotlinx-serialization.version}</version>
232+
</dependency>
233+
<dependency>
234+
<groupId>org.jetbrains.kotlinx</groupId>
235+
<artifactId>kotlinx-serialization-properties-jvm</artifactId>
236+
<version>${kotlinx-serialization.version}</version>
237+
</dependency>
238+
<dependency>
239+
<groupId>org.jetbrains.kotlinx</groupId>
240+
<artifactId>kotlinx-serialization-properties</artifactId>
241+
<version>${kotlinx-serialization.version}</version>
242+
</dependency>
243+
<dependency>
244+
<groupId>org.jetbrains.kotlinx</groupId>
245+
<artifactId>kotlinx-serialization-protobuf-jvm</artifactId>
246+
<version>${kotlinx-serialization.version}</version>
247+
</dependency>
248+
<dependency>
249+
<groupId>org.jetbrains.kotlinx</groupId>
250+
<artifactId>kotlinx-serialization-protobuf</artifactId>
198251
<version>${kotlinx-serialization.version}</version>
199-
<scope>import</scope>
200-
<type>pom</type>
201252
</dependency>
253+
<!-- // KOTLIN SERIALIZATION -->
202254

255+
<!-- KOTLIN COROUTINES -->
256+
<dependency>
257+
<groupId>org.jetbrains.kotlinx</groupId>
258+
<artifactId>kotlinx-coroutines-android</artifactId>
259+
<version>${kotlinx-coroutines.version}</version>
260+
</dependency>
261+
<dependency>
262+
<groupId>org.jetbrains.kotlinx</groupId>
263+
<artifactId>kotlinx-coroutines-core-jvm</artifactId>
264+
<version>${kotlinx-coroutines.version}</version>
265+
</dependency>
266+
<dependency>
267+
<groupId>org.jetbrains.kotlinx</groupId>
268+
<artifactId>kotlinx-coroutines-core</artifactId>
269+
<version>${kotlinx-coroutines.version}</version>
270+
</dependency>
271+
<dependency>
272+
<groupId>org.jetbrains.kotlinx</groupId>
273+
<artifactId>kotlinx-coroutines-debug</artifactId>
274+
<version>${kotlinx-coroutines.version}</version>
275+
</dependency>
276+
<dependency>
277+
<groupId>org.jetbrains.kotlinx</groupId>
278+
<artifactId>kotlinx-coroutines-guava</artifactId>
279+
<version>${kotlinx-coroutines.version}</version>
280+
</dependency>
281+
<dependency>
282+
<groupId>org.jetbrains.kotlinx</groupId>
283+
<artifactId>kotlinx-coroutines-javafx</artifactId>
284+
<version>${kotlinx-coroutines.version}</version>
285+
</dependency>
286+
<dependency>
287+
<groupId>org.jetbrains.kotlinx</groupId>
288+
<artifactId>kotlinx-coroutines-jdk8</artifactId>
289+
<version>${kotlinx-coroutines.version}</version>
290+
</dependency>
291+
<dependency>
292+
<groupId>org.jetbrains.kotlinx</groupId>
293+
<artifactId>kotlinx-coroutines-jdk9</artifactId>
294+
<version>${kotlinx-coroutines.version}</version>
295+
</dependency>
296+
<dependency>
297+
<groupId>org.jetbrains.kotlinx</groupId>
298+
<artifactId>kotlinx-coroutines-play-services</artifactId>
299+
<version>${kotlinx-coroutines.version}</version>
300+
</dependency>
301+
<dependency>
302+
<groupId>org.jetbrains.kotlinx</groupId>
303+
<artifactId>kotlinx-coroutines-reactive</artifactId>
304+
<version>${kotlinx-coroutines.version}</version>
305+
</dependency>
306+
<dependency>
307+
<groupId>org.jetbrains.kotlinx</groupId>
308+
<artifactId>kotlinx-coroutines-reactor</artifactId>
309+
<version>${kotlinx-coroutines.version}</version>
310+
</dependency>
311+
<dependency>
312+
<groupId>org.jetbrains.kotlinx</groupId>
313+
<artifactId>kotlinx-coroutines-rx2</artifactId>
314+
<version>${kotlinx-coroutines.version}</version>
315+
</dependency>
316+
<dependency>
317+
<groupId>org.jetbrains.kotlinx</groupId>
318+
<artifactId>kotlinx-coroutines-rx3</artifactId>
319+
<version>${kotlinx-coroutines.version}</version>
320+
</dependency>
321+
<dependency>
322+
<groupId>org.jetbrains.kotlinx</groupId>
323+
<artifactId>kotlinx-coroutines-slf4j</artifactId>
324+
<version>${kotlinx-coroutines.version}</version>
325+
</dependency>
326+
<dependency>
327+
<groupId>org.jetbrains.kotlinx</groupId>
328+
<artifactId>kotlinx-coroutines-swing</artifactId>
329+
<version>${kotlinx-coroutines.version}</version>
330+
</dependency>
331+
<dependency>
332+
<groupId>org.jetbrains.kotlinx</groupId>
333+
<artifactId>kotlinx-coroutines-test-jvm</artifactId>
334+
<version>${kotlinx-coroutines.version}</version>
335+
</dependency>
336+
<dependency>
337+
<groupId>org.jetbrains.kotlinx</groupId>
338+
<artifactId>kotlinx-coroutines-test</artifactId>
339+
<version>${kotlinx-coroutines.version}</version>
340+
</dependency>
341+
<!-- // KOTLIN COROUTINES -->
203342

204343
<!-- KLOGGING (use as default) -->
205344
<dependency>
@@ -231,7 +370,6 @@
231370
<sourceDirectory>${kp.mainSources}</sourceDirectory>
232371
<testSourceDirectory>${kp.testSources}</testSourceDirectory>
233372

234-
235373
<!-- RESOURCES: ignore gitkeep marker files -->
236374
<resources>
237375
<resource>
@@ -374,7 +512,7 @@
374512
<plugin>
375513
<groupId>org.apache.maven.plugins</groupId>
376514
<artifactId>maven-javadoc-plugin</artifactId>
377-
<version>3.7.0</version>
515+
<version>3.8.0</version>
378516
<executions>
379517
<execution>
380518
<id>attach-javadocs</id>

0 commit comments

Comments
 (0)