Revert "GEM-3373: Configure Mockito to be compatible with JDK 17 (apa…

…che#132)" (apache#139) This reverts commit ae6e75e.
smgoller · Jul 6, 2022 · 9acf169 · 9acf169
1 parent 8551660
commit 9acf169
Show file tree

Hide file tree

Showing 24 changed files with 41 additions and 66 deletions.
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!-- Copyright (c) VMware, Inc. 2022. All rights reserved. -->
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -460,7 +459,7 @@
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
-        <artifactId>mockito-inline</artifactId>
+        <artifactId>mockito-core</artifactId>
         <version>4.6.1</version>
       </dependency>
       <dependency>

diff --git a/...y-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/...y-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
  * agreements. See the NOTICE file distributed with this work for additional information regarding
@@ -174,7 +173,7 @@ class DependencyConstraints {
     }
 
     dependencySet(group: 'org.mockito', version: '4.6.1') {
-      entry('mockito-inline')
+      entry('mockito-core')
       entry('mockito-junit-jupiter')
     }
 

diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -44,7 +43,7 @@ dependencies {
   testImplementation(project(':extensions:geode-modules-test'))
   testImplementation('org.junit.jupiter:junit-jupiter-api')
   testImplementation('org.assertj:assertj-core')
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
   testImplementation('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat8.version'))
 
   testRuntimeOnly('org.junit.vintage:junit-vintage-engine')

diff --git a/extensions/geode-modules-tomcat9/build.gradle b/extensions/geode-modules-tomcat9/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -44,7 +43,7 @@ dependencies {
   testImplementation(project(':extensions:geode-modules-test'))
   testImplementation('org.junit.jupiter:junit-jupiter-api')
   testImplementation('org.assertj:assertj-core')
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
   testImplementation('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat9.version'))
 
   testRuntimeOnly('org.junit.vintage:junit-vintage-engine')

diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -49,7 +48,7 @@ dependencies {
   testImplementation('org.apache.bcel:bcel')
   testImplementation('org.junit.jupiter:junit-jupiter-api')
   testImplementation('org.assertj:assertj-core')
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
   testImplementation('org.apache.tomcat:tomcat-catalina-ha:' + DependencyConstraints.get('tomcat8.version'))
 
   testRuntimeOnly('org.junit.vintage:junit-vintage-engine')

diff --git a/geode-common/build.gradle b/geode-common/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -44,7 +43,7 @@ dependencies {
   testImplementation('junit:junit')
   testImplementation('org.apache.commons:commons-lang3')
   testImplementation('org.assertj:assertj-core')
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
   testRuntimeOnly('org.junit.vintage:junit-vintage-engine')
   testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine')
 

diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -103,7 +102,7 @@ dependencies {
 
   distributedTestImplementation('junit:junit')
   distributedTestImplementation('org.assertj:assertj-core')
-  distributedTestImplementation('org.mockito:mockito-inline')
+  distributedTestImplementation('org.mockito:mockito-core')
   distributedTestImplementation('pl.pragmatists:JUnitParams')
   distributedTestRuntimeOnly('org.apache.derby:derby')
 
@@ -113,7 +112,7 @@ dependencies {
   acceptanceTestImplementation('junit:junit')
   acceptanceTestImplementation('org.assertj:assertj-core')
   acceptanceTestImplementation('org.awaitility:awaitility')
-  acceptanceTestImplementation('org.mockito:mockito-inline')
+  acceptanceTestImplementation('org.mockito:mockito-core')
   acceptanceTestImplementation('pl.pragmatists:JUnitParams')
   acceptanceTestImplementation('org.testcontainers:testcontainers')
 

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -332,8 +331,8 @@ dependencies {
   testImplementation(project(':geode-serialization'))
   testImplementation('org.apache.bcel:bcel')
   testImplementation('org.assertj:assertj-core')
+  testImplementation('org.mockito:mockito-core')
   testImplementation('org.mockito:mockito-junit-jupiter')
-  testImplementation('org.mockito:mockito-inline')
   testImplementation('com.pholser:junit-quickcheck-core')
   testImplementation('pl.pragmatists:JUnitParams')
   testImplementation('com.tngtech.archunit:archunit-junit4')
@@ -360,7 +359,6 @@ dependencies {
   integrationTestImplementation(project(':geode-serialization'))
   integrationTestImplementation('org.apache.bcel:bcel')
   integrationTestImplementation('org.apache.logging.log4j:log4j-core')
-  integrationTestImplementation('org.mockito:mockito-inline')
   integrationTestImplementation('pl.pragmatists:JUnitParams')
   integrationTestImplementation('com.tngtech.archunit:archunit-junit4')
   integrationTestImplementation('org.junit-pioneer:junit-pioneer')

diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -58,7 +57,7 @@ dependencies {
   upgradeTestImplementation(project(':geode-junit'))
   upgradeTestImplementation('junit:junit')
   upgradeTestImplementation('org.awaitility:awaitility')
-  upgradeTestImplementation('org.mockito:mockito-inline')
+  upgradeTestImplementation('org.mockito:mockito-core')
 
   upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'classpathsOutput'))
 }

diff --git a/geode-dunit/build.gradle b/geode-dunit/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -59,7 +58,7 @@ dependencies {
   }
 
   implementation('org.assertj:assertj-core')
-  implementation('org.mockito:mockito-inline')
+  implementation('org.mockito:mockito-core')
   implementation('org.awaitility:awaitility')
   implementation('pl.pragmatists:JUnitParams')
 

diff --git a/geode-dunit/src/test/resources/expected-pom.xml b/geode-dunit/src/test/resources/expected-pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!-- Copyright (c) VMware, Inc. 2022. All rights reserved. -->
   <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -188,7 +187,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>

diff --git a/geode-jmh/build.gradle b/geode-jmh/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -31,7 +30,7 @@ dependencies {
   testImplementation('junit:junit')
   testRuntimeOnly('org.junit.vintage:junit-vintage-engine')
   testImplementation('org.assertj:assertj-core')
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
 }
 
 jar {

diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -43,7 +42,7 @@ dependencies {
   api('org.junit.jupiter:junit-jupiter-api')
   api('org.junit.jupiter:junit-jupiter-params')
   api('org.assertj:assertj-core')
-  api('org.mockito:mockito-inline')
+  api('org.mockito:mockito-core')
 
   api('io.github.classgraph:classgraph')
   api('com.fasterxml.jackson.core:jackson-annotations')

diff --git a/geode-junit/src/test/resources/expected-pom.xml b/geode-junit/src/test/resources/expected-pom.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!-- Copyright (c) VMware, Inc. 2022. All rights reserved. -->
   <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0
+      http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    -->
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.vmware.gemfire</groupId>
   <artifactId>geode-junit</artifactId>
@@ -75,7 +74,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/geode-log4j/build.gradle b/geode-log4j/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
  * agreements. See the NOTICE file distributed with this work for additional information regarding
@@ -51,14 +50,14 @@ dependencies {
   }
   jmhImplementation('junit:junit')
   jmhImplementation('org.assertj:assertj-core')
-  jmhImplementation('org.mockito:mockito-inline')
+  jmhImplementation('org.mockito:mockito-core')
 
   testImplementation(project(':geode-junit')) {
     exclude module: 'geode-core'
   }
   testImplementation('junit:junit')
   testImplementation('org.assertj:assertj-core')
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
 
   integrationTestImplementation(project(':geode-junit')) {
     exclude module: 'geode-core'
@@ -77,6 +76,6 @@ dependencies {
   distributedTestImplementation('org.assertj:assertj-core')
   distributedTestImplementation('org.awaitility:awaitility')
   distributedTestImplementation('org.hamcrest:hamcrest')
-  distributedTestImplementation('org.mockito:mockito-inline')
+  distributedTestImplementation('org.mockito:mockito-core')
   distributedTestImplementation('pl.pragmatists:JUnitParams')
 }
diff --git a/geode-logging/build.gradle b/geode-logging/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -35,7 +34,7 @@ dependencies {
   }
   testImplementation(project(':geode-concurrency-test'))
 
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
   testImplementation('junit:junit')
   testImplementation('org.assertj:assertj-core')
 

diff --git a/geode-lucene/geode-lucene-test/build.gradle b/geode-lucene/geode-lucene-test/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -33,5 +32,5 @@ dependencies {
 
   implementation('junit:junit')
   implementation('org.apache.lucene:lucene-test-framework')
-  implementation('org.mockito:mockito-inline')
+  implementation('org.mockito:mockito-core')
 }
diff --git a/geode-membership/build.gradle b/geode-membership/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -51,7 +50,7 @@ dependencies {
   testImplementation(project(':geode-junit'))
   testImplementation(project(':geode-concurrency-test'))
 
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
   testImplementation('junit:junit')
   testImplementation('org.assertj:assertj-core')
   testImplementation('com.tngtech.archunit:archunit-junit4')

diff --git a/geode-memcached/build.gradle b/geode-memcached/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -32,7 +31,7 @@ dependencies {
 
   implementation('org.apache.logging.log4j:log4j-api')
 
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
   testImplementation(project(':geode-junit'))
 
   integrationTestImplementation(project(':geode-membership'))

diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -41,7 +40,7 @@ dependencies {
   testImplementation('junit:junit')
   testImplementation('org.junit.vintage:junit-vintage-engine')
   testImplementation('org.assertj:assertj-core')
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
 
   integrationTestImplementation('junit:junit')
   integrationTestImplementation('org.awaitility:awaitility')

diff --git a/geode-serialization/build.gradle b/geode-serialization/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -48,7 +47,7 @@ dependencies {
 
   testImplementation('com.tngtech.archunit:archunit-junit4')
   testImplementation('org.apache.bcel:bcel')
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
   testImplementation('junit:junit')
   testImplementation('org.assertj:assertj-core')
 

diff --git a/geode-tcp-server/build.gradle b/geode-tcp-server/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
  * agreements. See the NOTICE file distributed with this work for additional information regarding
@@ -44,7 +43,7 @@ dependencies {
   testImplementation('com.tngtech.archunit:archunit-junit4')
 
   integrationTestImplementation('com.tngtech.archunit:archunit-junit4')
-  integrationTestImplementation('org.mockito:mockito-inline')
+  integrationTestImplementation('org.mockito:mockito-core')
   integrationTestImplementation(project(':geode-junit'))
 
   upgradeTestImplementation(project(':geode-gfsh'))

diff --git a/geode-unsafe/build.gradle b/geode-unsafe/build.gradle
@@ -1,4 +1,3 @@
-// Copyright (c) VMware, Inc. 2022. All rights reserved.
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -33,7 +32,7 @@ dependencies {
     exclude module: 'junit'
   }
   testImplementation('org.assertj:assertj-core')
-  testImplementation('org.mockito:mockito-inline')
+  testImplementation('org.mockito:mockito-core')
   testImplementation('org.awaitility:awaitility')
 }