diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-12-21 18:28:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 18:28:05 +0100 |
| commit | 418170df6700d7b64a46e94af1e733b82223ce58 (patch) | |
| tree | e0648663923487c94cf99694a57bbd4d15d03df8 | |
| parent | 1e29b2c93fa7cd7a1ea0fb3714babc8e2a646b5f (diff) | |
| parent | 414d1574902073915339106ed32514fb4d2fcecb (diff) | |
Merge pull request #20614 from vespa-engine/balder/upgrade-junit4-4.12-to-4.13.2
Upgrade junit 4 from 4.12 to 4.13.2
| -rw-r--r-- | bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java | 1 | ||||
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java index ee7b6c9c2f1..29f2be838a1 100644 --- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java +++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java @@ -76,6 +76,7 @@ public class ImportPackageTest { assertTrue(new Import("foo", Optional.empty()).importVersionRange().isEmpty()); } + @SuppressWarnings("deprecation") @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 83434209615..2025431d86c 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -235,7 +235,7 @@ <include>io.prometheus:simpleclient:0.6.0:jar:test</include> <include>io.prometheus:simpleclient_common:0.6.0:jar:test</include> <include>joda-time:joda-time:2.8.1:jar:test</include> - <include>junit:junit:4.13:jar:test</include> + <include>junit:junit:4.13.2:jar:test</include> <include>net.arnx:jsonic:1.2.11:jar:test</include> <include>net.java.dev.jna:jna:4.5.2:jar:test</include> <include>org.abego.treelayout:org.abego.treelayout.core:1.0.1:jar:test</include> diff --git a/parent/pom.xml b/parent/pom.xml index 1c24316a80b..2395991896a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -568,7 +568,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>4.13.2</version> </dependency> <dependency> <groupId>net.java.dev.jna</groupId> |