You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2021/02/25 13:15:12 UTC

[maven-surefire] branch jdk-16-17 updated: fixed Surefire673MockitoIT

This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch jdk-16-17
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/jdk-16-17 by this push:
     new f6a9e6e  fixed Surefire673MockitoIT
f6a9e6e is described below

commit f6a9e6ee1b109ba9f194af97e571b415e7c13ea4
Author: tibordigana <ti...@apache.org>
AuthorDate: Thu Feb 25 14:15:02 2021 +0100

    fixed Surefire673MockitoIT
---
 .../apache/maven/surefire/its/jiras/Surefire673MockitoIT.java  | 10 ++++++++++
 surefire-its/src/test/resources/surefire-673-mockito/pom.xml   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
index 74469c9..1b5d03f 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
@@ -20,16 +20,26 @@ package org.apache.maven.surefire.its.jiras;
  */
 
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
+
 /**
  * SUREFIRE-673 Asserts that a given mockito build works as it should (classloader problem in 2.7)
  *
  * @author Kristian Rosenvold
  */
+@SuppressWarnings( "checkstyle:magicnumber" )
 public class Surefire673MockitoIT
     extends SurefireJUnit4IntegrationTestCase
 {
+    @Before
+    public void assumeJava8Plus()
+    {
+        assumeJavaVersion( 1.8d );
+    }
+
     @Test
     public void testBuildFailingWhenErrors()
     {
diff --git a/surefire-its/src/test/resources/surefire-673-mockito/pom.xml b/surefire-its/src/test/resources/surefire-673-mockito/pom.xml
index 0b03c13..8e8881d 100644
--- a/surefire-its/src/test/resources/surefire-673-mockito/pom.xml
+++ b/surefire-its/src/test/resources/surefire-673-mockito/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.8.5</version>
+      <version>3.8.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>