Skip to content

Commit e604adb

Browse files
SimonTaylorSimonTaylor
authored
Merge pull request #1 from spt-development/feature/spring-boot-latest-upgrade
Feature/spring boot latest upgrade
2 parents d8f5e63 + 774a691 commit e604adb

File tree

5 files changed

+49
-116
lines changed

5 files changed

+49
-116
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: java
22

33
jdk:
4-
- openjdk15
4+
- openjdk8
55

66
script:
77
- mvn test -B
@@ -15,7 +15,7 @@ before_deploy:
1515
deploy:
1616
provider: releases
1717
api_key:
18-
secure: FLwpOE+U/VEqEGHWbWOtb31i5X+W9uK77mxM7MRo9jae0lwsoybdciI6cZ/APuzMdZ28jydTdd5bM063CdnlOaJ02qhUOS1uILEHSUk/xurYtnWPvVFgD9IBE//0JElLJN9wG3RIY9GfB/WtZIJfCzUz06GJ4F5+NEYXRNGCuCZCHU3Kd2t1OTsnoDKv3igA2j+HHj2dvhL2zX+d1HZ9nh4CgV8uwh6XWByHSajYRhCVlayRHth1yoBCskUsSDcwnlrIiEqNwc/ooGJOuqdOv67GUARnvbx3YugLTJ0XUbCjiEhl03wg6ALlbVzgGZ2gzTsLQdGXbawjbiDOrGJsJO8soTcFHwoR6No9Dze2/MGPdKRBYeQeo/troPDRTqYm6YcpvQVNUdwo660UYKWm246m35p494Knc3bx93x0nlcBLumPHz5M4/KXAOveqaRh/QFM4wfMXx4zK12XfGebQ6frLeeb3excGtuokoS4+ZzTbaCK01ORdc9522beHzi2G5wxYu/+G9ZIfKVfOpftaJiIEnizHfG9ffgL5S+WBqHQR5vJrggHUFvuyo23Bp49eR9W3AAjhJXQmLxW9XobUqT4wJYzzAtuF9TRmN1nMxBavqRmXL3Lj1VtlOhKbcJ1XZBpXWypSaFQh8heO0RJzK4fuAauSnamGNKxNzmpEkI=
18+
secure: vwXbCHpDKS6U+leOSXfNPykFbhTHN5T9zswpnevEDDS2f3HLjmX40X+5z8mlBuMxcpTVelkafDYbBHbrWwkKlioe++QtKmU2M1viHEJ1yreXB70Ig3+kvQYnQnEBJWuYRdO4YdR3RBLvbbroR4b5eTjlEOKTQXhUs4LzETGM7qmtmAaabbhRcchM+vv3XTEsG0QqYWv1lLCSFjmCVaXy5cItHDafFaIGPtYvFMRYQAJCH4tj1LNfJMl6geITVqM0pX8xjfjvCw/yDjolFOKGJ3EL0cbKv4FT3oSRJQxddtu9LN3dGd49GaHqeX3sZoLfP90RxMWybxpwqVcY/c2n9ORgTgatndKl8bbeVEvxYKZbleKOiCvZl5pJK03WNECIvGVQeeAQcHyFafY0DcfFcIO53T6KGgbSGdrXmCyxEUXW65+o9z0j+I/qvrZhJlcOFbowNAYsoceei5AZPhNbwSxg0djitY5Qz5pb75leg/+sQmP1x89oJE2svPi7tZvm8f7M0166b5wgbI5a2yLOlZwg/0s7RUiEAi7JrczropOi5rO8/xFe/AqK4Atzt4i/3Iep9HMrniP1nJUBSY3RkSC1242qwIBpz+XQ9gfBGCcQJMez1NCk+CZo2DVqr3Yy4OOGxMLZ8KOPei7R73oaxsagUKpVn/9r4QJ3EoEqrnU=
1919
file:
2020
- "spt-development-cid-web-spring-boot-autoconfigure/target/spt-development-cid-web-spring-boot-autoconfigure-${POM_VERSION}.jar"
2121
- "spt-development-cid-web-spring-boot-starter/target/spt-development-cid-web-spring-boot-starter-${POM_VERSION}.jar"

‎pom.xml‎

Lines changed: 19 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.spt-development</groupId>
66
<artifactId>spt-development-cid-web-spring-boot</artifactId>
7-
<version>1.0.0</version>
7+
<version>2.0.0</version>
88

99
<name>cid-web-spring-boot</name>
1010
<description>Library for integrating spt-development/spt-development-cid-web into a Spring Boot application.</description>
@@ -34,83 +34,49 @@
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3535
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3636

37-
<maven.compiler.source>15</maven.compiler.source>
38-
<maven.compiler.target>15</maven.compiler.target>
37+
<maven.compiler.source>8</maven.compiler.source>
38+
<maven.compiler.target>8</maven.compiler.target>
3939

4040
<!-- Dependency versions -->
41-
<servlet-api.version>3.1.0</servlet-api.version>
42-
<slf4j.version>1.7.30</slf4j.version>
43-
<spring.version>5.3.2</spring.version>
44-
<spring-boot.version>2.4.1</spring-boot.version>
45-
<spt-cid.version>1.1.0</spt-cid.version>
46-
<spt-cid-web.version>1.0.1</spt-cid-web.version>
47-
48-
<!-- Test dependency versions -->
49-
<hamcrest.version>2.2</hamcrest.version>
50-
<logback.version>1.2.3</logback.version>
51-
<junit-jupiter.version>5.7.0</junit-jupiter.version>
41+
<spring-boot.version>2.5.4</spring-boot.version>
42+
<spt-audit-spring.version>2.0.0</spt-audit-spring.version>
43+
<spt-cid.version>2.0.0</spt-cid.version>
44+
<spt-cid-web.version>2.0.0</spt-cid-web.version>
5245

5346
<!-- Plugin versions -->
5447
<checkstyle.version>8.39</checkstyle.version>
55-
<checkstyle-maven-plugin.version>3.1.1</checkstyle-maven-plugin.version>
48+
<checkstyle-maven-plugin.version>3.1.2</checkstyle-maven-plugin.version>
5649
<findbugs-slf4j-bug-pattern.version>1.4.2</findbugs-slf4j-bug-pattern.version>
5750
<findbugs-sec-bug-pattern.version>1.8.0</findbugs-sec-bug-pattern.version>
58-
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
51+
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
5952
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
6053
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
61-
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
54+
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
6255
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6356
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
6457
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
6558
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
6659
<nexus-staging-plugin.version>1.6.8</nexus-staging-plugin.version>
67-
<pitest-maven.version>1.6.2</pitest-maven.version>
68-
<spotbugs.version>4.2.0</spotbugs.version>
60+
<pitest-maven.version>1.6.9</pitest-maven.version>
61+
<spotbugs.version>4.2.3</spotbugs.version>
6962
<versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
7063

7164
<!-- Plugin dependencies -->
72-
<asm.version>9.0</asm.version>
65+
<asm.version>9.2</asm.version>
66+
<checkstyle.version>8.45.1</checkstyle.version>
7367
<maven-dependency-analyzer.version>1.11.3</maven-dependency-analyzer.version>
74-
<pitest-junit5-plugin.version>0.12</pitest-junit5-plugin.version>
68+
<pitest-junit5-plugin.version>0.14</pitest-junit5-plugin.version>
7569
</properties>
7670

7771
<dependencyManagement>
7872
<dependencies>
79-
<!-- Spring dependencies -->
80-
<dependency>
81-
<groupId>org.springframework</groupId>
82-
<artifactId>spring-context</artifactId>
83-
<version>${spring.version}</version>
84-
</dependency>
85-
<dependency>
86-
<groupId>org.springframework</groupId>
87-
<artifactId>spring-core</artifactId>
88-
<version>${spring.version}</version>
89-
</dependency>
90-
<dependency>
91-
<groupId>org.springframework</groupId>
92-
<artifactId>spring-web</artifactId>
93-
<version>${spring.version}</version>
94-
</dependency>
95-
<dependency>
96-
<groupId>org.springframework.boot</groupId>
97-
<artifactId>spring-boot</artifactId>
98-
<version>${spring-boot.version}</version>
99-
</dependency>
73+
<!-- BOMs -->
10074
<dependency>
10175
<groupId>org.springframework.boot</groupId>
102-
<artifactId>spring-boot-autoconfigure</artifactId>
103-
<version>${spring-boot.version}</version>
104-
</dependency>
105-
<dependency>
106-
<groupId>org.springframework.boot</groupId>
107-
<artifactId>spring-boot-configuration-processor</artifactId>
108-
<version>${spring-boot.version}</version>
109-
</dependency>
110-
<dependency>
111-
<groupId>org.springframework.boot</groupId>
112-
<artifactId>spring-boot-starter</artifactId>
76+
<artifactId>spring-boot-dependencies</artifactId>
11377
<version>${spring-boot.version}</version>
78+
<type>pom</type>
79+
<scope>import</scope>
11480
</dependency>
11581

11682
<!-- SPT dependencies -->
@@ -124,60 +90,6 @@
12490
<artifactId>spt-development-cid-web</artifactId>
12591
<version>${spt-cid-web.version}</version>
12692
</dependency>
127-
128-
<!-- Third-party dependencies -->
129-
<dependency>
130-
<groupId>javax.servlet</groupId>
131-
<artifactId>javax.servlet-api</artifactId>
132-
<version>${servlet-api.version}</version>
133-
</dependency>
134-
<dependency>
135-
<groupId>org.slf4j</groupId>
136-
<artifactId>slf4j-api</artifactId>
137-
<version>${slf4j.version}</version>
138-
</dependency>
139-
140-
<!-- Test dependencies -->
141-
<dependency>
142-
<groupId>org.junit.jupiter</groupId>
143-
<artifactId>junit-jupiter-api</artifactId>
144-
<version>${junit-jupiter.version}</version>
145-
<scope>test</scope>
146-
</dependency>
147-
<dependency>
148-
<groupId>org.junit.jupiter</groupId>
149-
<artifactId>junit-jupiter-engine</artifactId>
150-
<version>${junit-jupiter.version}</version>
151-
<scope>test</scope>
152-
</dependency>
153-
<dependency>
154-
<groupId>org.hamcrest</groupId>
155-
<artifactId>hamcrest</artifactId>
156-
<version>${hamcrest.version}</version>
157-
<scope>test</scope>
158-
</dependency>
159-
160-
<!-- Spring test dependencies -->
161-
<dependency>
162-
<groupId>org.springframework</groupId>
163-
<artifactId>spring-test</artifactId>
164-
<version>${spring.version}</version>
165-
<scope>test</scope>
166-
</dependency>
167-
<dependency>
168-
<groupId>org.springframework.boot</groupId>
169-
<artifactId>spring-boot-test</artifactId>
170-
<version>${spring-boot.version}</version>
171-
<scope>test</scope>
172-
</dependency>
173-
174-
<!-- Test dependencies not directly related to testing -->
175-
<dependency>
176-
<groupId>ch.qos.logback</groupId>
177-
<artifactId>logback-classic</artifactId>
178-
<version>${logback.version}</version>
179-
<scope>test</scope>
180-
</dependency>
18193
</dependencies>
18294
</dependencyManagement>
18395

‎spt-development-cid-web-spring-boot-autoconfigure/pom.xml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.spt-development</groupId>
99
<artifactId>spt-development-cid-web-spring-boot</artifactId>
10-
<version>1.0.0</version>
10+
<version>2.0.0</version>
1111
</parent>
1212

1313
<artifactId>spt-development-cid-web-spring-boot-autoconfigure</artifactId>
@@ -17,7 +17,7 @@
1717
<packaging>jar</packaging>
1818

1919
<dependencies>
20-
<!-- Spring dependencies - version defined in parent dependencyManagement section -->
20+
<!-- Spring dependencies - version defined in spring-boot bom, import in parent dependencyManagement section -->
2121
<dependency>
2222
<groupId>org.springframework</groupId>
2323
<artifactId>spring-context</artifactId>
@@ -51,40 +51,46 @@
5151
<artifactId>spt-development-cid-web</artifactId>
5252
</dependency>
5353

54-
<!-- Third-party dependencies -->
54+
<!-- Third-party dependencies - version defined in spring-boot bom, import in parent dependencyManagement section -->
5555
<dependency>
56-
<groupId>javax.servlet</groupId>
57-
<artifactId>javax.servlet-api</artifactId>
56+
<groupId>jakarta.servlet</groupId>
57+
<artifactId>jakarta.servlet-api</artifactId>
5858
</dependency>
5959

6060
<!-- Test dependencies - version and scope defined in parent dependencyManagement section -->
6161
<dependency>
6262
<groupId>org.junit.jupiter</groupId>
6363
<artifactId>junit-jupiter-api</artifactId>
64+
<scope>test</scope>
6465
</dependency>
6566
<dependency>
6667
<groupId>org.junit.jupiter</groupId>
6768
<artifactId>junit-jupiter-engine</artifactId>
69+
<scope>test</scope>
6870
</dependency>
6971
<dependency>
7072
<groupId>org.hamcrest</groupId>
7173
<artifactId>hamcrest</artifactId>
74+
<scope>test</scope>
7275
</dependency>
7376

7477
<!-- Spring test dependencies - version and scope defined in parent dependencyManagement section -->
7578
<dependency>
7679
<groupId>org.springframework</groupId>
7780
<artifactId>spring-test</artifactId>
81+
<scope>test</scope>
7882
</dependency>
7983
<dependency>
8084
<groupId>org.springframework.boot</groupId>
8185
<artifactId>spring-boot-test</artifactId>
86+
<scope>test</scope>
8287
</dependency>
8388

8489
<!-- Test dependencies not directly related to testing - version and scope defined in parent dependencyManagement section -->
8590
<dependency>
8691
<groupId>ch.qos.logback</groupId>
8792
<artifactId>logback-classic</artifactId>
93+
<scope>test</scope>
8894
</dependency>
8995
</dependencies>
9096

‎spt-development-cid-web-spring-boot-autoconfigure/spt_checks.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,25 @@
258258
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
259259
</module>
260260
<module name="JavadocMethod">
261-
<property name="scope" value="public"/>
261+
<property name="accessModifiers" value="public"/>
262262
<property name="allowMissingParamTags" value="true"/>
263263
<property name="allowMissingReturnTag" value="true"/>
264264
<property name="allowedAnnotations" value="Override, Test"/>
265+
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
266+
</module>
267+
<module name="MissingJavadocMethod">
268+
<property name="scope" value="public"/>
269+
<property name="minLineCount" value="2"/>
270+
<property name="allowedAnnotations" value="Override, Test"/>
271+
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF,
272+
COMPACT_CTOR_DEF"/>
273+
</module>
274+
<module name="MissingJavadocType">
275+
<property name="scope" value="protected"/>
276+
<property name="tokens"
277+
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
278+
RECORD_DEF, ANNOTATION_DEF"/>
279+
<property name="excludeScope" value="nothing"/>
265280
</module>
266281
<module name="MethodName">
267282
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>

‎spt-development-cid-web-spring-boot-starter/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.spt-development</groupId>
99
<artifactId>spt-development-cid-web-spring-boot</artifactId>
10-
<version>1.0.0</version>
10+
<version>2.0.0</version>
1111
</parent>
1212

1313
<artifactId>spt-development-cid-web-spring-boot-starter</artifactId>

0 commit comments

Comments
 (0)