Skip to content

Commit

Permalink
Bump version.junit from 5.7.2 to 5.8.1 (#2326)
Browse files Browse the repository at this point in the history
* Bump version.junit from 5.7.2 to 5.8.1

Bumps `version.junit` from 5.7.2 to 5.8.1.

Updates `junit-jupiter-api` from 5.7.2 to 5.8.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.7.2...r5.8.1)

Updates `junit-jupiter-params` from 5.7.2 to 5.8.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.7.2...r5.8.1)

Updates `junit-jupiter-engine` from 5.7.2 to 5.8.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.7.2...r5.8.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* Bump version.junit from 5.7.2 to 5.8.1

Bumps `version.junit` from 5.7.2 to 5.8.1.

Updates `junit-jupiter-api` from 5.7.2 to 5.8.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.7.2...r5.8.1)

Updates `junit-jupiter-params` from 5.7.2 to 5.8.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.7.2...r5.8.1)

Updates `junit-jupiter-engine` from 5.7.2 to 5.8.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.7.2...r5.8.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* Fixes to make build pass

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aaron Klish <[email protected]>
  • Loading branch information
dependabot[bot] and Aaron Klish authored Nov 2, 2021
1 parent 27d2e82 commit 5a63aad
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 27 deletions.
21 changes: 8 additions & 13 deletions elide-spring/elide-spring-boot-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,6 @@
<optional>true</optional>
</dependency>

<!--
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-websocket</artifactId>
<optional>true</optional>
</dependency>
-->

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
Expand Down Expand Up @@ -242,16 +234,19 @@
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>

<!-- Needed because Junit 5.8.x pulls in the wrong version of its own dependency.
We should remove this later -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.8.1</version>
</dependency>

</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static junit.framework.TestCase.assertFalse;
import static junit.framework.TestCase.assertTrue;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import com.yahoo.elide.core.exceptions.HttpStatus;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<version.restassured>4.4.0</version.restassured>
<version.jackson>2.12.5</version.jackson>
<version.jersey>2.32</version.jersey>
<version.junit>5.7.2</version.junit>
<version.junit>5.8.1</version.junit>
<version.junit.platform>1.8.1</version.junit.platform>
<version.lombok>1.18.22</version.lombok>
<jsonpath.version>2.6.0</jsonpath.version>
Expand Down
12 changes: 1 addition & 11 deletions suppressions.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<suppressions
xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd">
<suppress until="2019-12-01Z">
<notes><![CDATA[file name: jackson-databind-2.9.9.3.jar]]></notes>
<gav regex="true">^com\.fasterxml\.jackson\.core:jackson-databind.*$</gav>
<cve>CVE-2019-16335</cve>
<cve>CVE-2019-14540</cve>
</suppress>

<!-- Invalid web socket CVE (flagging wrong package) -->
<suppress until="2021-12-01Z">
<cve>CVE-2020-11050</cve>
Expand All @@ -17,11 +12,6 @@
<cve>CVE-2018-1258</cve>
</suppress>

<!-- https://hibernate.atlassian.net/browse/HHH-14225 -->
<suppress until="2021-06-01Z">
<cve>CVE-2020-25638</cve>
</suppress>

<!-- Hibernate 3 CVE errors (only in the legacy hibernate 3 data store). Use Hibernate 3 at your own risk. -->
<suppress until="2031-06-01Z">
<cve>CVE-2020-25638</cve>
Expand Down

0 comments on commit 5a63aad

Please sign in to comment.