Skip to content

Commit 1a666eb

Browse files
SimonTaylorSimonTaylor
authored
Merge pull request #1 from spt-development/feature/spring-boot-latest-upgrade
Feature/spring boot latest upgrade
2 parents a5a2b68 + cbd12e8 commit 1a666eb

File tree

5 files changed

+46
-94
lines changed

5 files changed

+46
-94
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: DV3NL+lLQd/QZaDCr5qTJphiP7TLwTz8fozEP42Ub555dhsf0yTMxleWuOTVpuGMnvWiwO9T0E7QKYh+nIOmaIWLCE8KGw3PwFkhvg9PzYZn0XqrySzqAj1MZy3HpnNaiGyoRywae72AUwQ+t+fvL41TcHcREUGX/106+NXnOzXRDOFXOtPb3krQ8Ut1EN9iIRM9qc7dkKr8tF++SgQaTpitgvuA1ng7QAUv+L9PyKyEjdVGCEXDaaxSIvH7wV4/9Ouy/wgSDLxF6EK4Wg4jk11dqw/yg4k9OEl1iqobQPoTP9XHjN0a0nnISROi/qUrdCfBKxko87pJ+usi4tRPbgNVBdL65FGoucglYPyaWS7IRxtX2jiGYFMHpF8q2SyVjXjukkIEHoUh6rNRfn+NUIhVBuzmQDYqBIgcJTQ1BmdmarPsPHeAnGzO3aEZOHkfJppLsDwRJxdqdsbUu0m3vC7jFPZdIUNZ2r1mboGBxqaQegqZwj7ChiK55sZ7SL3NFOZRiO9dQY93yqiiW4/p/JBO04b+aOBDQoPcmLSSxrKaqeskvYUkQew39PeBddT2CYZJVVODWAavKK1YZrekshiFs/PWmvCo6j6OuP7PPhbVMWTucAejPwRv26Paa41hLEUVQMAh6XW6RBlABCxfDKwJ4aYWvleHiI7rY+9skoE=
18+
secure: tNrgQeaH6gn+JH2IV7DqJ3oaGgQYMvku8mAmuKZMqg/TLkWbopeaaO9SK83SOOqnj9QL25rSan/THFBtofa8nd3SACGP0+eAzhNRyRHZ7HET/Na2BPS2uhcDMsKSv27dv16BXqRDSs/rAh76CKg54KlU5Oik/zoET78/KMawuREpgojT41znCrFfNNvYEo6wmkBxE2P3g4Wdrd8nmcHGkyHbIV0NQOcE0myhbR0wAzqoydavCiWBwSE1m1GjDaejJaq1Od/HL4WrjCkBptx4qldOZG866lFA037CHUAkBWu8Rs8n8AlMgY22gykzQwriX+Xy8+/f05/Oj+ldoAr8IewzmM1JohwHmJpnaq5TLzfLYIOxjEhne2SvUMcXIHPYtWQ3bvvsXBxPnWdiXz0HWgNF2gC2dJrBlaarfI+Vcw1mCsir0fJFWUIStvLHIlSnK5DNbU5MQ1kJrHP01YwOTLTVYxFNWgxT+9eGUMrvPgyskflya5iRTJdkNWde3czl4XdEQ+XxuYs8v6EBliMYD3nqf6/K/37E1AUOh//QXFtZCna8Rkbfhuc/PWAA8Us7XtAZDkTAh8YF2LrYh9pw7U0wxunD1zLCpB4lq8KjqaAP81lRXEfjq/IvjpU0Qw+JLSH54JO9yuxqq6kyCCWbzt3s5weP3Vl7IY4Oaobriv4=
1919
file:
2020
- "spt-development-logging-spring-boot-autoconfigure/target/spt-development-logging-spring-boot-autoconfigure-${POM_VERSION}.jar"
2121
- "spt-development-logging-spring-boot-starter/target/spt-development-logging-spring-boot-starter-${POM_VERSION}.jar"

‎pom.xml‎

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

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

99
<name>logging-spring-boot</name>
1010
<description>Library for integrating spt-development/spt-development-logging-spring into a Spring Boot application.</description>
@@ -34,77 +34,48 @@
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-
<slf4j.version>1.7.30</slf4j.version>
42-
<spring.version>5.3.2</spring.version>
43-
<spring-boot.version>2.4.1</spring-boot.version>
44-
<spt-cid.version>1.1.0</spt-cid.version>
45-
<spt-logging-spring.version>1.0.0</spt-logging-spring.version>
46-
47-
<!-- Test dependency versions -->
48-
<hamcrest.version>2.2</hamcrest.version>
49-
<logback.version>1.2.3</logback.version>
50-
<junit-jupiter.version>5.7.0</junit-jupiter.version>
41+
<spring-boot.version>2.5.4</spring-boot.version>
42+
<spt-cid.version>2.0.0</spt-cid.version>
43+
<spt-logging-spring.version>2.0.0</spt-logging-spring.version>
5144

5245
<!-- Plugin versions -->
5346
<checkstyle.version>8.39</checkstyle.version>
54-
<checkstyle-maven-plugin.version>3.1.1</checkstyle-maven-plugin.version>
47+
<checkstyle-maven-plugin.version>3.1.2</checkstyle-maven-plugin.version>
5548
<findbugs-slf4j-bug-pattern.version>1.4.2</findbugs-slf4j-bug-pattern.version>
5649
<findbugs-sec-bug-pattern.version>1.8.0</findbugs-sec-bug-pattern.version>
57-
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
50+
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
5851
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
5952
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
60-
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
53+
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
6154
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6255
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
6356
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
6457
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
6558
<nexus-staging-plugin.version>1.6.8</nexus-staging-plugin.version>
66-
<pitest-maven.version>1.6.2</pitest-maven.version>
67-
<spotbugs.version>4.2.0</spotbugs.version>
59+
<pitest-maven.version>1.6.9</pitest-maven.version>
60+
<spotbugs.version>4.2.3</spotbugs.version>
6861
<versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
6962

7063
<!-- Plugin dependencies -->
71-
<asm.version>9.0</asm.version>
64+
<asm.version>9.2</asm.version>
65+
<checkstyle.version>8.45.1</checkstyle.version>
7266
<maven-dependency-analyzer.version>1.11.3</maven-dependency-analyzer.version>
73-
<pitest-junit5-plugin.version>0.12</pitest-junit5-plugin.version>
67+
<pitest-junit5-plugin.version>0.14</pitest-junit5-plugin.version>
7468
</properties>
7569

7670
<dependencyManagement>
7771
<dependencies>
78-
<!-- Spring dependencies -->
79-
<dependency>
80-
<groupId>org.springframework</groupId>
81-
<artifactId>spring-context</artifactId>
82-
<version>${spring.version}</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.springframework</groupId>
86-
<artifactId>spring-core</artifactId>
87-
<version>${spring.version}</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.springframework</groupId>
91-
<artifactId>spring-jms</artifactId>
92-
<version>${spring.version}</version>
93-
</dependency>
94-
<dependency>
95-
<groupId>org.springframework</groupId>
96-
<artifactId>spring-web</artifactId>
97-
<version>${spring.version}</version>
98-
</dependency>
99-
<dependency>
100-
<groupId>org.springframework.boot</groupId>
101-
<artifactId>spring-boot-autoconfigure</artifactId>
102-
<version>${spring-boot.version}</version>
103-
</dependency>
72+
<!-- BOMs -->
10473
<dependency>
10574
<groupId>org.springframework.boot</groupId>
106-
<artifactId>spring-boot-starter</artifactId>
75+
<artifactId>spring-boot-dependencies</artifactId>
10776
<version>${spring-boot.version}</version>
77+
<type>pom</type>
78+
<scope>import</scope>
10879
</dependency>
10980

11081
<!-- SPT dependencies -->
@@ -118,41 +89,6 @@
11889
<artifactId>spt-development-logging-spring</artifactId>
11990
<version>${spt-logging-spring.version}</version>
12091
</dependency>
121-
122-
<!-- Third-party dependencies -->
123-
<dependency>
124-
<groupId>org.slf4j</groupId>
125-
<artifactId>slf4j-api</artifactId>
126-
<version>${slf4j.version}</version>
127-
</dependency>
128-
129-
<!-- Test dependencies -->
130-
<dependency>
131-
<groupId>org.junit.jupiter</groupId>
132-
<artifactId>junit-jupiter-api</artifactId>
133-
<version>${junit-jupiter.version}</version>
134-
<scope>test</scope>
135-
</dependency>
136-
<dependency>
137-
<groupId>org.junit.jupiter</groupId>
138-
<artifactId>junit-jupiter-engine</artifactId>
139-
<version>${junit-jupiter.version}</version>
140-
<scope>test</scope>
141-
</dependency>
142-
<dependency>
143-
<groupId>org.hamcrest</groupId>
144-
<artifactId>hamcrest</artifactId>
145-
<version>${hamcrest.version}</version>
146-
<scope>test</scope>
147-
</dependency>
148-
149-
<!-- Test dependencies not directly related to testing -->
150-
<dependency>
151-
<groupId>ch.qos.logback</groupId>
152-
<artifactId>logback-classic</artifactId>
153-
<version>${logback.version}</version>
154-
<scope>test</scope>
155-
</dependency>
15692
</dependencies>
15793
</dependencyManagement>
15894

‎spt-development-logging-spring-boot-autoconfigure/pom.xml‎

Lines changed: 8 additions & 4 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-logging-spring-boot</artifactId>
10-
<version>1.0.0</version>
10+
<version>2.0.0</version>
1111
</parent>
1212

1313
<artifactId>spt-development-logging-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>
@@ -43,24 +43,28 @@
4343
<artifactId>spt-development-logging-spring</artifactId>
4444
</dependency>
4545

46-
<!-- Test dependencies - version and scope defined in parent dependencyManagement section -->
46+
<!-- Test dependencies - version defined in spring-boot bom, import in parent dependencyManagement section -->
4747
<dependency>
4848
<groupId>org.junit.jupiter</groupId>
4949
<artifactId>junit-jupiter-api</artifactId>
50+
<scope>test</scope>
5051
</dependency>
5152
<dependency>
5253
<groupId>org.junit.jupiter</groupId>
5354
<artifactId>junit-jupiter-engine</artifactId>
55+
<scope>test</scope>
5456
</dependency>
5557
<dependency>
5658
<groupId>org.hamcrest</groupId>
5759
<artifactId>hamcrest</artifactId>
60+
<scope>test</scope>
5861
</dependency>
5962

60-
<!-- Test dependencies not directly related to testing - version and scope defined in parent dependencyManagement section -->
63+
<!-- Test dependencies not directly related to testing - version defined in spring-boot bom, import in parent dependencyManagement section -->
6164
<dependency>
6265
<groupId>ch.qos.logback</groupId>
6366
<artifactId>logback-classic</artifactId>
67+
<scope>test</scope>
6468
</dependency>
6569
</dependencies>
6670

‎spt-development-logging-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-logging-spring-boot-starter/pom.xml‎

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

1313
<artifactId>spt-development-logging-spring-boot-starter</artifactId>
1414

1515
<name>logging-spring-boot-starter</name>
1616

1717
<dependencies>
18-
<!-- Spring dependencies - version defined in parent dependencyManagement section -->
18+
<!-- Spring dependencies - version defined in spring-boot bom, import in parent dependencyManagement section -->
1919
<dependency>
2020
<groupId>org.springframework</groupId>
2121
<artifactId>spring-core</artifactId>
22-
<version>${spring.version}</version>
2322
</dependency>
2423
<dependency>
2524
<groupId>org.springframework</groupId>
2625
<artifactId>spring-jms</artifactId>
27-
<version>${spring.version}</version>
2826
<optional>true</optional>
2927
</dependency>
3028
<dependency>
3129
<groupId>org.springframework</groupId>
3230
<artifactId>spring-web</artifactId>
33-
<version>${spring.version}</version>
3431
<optional>true</optional>
3532
</dependency>
3633
<dependency>

0 commit comments

Comments
 (0)