Skip to content

Commit ddf04c9

Browse files
jangalinskijangalinski
committed
update versions and plugins
1 parent 36133a8 commit ddf04c9

File tree

2 files changed

+57
-32
lines changed

2 files changed

+57
-32
lines changed

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,12 @@ are included.
6262

6363
| Lib | Version | Info |
6464
|-----------------------|------------|----------------------|
65+
| api-guardian | `1.1.2` | api annotations |
6566
| jetbrains-annotations | `26.0.2-1` | common annotations |
67+
| assertj | `3.27.4` | bom, test assertions |
68+
| awaitility | `4.3.0` | async testing |
69+
| jgiven | `2.0.3` | BDD testing |
6670
| junit5 | `5.13.4` | bom, unit testing |
67-
| assertj | `3.27.6` | bom, test assertions |
6871
| mockito-kotlin | `6.0.0` | test, mocking |
6972

7073
## Plugins
@@ -77,7 +80,7 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
7780
| [kotlin-maven-plugin](https://kotlinlang.org/docs/maven.html) | `2.0.0` | kotlin compiler plugin |
7881
| [maven-javadoc](https://maven.apache.org/plugins/maven-javadoc-plugin/) | `3.12.0` | include javadoc |
7982
| [dokka](https://kotlinlang.org/docs/dokka-maven.html#apply-dokka) | `2.0.0` | use dokka for javadoc |
80-
| [avro-maven](https://avro.apache.org/docs/1.11.1/getting-started-java/) | `1.12.0` | avro code generation |
83+
| [avro-maven](https://avro.apache.org/docs/1.12.0/getting-started-java/) | `1.12.0` | avro code generation |
8184
| [maven-clean](https://maven.apache.org/plugins/maven-clean-plugin/) | `3.5.0` | clean project |
8285
| [maven-dependency](https://maven.apache.org/plugins/maven-dependency-plugin/) | `3.8.1` | check/update dependency versions |
8386
| [maven-deploy](https://maven.apache.org/plugins/maven-deploy-plugin/) | `3.1.4` | - |
@@ -97,10 +100,10 @@ see [official plugins](https://maven.apache.org/plugins/index.html)
97100
| [openapi-generator](https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin) | `7.15.0` | openapi/swagger code generation |
98101
| [properties-maven](https://www.mojohaus.org/properties-maven-plugin/) | `1.2.1` | generate build properties for project |
99102
| [versions-maven](https://www.mojohaus.org/versions/versions-maven-plugin/index.html) | `2.19.1` | modify versions of project |
103+
| [central-publishing](https://central.sonatype.org/publish/publish-portal-maven/) | `0.9.0` | release on maven central |
100104
| [nexus-staging-maven](https://github.com/sonatype/nexus-maven-plugins/blob/main/staging/maven-plugin/README.md) | `1.6.13` | release on maven central |
101105
| [maven-wrapper](https://maven.apache.org/wrapper/maven-wrapper-plugin/plugin-info.html) | `3.3.4` | execute maven without central installation |
102106
| [flatten-maven](https://www.mojohaus.org/flatten-maven-plugin/) | `1.7.3` | flatten the released pom |
103-
| [central-publishing](https://central.sonatype.org/publish/publish-portal-maven/) | `0.9.0` | sonatype publish |
104107

105108
## Release a new version
106109

‎pom.xml‎

Lines changed: 51 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
<packaging>pom</packaging>
1616

1717
<properties>
18-
<!-- MAVEN PROJECT SETTINGS -->
18+
<!-- region [MAVEN PROJECT SETTINGS] -->
1919
<project.encoding>UTF-8</project.encoding>
2020
<project.build.sourceEncoding>${project.encoding}</project.build.sourceEncoding>
2121
<project.reporting.outputEncoding>${project.encoding}</project.reporting.outputEncoding>
22+
<!-- endregion [MAVEN PROJECT SETTINGS] -->
2223

23-
<!-- KOTLIN PROJECT (KP) CUSTOM SETTINGS -->
24+
<!-- region [KOTLIN PROJECT (KP) CUSTOM SETTINGS] -->
2425
<kp.generatedSources>${project.build.directory}/generated-sources</kp.generatedSources>
2526
<kp.generatedTestSources>${project.build.directory}/generated-test-sources</kp.generatedTestSources>
2627
<kp.generatedResources>${project.build.directory}/generated-resources</kp.generatedResources>
@@ -37,10 +38,12 @@
3738
<kp.compile.useIncrementalKotlinCompiler>false</kp.compile.useIncrementalKotlinCompiler>
3839
<kp.patternClassITest>**/*ITest.*</kp.patternClassITest>
3940
<kp.patternClassTCTest>**/*TCTest.*</kp.patternClassTCTest>
40-
<kp.javaOpenModules>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED</kp.javaOpenModules>
41+
<kp.javaOpenModules>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED
42+
</kp.javaOpenModules>
4143
<kp.skipITests>false</kp.skipITests>
44+
<!-- endregion [KOTLIN PROJECT (KP) CUSTOM SETTINGS] -->
4245

43-
<!-- LANGUAGE VERSIONS -->
46+
<!-- region [LANGUAGE VERSIONS] -->
4447
<kotlin.version>2.2.20</kotlin.version>
4548

4649
<kotlin.compiler.apiVersion>2.2</kotlin.compiler.apiVersion>
@@ -49,25 +52,32 @@
4952
<kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
5053
<java.version>17</java.version>
5154
<jdk.version>17</jdk.version>
55+
<!-- endregion [LANGUAGE VERSIONS] -->
5256

57+
<!-- region [KOTLIN VERSIONS] -->
5358
<kotlinx-serialization.version>1.9.0</kotlinx-serialization.version>
5459
<kotlinx-coroutines.version>1.10.2</kotlinx-coroutines.version>
5560
<kotlin-logging.version>7.0.13</kotlin-logging.version>
61+
<!-- endregion [KOTLIN VERSIONS] -->
5662

63+
<!-- region [RUNTIME VERSIONS] -->
5764
<apiguardian.version>1.1.2</apiguardian.version>
5865
<jetbrains-annotations.version>26.0.2-1</jetbrains-annotations.version>
66+
<!-- endregion [RUNTIME VERSIONS] -->
5967

60-
<!-- TEST -->
68+
<!-- region [TEST VERSIONS] -->
6169
<assertj.version>3.27.6</assertj.version>
70+
<awaitility.version>4.3.0</awaitility.version>
71+
<jgiven.version>2.0.3</jgiven.version>
6272
<junit5.version>5.13.4</junit5.version>
6373
<mockito-kotlin.version>6.0.0</mockito-kotlin.version>
74+
<!-- endregion [TEST VERSIONS] -->
6475
</properties>
6576

6677
<dependencyManagement>
6778
<dependencies>
68-
<!-- KOTLIN (from kotlin-bom) -->
79+
<!-- region [KOTLIN-BOM] -->
6980
<!-- Using the kotlin-bom directly leads to problems with other boms, for example the spring-boot-dependencies -->
70-
<!-- Standard Library -->
7181
<dependency>
7282
<groupId>org.jetbrains.kotlin</groupId>
7383
<artifactId>kotlin-stdlib</artifactId>
@@ -193,14 +203,17 @@
193203
<artifactId>kotlin-daemon-client</artifactId>
194204
<version>${kotlin.version}</version>
195205
</dependency>
196-
<!-- // KOTLIN (from kotlin-bom) -->
206+
<!-- endregion [KOTLIN-BOM] -->
207+
208+
<!-- region [KOTLIN-KSP] -->
197209
<dependency>
198210
<groupId>org.jetbrains.kotlin</groupId>
199211
<artifactId>kotlin-annotation-processing-embeddable</artifactId>
200212
<version>${kotlin.version}</version>
201213
</dependency>
214+
<!-- endregion [KOTLIN-KSP] -->
202215

203-
<!-- KOTLIN SERIALIZATION -->
216+
<!-- region [KOTLIN SERIALIZATION] -->
204217
<dependency>
205218
<groupId>org.jetbrains.kotlinx</groupId>
206219
<artifactId>kotlinx-serialization-cbor-jvm</artifactId>
@@ -266,9 +279,9 @@
266279
<artifactId>kotlinx-serialization-protobuf</artifactId>
267280
<version>${kotlinx-serialization.version}</version>
268281
</dependency>
269-
<!-- // KOTLIN SERIALIZATION -->
282+
<!-- endregion [KOTLIN SERIALIZATION] -->
270283

271-
<!-- KOTLIN COROUTINES -->
284+
<!-- region [KOTLIN COROUTINES] -->
272285
<dependency>
273286
<groupId>org.jetbrains.kotlinx</groupId>
274287
<artifactId>kotlinx-coroutines-android</artifactId>
@@ -354,7 +367,7 @@
354367
<artifactId>kotlinx-coroutines-test</artifactId>
355368
<version>${kotlinx-coroutines.version}</version>
356369
</dependency>
357-
<!-- // KOTLIN COROUTINES -->
370+
<!-- endregion [KOTLIN COROUTINES] -->
358371

359372
<!-- KLOGGING (use as default) -->
360373
<dependency>
@@ -363,19 +376,21 @@
363376
<version>${kotlin-logging.version}</version>
364377
</dependency>
365378

366-
<dependency>
367-
<groupId>org.jetbrains</groupId>
368-
<artifactId>annotations</artifactId>
369-
<version>${jetbrains-annotations.version}</version>
370-
</dependency>
371-
379+
<!-- region [RUNTIME DEPENDENCIES] -->
372380
<dependency>
373381
<groupId>org.apiguardian</groupId>
374382
<artifactId>apiguardian-api</artifactId>
375383
<version>${apiguardian.version}</version>
376384
</dependency>
377385

378-
<!-- TEST -->
386+
<dependency>
387+
<groupId>org.jetbrains</groupId>
388+
<artifactId>annotations</artifactId>
389+
<version>${jetbrains-annotations.version}</version>
390+
</dependency>
391+
<!-- endregion [RUNTIME DEPENDENCIES] -->
392+
393+
<!-- region [TEST DEPENDENCIES] -->
379394
<dependency>
380395
<groupId>org.junit</groupId>
381396
<artifactId>junit-bom</artifactId>
@@ -396,6 +411,13 @@
396411
<version>${mockito-kotlin.version}</version>
397412
<scope>test</scope>
398413
</dependency>
414+
<dependency>
415+
<groupId>org.awaitility</groupId>
416+
<artifactId>awaitility-kotlin</artifactId>
417+
<version>${awaitility.version}</version>
418+
<scope>test</scope>
419+
</dependency>
420+
<!-- endregion [TEST DEPENDENCIES] -->
399421
</dependencies>
400422
</dependencyManagement>
401423

@@ -405,7 +427,8 @@
405427
<sourceDirectory>${kp.mainSources}</sourceDirectory>
406428
<testSourceDirectory>${kp.testSources}</testSourceDirectory>
407429

408-
<!-- RESOURCES: ignore gitkeep marker files -->
430+
<!-- region [RESOURCES] -->
431+
<!-- ignore gitkeep marker files -->
409432
<resources>
410433
<resource>
411434
<directory>${kp.mainResources}</directory>
@@ -425,12 +448,14 @@
425448
</excludes>
426449
</testResource>
427450
</testResources>
451+
<!-- endregion [RESOURCES] -->
428452

429453
<pluginManagement>
430454
<plugins>
431455
<!-- LANGUAGE SETUP -->
432456
<!-- from kotlin doc: "To compile projects that include Kotlin and Java source code, invoke the Kotlin compiler before the Java compiler." -->
433457

458+
<!-- region [COMPILER CONFIGURATION] -->
434459
<!-- KOTLIN -->
435460
<plugin>
436461
<!-- KAPT is optional and has to be configured in modules using it -->
@@ -457,9 +482,7 @@
457482
<!-- <option>all-open:annotation=javax.persistence.Entity</option>-->
458483
<!-- <option>all-open:annotation=javax.persistence.MappedSuperclass</option>-->
459484
<!-- <option>all-open:annotation=javax.persistence.Embeddable</option>-->
460-
<option
461-
>all-open:annotation=io.toolisticon.testing.jgiven.JGivenKotlinStage
462-
</option>
485+
<option>all-open:annotation=io.toolisticon.testing.jgiven.JGivenKotlinStage</option>
463486
</pluginOptions>
464487
</configuration>
465488

@@ -546,7 +569,9 @@
546569
</execution>
547570
</executions>
548571
</plugin>
572+
<!-- endregion [COMPILER CONFIGURATION] -->
549573

574+
<!-- region [DOC CONFIGURATION] -->
550575
<!-- JAVADOC -->
551576
<plugin>
552577
<groupId>org.apache.maven.plugins</groupId>
@@ -585,8 +610,7 @@
585610
<skipEmptyPackages>true</skipEmptyPackages>
586611
</configuration>
587612
</plugin>
588-
589-
<!-- // LANGUAGE SETUP -->
613+
<!-- endregion [DOC CONFIGURATION] -->
590614

591615
<!-- ========== MAVEN OFFICIAL PLUGINS -->
592616

@@ -703,9 +727,7 @@
703727
>${failsafeArgLine} ${kp.javaOpenModules} -Djava.awt.headless=true -XX:+StartAttachListener
704728
</argLine>
705729
<systemPropertyVariables>
706-
<jgiven.report.dir
707-
>${project.build.directory}/jgiven-reports/json
708-
</jgiven.report.dir>
730+
<jgiven.report.dir>${project.build.directory}/jgiven-reports/json</jgiven.report.dir>
709731
</systemPropertyVariables>
710732
</configuration>
711733
</execution>
@@ -889,7 +911,7 @@
889911
<plugin>
890912
<groupId>com.tngtech.jgiven</groupId>
891913
<artifactId>jgiven-maven-plugin</artifactId>
892-
<version>2.0.3</version>
914+
<version>${jgiven.version}</version>
893915
<executions>
894916
<execution>
895917
<id>generate-report</id>

0 commit comments

Comments
 (0)