Skip to content

Feature/spring boot latest upgrade #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2021
Merged

Feature/spring boot latest upgrade #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5d1499
Updated JDK from 15 --> 8
SimonTaylor Aug 29, 2021
fdc1dce
Updated dependencies to align with Spring Boot 2.5.4
SimonTaylor Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: java

jdk:
- openjdk15
- openjdk8

script:
- mvn test -B
Expand All @@ -14,7 +14,7 @@ before_deploy:
deploy:
provider: releases
api_key:
secure: laB7B7A4PPm3XWTAdmp+2jaQXA1tyzC8LRZjKAcz7AuIfMlVVvp1O42/mnkewtlLQemyzqTJWImvZ7D+KrAQLdmgmDZjq0hZQy9an0woKBe+loMtqmGToRi+UpGJKv0Kzq4DpBBIRreqokxW5yNId9Q25QI8gEuI5irM0w/rehV12NnyHE+w08UbXS8WO6HfE0KmOR5ncKL7gR7NVOees3nCYCsw3nI8Y0DwjkFMdpqH5rqnGk+qW4P+3U58xvUTrna3NKJ9lLo6lPOnwAGS5E8u8UtZ2Xx0tgsXSBRdbPimZpkTB+nrSyORwpNPjntkfFZH6+vLPN0xLf7/bUB2bGEpVxEbCBTV0CeQCrxh04esj0tN1ANCObISA8ZFH4020xh+OYR93JVAcJMJLHIT73bVKXh5Sv8Q0v99VJP6hmZHQFtL/l68Pmf8wTYH9E/2Akxi9ytSYojZTZh4zkiXTS7dPRfoxkvGSTy8S77nS6mtZHQm0UyKS+o6dq0VHqpWkoY8NijrPCg/a+qXDpCF532eBYDLxZQIFEdVFmF+kg4fpx63oL/03JkU9P3zptVhWbk4qkuad8HuVIC5p9R04f89KHT5wUNabWBhFP/6O0M6X48ukI359jwYbbNz8WYg5HkBZwvGlzVgzLJ9OFESRaDZ83mf5+uDz7LWcBT52GM=
secure: FamDJ2uxEL83Lx7zBot2pmuD32p8DtU8p8WsWzv9mLzO4U5QUMhWtAxMRuDTZQQg6/SiN7Ph7RQiIfMU8P2pdEDChhclRErcdEAwPGT2fuUuumYU4ZZNzk4hQo2NKd8Yz7sCIn1LFTgqDpjjlY70nS+7LW0Eski886GLMrgYJS9cyhkyMvBm0Hch5rAyZdhYts/EHKyMxbZBCwPY+pmgaaFxTmP6+Id4henwt1xfFPEaqEg+142BALEOVAkO+/KEObwoj0ITMy+zkK1m/V9/o3v59am1F1BUYzEH8PdBFnxG5R/Q9yE2rtsQIppHOXiaBm3Vew0RZ1IC22bexOPih1b/hB3nvUrvnXQhhFalOln1FcpnQaSOVkbzB7wNDhESg4qSVoTUzndLO5CbFYitNGVJ9gt6qvbwUIupTQo5hQCCXFIvEWMsBilftCm7KQPNxoKLdzUk+/Eps2wg94f8+by1B0L8XnKUiUIDcHy6TdjYL+pS15Owc9W6FalvY2l/FoElcVuEY9TBFiAngx/LMZxIoVFcc4zlEyEFYh6SfiKx5rQN5XnKdI0FxvFFw29h5ZN1Y9LRlV0xw0TMd3YketfZDQNYg3Kmz7qZ2eDTkEoKuZyDvY3mNp9kIQLSVWkqFA1oj00IA+mkwCGvDLukM5oJxyAxIbo9APUk5x5C26o=
file: "target/spt-development-logging-spring-${POM_VERSION}.jar"
skip_cleanup: true
on:
Expand Down
6 changes: 6 additions & 0 deletions maven-version-rules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,11 @@
</ignoreVersions>

<rules>
<!-- Test dependencies aligned with Spring Boot -->
<rule groupId="org.mockito" artifactId="mockito-core" comparisonMethod="maven">
<ignoreVersions>
<ignoreVersion type="regex">.*</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleset>
62 changes: 40 additions & 22 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.spt-development</groupId>
<artifactId>spt-development-logging-spring</artifactId>
<version>1.0.0</version>
<version>2.0.0</version>

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

<maven.compiler.source>15</maven.compiler.source>
<maven.compiler.target>15</maven.compiler.target>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>

<!-- Dependency versions -->
<aspectj.version>1.9.6</aspectj.version>
<slf4j.version>1.7.30</slf4j.version>
<spring.version>5.3.2</spring.version>
<spt-cid.version>1.1.0</spt-cid.version>
<aspectj.version>1.9.7</aspectj.version>
<slf4j.version>1.7.32</slf4j.version>
<spring.version>5.3.9</spring.version>
<spt-cid.version>2.0.0</spt-cid.version>

<!-- Test dependency versions -->
<hamcrest.version>2.2</hamcrest.version>
<junit-jupiter.version>5.7.0</junit-jupiter.version>
<logback.version>1.2.3</logback.version>
<mockito.version>3.6.28</mockito.version>
<junit-jupiter.version>5.7.2</junit-jupiter.version>
<logback.version>1.2.5</logback.version>
<mockito.version>3.9.0</mockito.version>

<!-- Plugin versions -->
<checkstyle.version>8.39</checkstyle.version>
<checkstyle-maven-plugin.version>3.1.1</checkstyle-maven-plugin.version>
<checkstyle-maven-plugin.version>3.1.2</checkstyle-maven-plugin.version>
<findbugs-slf4j-bug-pattern.version>1.4.2</findbugs-slf4j-bug-pattern.version>
<findbugs-sec-bug-pattern.version>1.8.0</findbugs-sec-bug-pattern.version>
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<nexus-staging-plugin.version>1.6.8</nexus-staging-plugin.version>
<pitest-maven.version>1.6.2</pitest-maven.version>
<spotbugs.version>4.2.0</spotbugs.version>
<pitest-maven.version>1.6.9</pitest-maven.version>
<spotbugs.version>4.2.3</spotbugs.version>
<versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>

<!-- Plugin dependencies -->
<asm.version>9.0</asm.version>
<asm.version>9.2</asm.version>
<checkstyle.version>8.45.1</checkstyle.version>
<maven-dependency-analyzer.version>1.11.3</maven-dependency-analyzer.version>
<pitest-junit5-plugin.version>0.12</pitest-junit5-plugin.version>
<pitest-junit5-plugin.version>0.14</pitest-junit5-plugin.version>
</properties>

<dependencyManagement>
<dependencies>
<!-- BOMs -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Test BOMs -->
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit-jupiter.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Dependencies added to avoid dependency convergence errors -->
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -84,13 +102,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<!-- Version defined in spring framework bom, imported in dependencyManagement section -->
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
<optional>true</optional>
<!-- Version defined in spring framework bom, imported in dependencyManagement section -->
</dependency>

<!-- SPT dependencies -->
Expand Down Expand Up @@ -122,14 +140,14 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
<!-- Version defined in junit bom, imported in dependencyManagement section -->
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
<!-- Version defined in junit bom, imported in dependencyManagement section -->
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down
17 changes: 16 additions & 1 deletion spt_checks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,25 @@
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
</module>
<module name="JavadocMethod">
<property name="scope" value="public"/>
<property name="accessModifiers" value="public"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="allowedAnnotations" value="Override, Test"/>
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
</module>
<module name="MissingJavadocMethod">
<property name="scope" value="public"/>
<property name="minLineCount" value="2"/>
<property name="allowedAnnotations" value="Override, Test"/>
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF,
COMPACT_CTOR_DEF"/>
</module>
<module name="MissingJavadocType">
<property name="scope" value="protected"/>
<property name="tokens"
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
RECORD_DEF, ANNOTATION_DEF"/>
<property name="excludeScope" value="nothing"/>
</module>
<module name="MethodName">
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
Expand Down