Skip to content

Commit af3a517

Browse files
authored
Merge pull request #5 from spt-development/feature/spring-boot-upgrade-2.6.8
Updated dependencies to align with Spring Boot 2.7.0, moved JDK versi…
2 parents 6954643 + 336aae7 commit af3a517

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
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-
- openjdk17
4+
- openjdk18
55

66
# Need a full git clone in order to be able to tag the release
77
git:
@@ -10,7 +10,7 @@ git:
1010
install:
1111
- git clone https://github.com/$TRAVIS_REPO_SLUG.git $TRAVIS_REPO_SLUG
1212
- cd $TRAVIS_REPO_SLUG
13-
- git checkout $TRAVIS_BRANCH
13+
- git checkout ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}
1414
- POM_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec | sed -e 's/-SNAPSHOT//')
1515
- openssl aes-256-cbc -K $encrypted_044baa266d1a_key -iv $encrypted_044baa266d1a_iv -in .travis/gpg.asc.enc -out .travis/gpg.asc -d
1616
- gpg --fast-import .travis/gpg.asc

pom.xml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@
3737
<maven.compiler.release>8</maven.compiler.release>
3838

3939
<!-- Dependency versions -->
40-
<spring-boot.version>2.6.7</spring-boot.version>
40+
<spring-boot.version>2.7.0</spring-boot.version>
4141
<spt-cid.version>2.0.11</spt-cid.version>
42-
<spt-logging-spring.version>2.0.4</spt-logging-spring.version>
42+
<spt-logging-spring.version>2.0.5</spt-logging-spring.version>
4343

4444
<!-- Plugin versions -->
4545
<checkstyle-maven-plugin.version>3.1.2</checkstyle-maven-plugin.version>
46-
<findbugs-slf4j-bug-pattern.version>1.4.2</findbugs-slf4j-bug-pattern.version>
47-
<findbugs-sec-bug-pattern.version>1.8.0</findbugs-sec-bug-pattern.version>
48-
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
46+
<findbugs-slf4j-bug-pattern.version>1.5.0</findbugs-slf4j-bug-pattern.version>
47+
<findbugs-sec-bug-pattern.version>1.12.0</findbugs-sec-bug-pattern.version>
48+
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
4949
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
50-
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
50+
<maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
5151
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
5252
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
5353
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
@@ -56,13 +56,13 @@
5656
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
5757
<nexus-staging-plugin.version>1.6.13</nexus-staging-plugin.version>
5858
<pitest-maven.version>1.7.2</pitest-maven.version>
59-
<spotbugs.version>4.2.3</spotbugs.version>
59+
<spotbugs.version>4.6.0.0</spotbugs.version>
6060
<versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
6161

6262
<!-- Plugin dependencies -->
63-
<asm.version>9.2</asm.version>
63+
<asm.version>9.3</asm.version>
6464
<checkstyle.version>9.0.1</checkstyle.version>
65-
<maven-dependency-analyzer.version>1.11.3</maven-dependency-analyzer.version>
65+
<maven-dependency-analyzer.version>1.12.0</maven-dependency-analyzer.version>
6666
<pitest-junit5-plugin.version>0.15</pitest-junit5-plugin.version>
6767
</properties>
6868

@@ -98,8 +98,6 @@
9898
<artifactId>maven-compiler-plugin</artifactId>
9999
<version>${maven-compiler-plugin.version}</version>
100100
<configuration>
101-
<source>${maven.compiler.source}</source>
102-
<target>${maven.compiler.target}</target>
103101
<showWarnings>true</showWarnings>
104102
<compilerArgs>
105103
<arg>-Xlint:all</arg>

spt-development-logging-spring-boot-autoconfigure/src/main/java/com/spt/development/logging/spring/boot/autoconfigure/LoggingSpringAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
import com.spt.development.logging.spring.RepositoryLogger;
55
import com.spt.development.logging.spring.RestControllerLogger;
66
import com.spt.development.logging.spring.ServiceLogger;
7+
import org.springframework.boot.autoconfigure.AutoConfiguration;
78
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
89
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
910
import org.springframework.context.annotation.Bean;
10-
import org.springframework.context.annotation.Configuration;
1111
import org.springframework.jms.annotation.JmsListener;
1212
import org.springframework.web.bind.annotation.RestController;
1313

1414
/**
15-
* {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration Auto-Configuration} for
15+
* {@link AutoConfiguration Auto-Configuration} for
1616
* <a href="https://github.com/spt-development/spt-development-logging-spring">spt-development/spt-development-logging-spring</a>.
1717
*/
18-
@Configuration
18+
@AutoConfiguration
1919
public class LoggingSpringAutoConfiguration {
2020

2121
/**

spt-development-logging-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

Lines changed: 0 additions & 2 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
com.spt.development.logging.spring.boot.autoconfigure.LoggingSpringAutoConfiguration

0 commit comments

Comments
 (0)