Skip to content

Commit e995de9

Browse files
jarkkokajarkkoka
committed
For a couple of libraries, make the version of the corresponding Maven plugin inherit from the Spring Boot Starter parent POM.
1 parent 84f9fbe commit e995de9

File tree

2 files changed

+30
-26
lines changed

2 files changed

+30
-26
lines changed

‎spring-boot/.java-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
11
1+
11.0

‎spring-boot/pom.xml

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>org.springframework.boot</groupId>
8+
<artifactId>spring-boot-starter-parent</artifactId>
9+
<version>2.7.5</version>
10+
<relativePath/> <!-- lookup parent from repository -->
11+
</parent>
612

713
<groupId>fi.hsl.jore4</groupId>
814
<artifactId>map-matching-backend</artifactId>
@@ -21,18 +27,13 @@
2127
<!-- Maven build plugins and their dependencies -->
2228
<build-helper-plugin.version>3.2.0</build-helper-plugin.version>
2329
<build-properties-plugin.version>1.0.0</build-properties-plugin.version>
24-
<flyway-plugin.version>8.5.13</flyway-plugin.version>
25-
<jooq-meta.version>3.14.16</jooq-meta.version>
26-
<kotlin-plugin.version>1.6.21</kotlin-plugin.version>
27-
<postgresql.version>42.3.7</postgresql.version>
2830
<surefire-plugin.version>2.22.2</surefire-plugin.version>
2931

3032
<!-- Library versions -->
3133
<arrow-core.version>1.1.3</arrow-core.version>
3234
<geolatte.version>1.9.0</geolatte.version>
3335
<kotlin-logging-jvm.version>3.0.2</kotlin-logging-jvm.version>
3436
<quicktheories.version>0.26</quicktheories.version>
35-
<spring-boot.version>2.7.5</spring-boot.version>
3637

3738
<!-- Other properties -->
3839
<start.class>fi.hsl.jore4.mapmatching.MapMatchingApplicationKt</start.class>
@@ -96,7 +97,8 @@
9697
<plugin>
9798
<groupId>org.flywaydb</groupId>
9899
<artifactId>flyway-maven-plugin</artifactId>
99-
<version>${flyway-plugin.version}</version>
100+
<!-- version inherited from the Spring Boot parent POM -->
101+
<version>${flyway.version}</version>
100102

101103
<configuration>
102104
<driver>${db.driver}</driver>
@@ -155,7 +157,8 @@
155157
<plugin>
156158
<groupId>org.jooq</groupId>
157159
<artifactId>jooq-codegen-maven</artifactId>
158-
<version>${jooq-meta.version}</version>
160+
<!-- version inherited from the Spring Boot parent POM -->
161+
<version>${jooq.version}</version>
159162

160163
<executions>
161164
<execution>
@@ -173,17 +176,20 @@
173176
<dependency>
174177
<groupId>org.postgresql</groupId>
175178
<artifactId>postgresql</artifactId>
179+
<!-- version inherited from the Spring Boot parent POM -->
176180
<version>${postgresql.version}</version>
177181
</dependency>
178182
<dependency>
179183
<groupId>org.jooq</groupId>
180184
<artifactId>jooq-codegen</artifactId>
181-
<version>${jooq-meta.version}</version>
185+
<!-- version inherited from the Spring Boot parent POM -->
186+
<version>${jooq.version}</version>
182187
</dependency>
183188
<dependency>
184189
<groupId>org.jooq</groupId>
185190
<artifactId>jooq-meta</artifactId>
186-
<version>${jooq-meta.version}</version>
191+
<!-- version inherited from the Spring Boot parent POM -->
192+
<version>${jooq.version}</version>
187193
</dependency>
188194
</dependencies>
189195

@@ -348,7 +354,8 @@
348354
<plugin>
349355
<groupId>org.jetbrains.kotlin</groupId>
350356
<artifactId>kotlin-maven-plugin</artifactId>
351-
<version>${kotlin-plugin.version}</version>
357+
<!-- version inherited from the Spring Boot parent POM -->
358+
<version>${kotlin.version}</version>
352359
<configuration>
353360
<compilerPlugins>
354361
<plugin>spring</plugin>
@@ -378,12 +385,14 @@
378385
<dependency>
379386
<groupId>org.jetbrains.kotlin</groupId>
380387
<artifactId>kotlin-maven-noarg</artifactId>
381-
<version>${kotlin-plugin.version}</version>
388+
<!-- version inherited from the Spring Boot parent POM -->
389+
<version>${kotlin.version}</version>
382390
</dependency>
383391
<dependency>
384392
<groupId>org.jetbrains.kotlin</groupId>
385393
<artifactId>kotlin-maven-allopen</artifactId>
386-
<version>${kotlin-plugin.version}</version>
394+
<!-- version inherited from the Spring Boot parent POM -->
395+
<version>${kotlin.version}</version>
387396
</dependency>
388397
</dependencies>
389398
</plugin>
@@ -434,7 +443,6 @@
434443
<plugin>
435444
<groupId>org.springframework.boot</groupId>
436445
<artifactId>spring-boot-maven-plugin</artifactId>
437-
<version>${spring-boot.version}</version>
438446
<configuration>
439447
<fork>true</fork>
440448
<mainClass>${start.class}</mainClass>
@@ -450,18 +458,6 @@
450458
</plugins>
451459
</build>
452460

453-
<dependencyManagement>
454-
<dependencies>
455-
<dependency>
456-
<groupId>org.springframework.boot</groupId>
457-
<artifactId>spring-boot-dependencies</artifactId>
458-
<version>${spring-boot.version}</version>
459-
<type>pom</type>
460-
<scope>import</scope>
461-
</dependency>
462-
</dependencies>
463-
</dependencyManagement>
464-
465461
<dependencies>
466462
<dependency>
467463
<groupId>org.springframework.boot</groupId>
@@ -495,10 +491,14 @@
495491
<dependency>
496492
<groupId>org.jetbrains.kotlin</groupId>
497493
<artifactId>kotlin-stdlib</artifactId>
494+
<!-- version inherited from the Spring Boot parent POM -->
495+
<version>${kotlin.version}</version>
498496
</dependency>
499497
<dependency>
500498
<groupId>org.jetbrains.kotlin</groupId>
501499
<artifactId>kotlin-reflect</artifactId>
500+
<!-- version inherited from the Spring Boot parent POM -->
501+
<version>${kotlin.version}</version>
502502
</dependency>
503503

504504
<dependency>
@@ -509,6 +509,8 @@
509509
<dependency>
510510
<groupId>org.postgresql</groupId>
511511
<artifactId>postgresql</artifactId>
512+
<!-- version inherited from the Spring Boot parent POM -->
513+
<version>${postgresql.version}</version>
512514
<scope>runtime</scope>
513515
</dependency>
514516

@@ -550,6 +552,8 @@
550552
<dependency>
551553
<groupId>org.jetbrains.kotlin</groupId>
552554
<artifactId>kotlin-test-junit5</artifactId>
555+
<!-- version inherited from the Spring Boot parent POM -->
556+
<version>${kotlin.version}</version>
553557
<scope>test</scope>
554558
</dependency>
555559

0 commit comments

Comments
 (0)