Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
Bump log4j.version from 2.17.2 to 2.18.0 (#1856)
Browse files Browse the repository at this point in the history
Bumps `log4j.version` from 2.17.2 to 2.18.0.

Updates `log4j-core` from 2.17.2 to 2.18.0

Updates `log4j-jul` from 2.17.2 to 2.18.0

Updates `log4j-slf4j-impl` from 2.17.2 to 2.18.0

Updates `log4j-api` from 2.17.2 to 2.18.0

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.logging.log4j:log4j-jul
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.logging.log4j:log4j-slf4j-impl
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
dependabot[bot] authored Jul 4, 2022
1 parent 6a77547 commit da79cb1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<everit-json.version>1.5.1</everit-json.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-io.version>2.11.0</commons-io.version>
<log4j.version>2.17.2</log4j.version>
<log4j.version>2.18.0</log4j.version>
<slf4j.version>1.7.36</slf4j.version>
<feign.version>11.8</feign.version>
<commons-math3.version>3.6.1</commons-math3.version>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
package app.coronawarn.server.services.callback.registration;

import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
import static com.github.tomakehurst.wiremock.client.WireMock.put;
import static com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
import static org.mockito.Mockito.verify;
import static org.mockito.internal.verification.VerificationModeFactory.times;
import static org.springframework.http.HttpHeaders.CONTENT_TYPE;

import app.coronawarn.server.common.federation.client.callback.RegistrationResponse;
import app.coronawarn.server.common.shared.util.HashUtils;
import app.coronawarn.server.services.callback.ServerApplication;
import app.coronawarn.server.services.callback.config.CallbackServiceConfig;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.http.HttpHeader;
import com.github.tomakehurst.wiremock.http.HttpHeaders;
import java.util.List;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand All @@ -17,16 +30,10 @@
import org.springframework.http.HttpStatus;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
import java.util.List;

import static com.github.tomakehurst.wiremock.client.WireMock.*;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
import static org.mockito.Mockito.verify;
import static org.mockito.internal.verification.VerificationModeFactory.times;
import static org.springframework.http.HttpHeaders.CONTENT_TYPE;

@SpringBootTest
@ActiveProfiles({"callback-registration"})
@SpringBootTest(
classes = ServerApplication.class)
@ActiveProfiles({ "callback-registration" })
@DirtiesContext
class CallbackRegistrationRunnerIntegrationTest {

Expand All @@ -42,7 +49,6 @@ static void setupWireMock() {
RegistrationResponse registrationResponse1 = new RegistrationResponse(HashUtils.md5DigestAsHex("url1"), "url1");
List<RegistrationResponse> responses = List.of(registrationResponse1);


server.start();
server.stubFor(
get(urlEqualTo("/diagnosiskeys/callback"))
Expand Down

0 comments on commit da79cb1

Please sign in to comment.