Skip to content

Commit e3b7271

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

File tree

4 files changed

+64
-25
lines changed

4 files changed

+64
-25
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
@@ -14,7 +14,7 @@ before_deploy:
1414
deploy:
1515
provider: releases
1616
api_key:
17-
secure: laB7B7A4PPm3XWTAdmp+2jaQXA1tyzC8LRZjKAcz7AuIfMlVVvp1O42/mnkewtlLQemyzqTJWImvZ7D+KrAQLdmgmDZjq0hZQy9an0woKBe+loMtqmGToRi+UpGJKv0Kzq4DpBBIRreqokxW5yNId9Q25QI8gEuI5irM0w/rehV12NnyHE+w08UbXS8WO6HfE0KmOR5ncKL7gR7NVOees3nCYCsw3nI8Y0DwjkFMdpqH5rqnGk+qW4P+3U58xvUTrna3NKJ9lLo6lPOnwAGS5E8u8UtZ2Xx0tgsXSBRdbPimZpkTB+nrSyORwpNPjntkfFZH6+vLPN0xLf7/bUB2bGEpVxEbCBTV0CeQCrxh04esj0tN1ANCObISA8ZFH4020xh+OYR93JVAcJMJLHIT73bVKXh5Sv8Q0v99VJP6hmZHQFtL/l68Pmf8wTYH9E/2Akxi9ytSYojZTZh4zkiXTS7dPRfoxkvGSTy8S77nS6mtZHQm0UyKS+o6dq0VHqpWkoY8NijrPCg/a+qXDpCF532eBYDLxZQIFEdVFmF+kg4fpx63oL/03JkU9P3zptVhWbk4qkuad8HuVIC5p9R04f89KHT5wUNabWBhFP/6O0M6X48ukI359jwYbbNz8WYg5HkBZwvGlzVgzLJ9OFESRaDZ83mf5+uDz7LWcBT52GM=
17+
secure: FamDJ2uxEL83Lx7zBot2pmuD32p8DtU8p8WsWzv9mLzO4U5QUMhWtAxMRuDTZQQg6/SiN7Ph7RQiIfMU8P2pdEDChhclRErcdEAwPGT2fuUuumYU4ZZNzk4hQo2NKd8Yz7sCIn1LFTgqDpjjlY70nS+7LW0Eski886GLMrgYJS9cyhkyMvBm0Hch5rAyZdhYts/EHKyMxbZBCwPY+pmgaaFxTmP6+Id4henwt1xfFPEaqEg+142BALEOVAkO+/KEObwoj0ITMy+zkK1m/V9/o3v59am1F1BUYzEH8PdBFnxG5R/Q9yE2rtsQIppHOXiaBm3Vew0RZ1IC22bexOPih1b/hB3nvUrvnXQhhFalOln1FcpnQaSOVkbzB7wNDhESg4qSVoTUzndLO5CbFYitNGVJ9gt6qvbwUIupTQo5hQCCXFIvEWMsBilftCm7KQPNxoKLdzUk+/Eps2wg94f8+by1B0L8XnKUiUIDcHy6TdjYL+pS15Owc9W6FalvY2l/FoElcVuEY9TBFiAngx/LMZxIoVFcc4zlEyEFYh6SfiKx5rQN5XnKdI0FxvFFw29h5ZN1Y9LRlV0xw0TMd3YketfZDQNYg3Kmz7qZ2eDTkEoKuZyDvY3mNp9kIQLSVWkqFA1oj00IA+mkwCGvDLukM5oJxyAxIbo9APUk5x5C26o=
1818
file: "target/spt-development-logging-spring-${POM_VERSION}.jar"
1919
skip_cleanup: true
2020
on:

‎maven-version-rules.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,11 @@
1212
</ignoreVersions>
1313

1414
<rules>
15+
<!-- Test dependencies aligned with Spring Boot -->
16+
<rule groupId="org.mockito" artifactId="mockito-core" comparisonMethod="maven">
17+
<ignoreVersions>
18+
<ignoreVersion type="regex">.*</ignoreVersion>
19+
</ignoreVersions>
20+
</rule>
1521
</rules>
1622
</ruleset>

‎pom.xml‎

Lines changed: 40 additions & 22 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</artifactId>
7-
<version>1.0.0</version>
7+
<version>2.0.0</version>
88

99
<name>logging-spring</name>
1010
<description>A very simple library for getting/setting the current correlation ID, utilising ThreadLocal.</description>
@@ -29,47 +29,65 @@
2929
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3030
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3131

32-
<maven.compiler.source>15</maven.compiler.source>
33-
<maven.compiler.target>15</maven.compiler.target>
32+
<maven.compiler.source>8</maven.compiler.source>
33+
<maven.compiler.target>8</maven.compiler.target>
3434

3535
<!-- Dependency versions -->
36-
<aspectj.version>1.9.6</aspectj.version>
37-
<slf4j.version>1.7.30</slf4j.version>
38-
<spring.version>5.3.2</spring.version>
39-
<spt-cid.version>1.1.0</spt-cid.version>
36+
<aspectj.version>1.9.7</aspectj.version>
37+
<slf4j.version>1.7.32</slf4j.version>
38+
<spring.version>5.3.9</spring.version>
39+
<spt-cid.version>2.0.0</spt-cid.version>
4040

4141
<!-- Test dependency versions -->
4242
<hamcrest.version>2.2</hamcrest.version>
43-
<junit-jupiter.version>5.7.0</junit-jupiter.version>
44-
<logback.version>1.2.3</logback.version>
45-
<mockito.version>3.6.28</mockito.version>
43+
<junit-jupiter.version>5.7.2</junit-jupiter.version>
44+
<logback.version>1.2.5</logback.version>
45+
<mockito.version>3.9.0</mockito.version>
4646

4747
<!-- Plugin versions -->
48-
<checkstyle.version>8.39</checkstyle.version>
49-
<checkstyle-maven-plugin.version>3.1.1</checkstyle-maven-plugin.version>
48+
<checkstyle-maven-plugin.version>3.1.2</checkstyle-maven-plugin.version>
5049
<findbugs-slf4j-bug-pattern.version>1.4.2</findbugs-slf4j-bug-pattern.version>
5150
<findbugs-sec-bug-pattern.version>1.8.0</findbugs-sec-bug-pattern.version>
52-
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
51+
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
5352
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
5453
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
55-
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
54+
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
5655
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
5756
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
5857
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
5958
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
6059
<nexus-staging-plugin.version>1.6.8</nexus-staging-plugin.version>
61-
<pitest-maven.version>1.6.2</pitest-maven.version>
62-
<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>
6362
<versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
6463

6564
<!-- Plugin dependencies -->
66-
<asm.version>9.0</asm.version>
65+
<asm.version>9.2</asm.version>
66+
<checkstyle.version>8.45.1</checkstyle.version>
6767
<maven-dependency-analyzer.version>1.11.3</maven-dependency-analyzer.version>
68-
<pitest-junit5-plugin.version>0.12</pitest-junit5-plugin.version>
68+
<pitest-junit5-plugin.version>0.14</pitest-junit5-plugin.version>
6969
</properties>
7070

7171
<dependencyManagement>
7272
<dependencies>
73+
<!-- BOMs -->
74+
<dependency>
75+
<groupId>org.springframework</groupId>
76+
<artifactId>spring-framework-bom</artifactId>
77+
<version>${spring.version}</version>
78+
<type>pom</type>
79+
<scope>import</scope>
80+
</dependency>
81+
82+
<!-- Test BOMs -->
83+
<dependency>
84+
<groupId>org.junit</groupId>
85+
<artifactId>junit-bom</artifactId>
86+
<version>${junit-jupiter.version}</version>
87+
<type>pom</type>
88+
<scope>import</scope>
89+
</dependency>
90+
7391
<!-- Dependencies added to avoid dependency convergence errors -->
7492
<dependency>
7593
<groupId>org.slf4j</groupId>
@@ -84,13 +102,13 @@
84102
<dependency>
85103
<groupId>org.springframework</groupId>
86104
<artifactId>spring-core</artifactId>
87-
<version>${spring.version}</version>
105+
<!-- Version defined in spring framework bom, imported in dependencyManagement section -->
88106
</dependency>
89107
<dependency>
90108
<groupId>org.springframework</groupId>
91109
<artifactId>spring-web</artifactId>
92-
<version>${spring.version}</version>
93110
<optional>true</optional>
111+
<!-- Version defined in spring framework bom, imported in dependencyManagement section -->
94112
</dependency>
95113

96114
<!-- SPT dependencies -->
@@ -122,14 +140,14 @@
122140
<dependency>
123141
<groupId>org.junit.jupiter</groupId>
124142
<artifactId>junit-jupiter-api</artifactId>
125-
<version>${junit-jupiter.version}</version>
126143
<scope>test</scope>
144+
<!-- Version defined in junit bom, imported in dependencyManagement section -->
127145
</dependency>
128146
<dependency>
129147
<groupId>org.junit.jupiter</groupId>
130148
<artifactId>junit-jupiter-engine</artifactId>
131-
<version>${junit-jupiter.version}</version>
132149
<scope>test</scope>
150+
<!-- Version defined in junit bom, imported in dependencyManagement section -->
133151
</dependency>
134152
<dependency>
135153
<groupId>org.mockito</groupId>

‎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_]*$"/>

0 commit comments

Comments
 (0)