Skip to content

Commit

Permalink
Bump org.springframework.boot:spring-boot-dependencies from 3.2.4 to …
Browse files Browse the repository at this point in the history
…3.3.3 (#121)

* Bump org.springframework.boot:spring-boot-dependencies

Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 2.7.18 to 3.3.3.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.7.18...v3.3.3)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Change to new return type in overridden method in LogbackValve

* do not update spring-boot 2 module to spring boot 3.3.3

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Randi Øyri <[email protected]>
  • Loading branch information
dependabot[bot] and oyri authored Aug 27, 2024
1 parent a20c93e commit 148d15d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions idporten-access-log-spring-boot-3-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

<properties>
<tomcat.version>10.1.19</tomcat.version>
<spring-boot.version>3.2.4</spring-boot.version>
<spring-boot.version>3.3.3</spring-boot.version>
<janino.version>3.1.12</janino.version>
<logstash-logback-encoder.version>8.0</logstash-logback-encoder.version>
<logback-classic.version>1.5.6</logback-classic.version>
<logback-classic.version>1.5.7</logback-classic.version>
<logback-access.version>2.0.3</logback-access.version>
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.locks.ReentrantLock;

//import org.apache.catalina.Lifecycle;

Expand Down Expand Up @@ -75,7 +76,7 @@ public class LogbackValve extends ValveBase

private long birthTime = System.currentTimeMillis();

LogbackLock configurationLock = new LogbackLock();
ReentrantLock configurationLock = new ReentrantLock();

final private List<ConfigurationEventListener> configurationEventListenerList = new ArrayList<>();

Expand Down Expand Up @@ -434,7 +435,7 @@ public long getBirthTime() {
}

@Override
public Object getConfigurationLock() {
public ReentrantLock getConfigurationLock() {
return configurationLock;
}

Expand Down

0 comments on commit 148d15d

Please sign in to comment.