Skip to content

Commit

Permalink
Bump version.slf4j from 1.7.36 to 2.0.0
Browse files Browse the repository at this point in the history
Bumps `version.slf4j` from 1.7.36 to 2.0.0.
Bumps `version.logback` from 1.2.11 to 1.3.0.

Updates `slf4j-api` from 1.7.36 to 2.0.0
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](qos-ch/slf4j@v_1.7.36...v_2.0.0)

Updates `jcl-over-slf4j` from 1.7.36 to 2.0.0
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](qos-ch/slf4j@v_1.7.36...v_2.0.0)

Updates `logback-classic` from 1.2.11 to 1.3.0
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](qos-ch/logback@v_1.2.11...v_1.3.0)

Updates `logback-core` from 1.2.11 to 1.3.0
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](qos-ch/logback@v_1.2.11...v_1.3.0)

Updates `logback-access` from 1.2.11 to 1.3.0
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](qos-ch/logback@v_1.2.11...v_1.3.0)

Updates mocks in FilteredRequestLogTest to match behavior changes in
logback.

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: org.slf4j:jcl-over-slf4j
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: ch.qos.logback:logback-access
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored and josephlbarnett committed Sep 13, 2022
1 parent c12413c commit 4d55534
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ updates:
- dependency-name: jakarta.inject:jakarta.inject-api
versions:
- ">= 2.0.0"
- dependency-name: ch.qos.logback:*
versions:
- ">= 1.4.0"
4 changes: 2 additions & 2 deletions parent-pom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<version.kotlin.logging>2.1.23</version.kotlin.logging>
<version.ktlint>0.47.1</version.ktlint>
<version.leakycauldron>${project.version}</version.leakycauldron>
<version.logback>1.2.11</version.logback>
<version.logback>1.3.0</version.logback>
<version.maven.antrun>3.1.0</version.maven.antrun>
<version.maven.assembly>3.4.2</version.maven.assembly>
<version.maven.buildhelper>3.3.0</version.maven.buildhelper>
Expand All @@ -124,7 +124,7 @@
<version.reactivestreams>1.0.4</version.reactivestreams>
<version.redshift>2.1.0.9</version.redshift>
<version.servlet>4.0.4</version.servlet>
<version.slf4j>1.7.36</version.slf4j>
<version.slf4j>2.0.0</version.slf4j>
<version.swagger>2.2.2</version.swagger>
<version.testcontainers>1.17.3</version.testcontainers>
<version.testng>7.6.1</version.testng>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import io.dropwizard.logging.AppenderFactory
import org.easymock.EasyMock
import org.eclipse.jetty.http.HttpField
import org.eclipse.jetty.http.HttpFields
import org.eclipse.jetty.http.MetaData
import org.eclipse.jetty.server.HttpChannel
import org.eclipse.jetty.server.Request
import org.eclipse.jetty.server.Response
import org.slf4j.LoggerFactory
Expand Down Expand Up @@ -46,7 +48,9 @@ class FilteredRequestLogTest {
val mockResponse = LeakyMock.niceMock<Response>()
EasyMock.expect(mockRequest.requestURI).andReturn("/app/ping").anyTimes()
EasyMock.expect(mockRequest.timeStamp).andReturn(System.currentTimeMillis() + 200).anyTimes()
EasyMock.expect(mockResponse.status).andReturn(HttpServletResponse.SC_OK).anyTimes()
EasyMock.expect(mockResponse.committedMetaData).andReturn(
MetaData.Response(null, HttpServletResponse.SC_OK, null)
).anyTimes()
EasyMock.replay(mockRequest, mockResponse)
logger.log(mockRequest, mockResponse)
assertThat(events).isEmpty()
Expand Down Expand Up @@ -76,7 +80,9 @@ class FilteredRequestLogTest {
val mockResponse = LeakyMock.niceMock<Response>()
EasyMock.expect(mockRequest.requestURI).andReturn("/app/ping").anyTimes()
EasyMock.expect(mockRequest.timeStamp).andReturn(System.currentTimeMillis() - 300).anyTimes()
EasyMock.expect(mockResponse.status).andReturn(HttpServletResponse.SC_OK).anyTimes()
EasyMock.expect(mockResponse.committedMetaData).andReturn(
MetaData.Response(null, HttpServletResponse.SC_OK, null)
).anyTimes()
EasyMock.replay(mockRequest, mockResponse)
logger.log(mockRequest, mockResponse)
assertThat(events).isNotEmpty()
Expand Down Expand Up @@ -109,7 +115,11 @@ class FilteredRequestLogTest {
fields.add(HttpField(null, "X-Request-Id", fakeRequestId))
EasyMock.expect(mockRequest.requestURI).andReturn("/app/ping").anyTimes()
EasyMock.expect(mockRequest.timeStamp).andReturn(System.currentTimeMillis() + 200).anyTimes()
EasyMock.expect(mockResponse.status).andReturn(HttpServletResponse.SC_SERVICE_UNAVAILABLE).anyTimes()
EasyMock.expect(mockResponse.committedMetaData).andReturn(
MetaData.Response(null, HttpServletResponse.SC_SERVICE_UNAVAILABLE, fields)
).anyTimes()
val mockChannel = LeakyMock.niceMock<HttpChannel>()
EasyMock.expect(mockResponse.httpChannel).andReturn(mockChannel).anyTimes()
EasyMock.expect(mockResponse.getHeader("X-Request-Id")).andReturn(fakeRequestId).anyTimes()
EasyMock.expect(mockResponse.httpFields).andReturn(fields).anyTimes()
EasyMock.replay(mockRequest, mockResponse)
Expand Down

0 comments on commit 4d55534

Please sign in to comment.