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

upthewaterspout pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new f6a982e  GEODE-4639: Removing Java PathFinder concurrency test runner
f6a982e is described below

commit f6a982e9e81d6253d1cfd52b94c12cd2ccc6c15c
Author: Dan Smith <upthewatersp...@apache.org>
AuthorDate: Thu Feb 8 11:06:06 2018 -0800

    GEODE-4639: Removing Java PathFinder concurrency test runner
    
    Removing the dependency on Java PathFinder for running concurrent tests.
    We haven't been writing new tests with this framework and the JPF team
    is not merging necessary fixes.
    
    There is still a LoopRunner available to test for concurrency issues.
---
 build.gradle                                       |    1 -
 geode-concurrency-test/build.gradle                |    8 -
 .../src/main/java/java/net/InetAddress.java        |  155 --
 .../test/concurrency/ConcurrentTestRunner.java     |   11 +-
 .../annotation/ConcurrentTestConfig.java           |    4 +-
 .../geode/test/concurrency/jpf/JpfRunner.java      |   98 -
 .../test/concurrency/jpf/JpfRunnerConfig.java      |   34 -
 .../test/concurrency/jpf/ParallelExecutorImpl.java |   87 -
 .../test/concurrency/jpf/logging/EmptyLogger.java  | 1975 --------------------
 ...il_concurrent_locks_ReentrantReadWriteLock.java |   42 -
 ...ributed_internal_InternalDistributedSystem.java |   28 -
 ...g_apache_geode_internal_logging_LogService.java |   42 -
 ...che_geode_internal_logging_log4j_LogMarker.java |   27 -
 .../JPF_org_apache_logging_log4j_LogManager.java   |   29 -
 geode-core/build.gradle                            |   13 +-
 .../cache/FilterProfileConcurrencyTest.java        |    3 +
 16 files changed, 10 insertions(+), 2547 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7cc89c6..ba50ccf 100755
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,6 @@ buildscript {
     classpath "com.diffplug.gradle.spotless:spotless:2.2.0"
     classpath "me.champeau.gradle:jmh-gradle-plugin:0.3.1"
     classpath "com.pedjak.gradle.plugins:dockerized-test:0.5.4"
-    classpath 
"gradle.plugin.com.github.upthewaterspout.jpfgradle:jpfgradle:0.3"
   }
 }
 
diff --git a/geode-concurrency-test/build.gradle 
b/geode-concurrency-test/build.gradle
index 8c475e4..14bdca5 100644
--- a/geode-concurrency-test/build.gradle
+++ b/geode-concurrency-test/build.gradle
@@ -14,14 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-apply plugin: "com.github.upthewaterspout.jpf"
-
-jpf {
-  sourceSet='main'
-  
downloadUrl='https://bitbucket.org/upthewaterspout/jpf-core/downloads/jpf-core-r34.zip'
-  installDir=System.getProperty('user.home') + '/.jpf'
-}
-
 dependencies {
   compile 'junit:junit:' + project.'junit.version'
   compile 'org.apache.logging.log4j:log4j-api:' + project.'log4j.version'
diff --git a/geode-concurrency-test/src/main/java/java/net/InetAddress.java 
b/geode-concurrency-test/src/main/java/java/net/InetAddress.java
deleted file mode 100644
index 3ef0ffc..0000000
--- a/geode-concurrency-test/src/main/java/java/net/InetAddress.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package java.net;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-
-/**
- * Replace the JDK's InetAddress with a mock implementation that uses no 
native calls or IO.
- *
- * This implementation is simply a holder for a hostname, no DNS lookups are 
done. The address
- * returned from getAddress is simply the hostname converted to bytes in UTF-8
- */
-public class InetAddress implements java.io.Serializable {
-
-  public String hostname;
-
-  public InetAddress(String host) {
-    this.hostname = host;
-  }
-
-  public boolean isMulticastAddress() {
-    return false;
-  }
-
-  public boolean isAnyLocalAddress() {
-    return false;
-  }
-
-  public boolean isLoopbackAddress() {
-    return false;
-  }
-
-  public boolean isLinkLocalAddress() {
-    return false;
-  }
-
-  public boolean isSiteLocalAddress() {
-    return false;
-  }
-
-  public boolean isMCGlobal() {
-    return false;
-  }
-
-  public boolean isMCNodeLocal() {
-    return false;
-  }
-
-  public boolean isMCLinkLocal() {
-    return false;
-  }
-
-  public boolean isMCSiteLocal() {
-    return false;
-  }
-
-  public boolean isMCOrgLocal() {
-    return false;
-  }
-
-
-  public boolean isReachable(int timeout) throws IOException {
-    return false;
-  }
-
-  public boolean isReachable(NetworkInterface netif, int ttl, int timeout) 
throws IOException {
-    return false;
-  }
-
-  public String getHostName() {
-    return hostname;
-  }
-
-  public String getCanonicalHostName() {
-    return hostname;
-  }
-
-
-  public byte[] getAddress() {
-    return hostname.getBytes(Charset.forName("UTF-8"));
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-
-    InetAddress that = (InetAddress) o;
-
-    return hostname != null ? hostname.equals(that.hostname) : that.hostname 
== null;
-  }
-
-  @Override
-  public int hashCode() {
-    return hostname != null ? hostname.hashCode() : 0;
-  }
-
-  /**
-   * Converts this IP address to a {@code String}. The string returned is of 
the form: hostname /
-   * literal IP address.
-   *
-   * If the host name is unresolved, no reverse name service lookup is 
performed. The hostname part
-   * will be represented by an empty string.
-   *
-   * @return a string representation of this IP address.
-   */
-  public String toString() {
-    return hostname;
-  }
-
-
-  public static InetAddress getByAddress(String host, byte[] addr) throws 
UnknownHostException {
-    return new InetAddress(host);
-  }
-
-
-  public static InetAddress getByName(String host) throws UnknownHostException 
{
-    return new InetAddress(host);
-  }
-
-  public static InetAddress[] getAllByName(String host) throws 
UnknownHostException {
-    return new InetAddress[] {new InetAddress("localhost")};
-  }
-
-  public static InetAddress getLoopbackAddress() {
-    return new InetAddress("localhost");
-  }
-
-
-  public static InetAddress getByAddress(byte[] addr) throws 
UnknownHostException {
-    String host = new String(addr, Charset.forName("UTF-8"));
-    return getByName(host);
-  }
-
-  public static InetAddress getLocalHost() throws UnknownHostException {
-    return getLoopbackAddress();
-  }
-}
diff --git 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/ConcurrentTestRunner.java
 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/ConcurrentTestRunner.java
index 0839bfa..1434b3e 100644
--- 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/ConcurrentTestRunner.java
+++ 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/ConcurrentTestRunner.java
@@ -18,9 +18,6 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 
-import gov.nasa.jpf.Config;
-import gov.nasa.jpf.JPF;
-import gov.nasa.jpf.JPFListener;
 import junit.framework.AssertionFailedError;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.simple.SimpleLoggerContextFactory;
@@ -34,7 +31,7 @@ import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 
 import org.apache.geode.test.concurrency.annotation.ConcurrentTestConfig;
-import org.apache.geode.test.concurrency.jpf.JpfRunner;
+import org.apache.geode.test.concurrency.loop.LoopRunner;
 
 
 /**
@@ -71,8 +68,8 @@ import org.apache.geode.test.concurrency.jpf.JpfRunner;
  * }
  * </code>
  *
- * ConcurrentTestRunner currently executes tests using Java Pathfinder, which 
will run the test with
- * all thread interleavings.
+ * ConcurrentTestRunner currently executes tests using the {@link LoopRunner} 
which will run the
+ * test many times.
  */
 public class ConcurrentTestRunner extends ParentRunner<FrameworkMethod> {
   /**
@@ -84,7 +81,7 @@ public class ConcurrentTestRunner extends 
ParentRunner<FrameworkMethod> {
     super(testClass);
     ConcurrentTestConfig configuration = 
getTestClass().getAnnotation(ConcurrentTestConfig.class);
     if (configuration == null) {
-      runner = new JpfRunner();
+      runner = new LoopRunner();
       return;
     }
 
diff --git 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/annotation/ConcurrentTestConfig.java
 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/annotation/ConcurrentTestConfig.java
index 324b071..2e75743 100644
--- 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/annotation/ConcurrentTestConfig.java
+++ 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/annotation/ConcurrentTestConfig.java
@@ -20,7 +20,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import org.apache.geode.test.concurrency.Runner;
-import org.apache.geode.test.concurrency.jpf.JpfRunner;
+import org.apache.geode.test.concurrency.loop.LoopRunner;
 
 /**
  * Configuration options for the ConcurrentTestRunner
@@ -28,5 +28,5 @@ import org.apache.geode.test.concurrency.jpf.JpfRunner;
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface ConcurrentTestConfig {
-  Class<? extends Runner> runner() default JpfRunner.class;
+  Class<? extends Runner> runner() default LoopRunner.class;
 }
diff --git 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/JpfRunner.java
 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/JpfRunner.java
deleted file mode 100644
index b2fab1f..0000000
--- 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/JpfRunner.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.geode.test.concurrency.jpf;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-import gov.nasa.jpf.Config;
-import gov.nasa.jpf.JPF;
-import gov.nasa.jpf.JPFListener;
-import gov.nasa.jpf.annotation.JPFConfig;
-import gov.nasa.jpf.search.Search;
-import gov.nasa.jpf.search.SearchListenerAdapter;
-import gov.nasa.jpf.vm.Verify;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.simple.SimpleLoggerContextFactory;
-
-import org.apache.geode.test.concurrency.ParallelExecutor;
-
-/**
- * Run a concurrent test using Java PathFinder
- */
-public class JpfRunner implements org.apache.geode.test.concurrency.Runner {
-
-  @Override
-  public List<Throwable> runTestMethod(Method child) {
-    List<Throwable> failures = new ArrayList<>();
-    String[] userConfig = getUserConfiguration(child);
-    Config config = JPF.createConfig(userConfig);
-    config.setTarget(TestMain.class.getName());
-    config.setTargetArgs(new String[] {child.getDeclaringClass().getName(), 
child.getName()});
-    config.setProperty("report.probe_interval", "5");
-    config.setProperty("peer_packages+", 
"org.apache.geode.test.concurrency.jpf.peers");
-    config.setProperty("classpath", getClasspath());
-    config.setProperty("vm.shared.skip_static_finals", "true");
-    config.setProperty("vm.shared.skip_constructed_finals", "true");
-    JPF jpf = new JPF(config);
-    try {
-      jpf.run();
-    } catch (Throwable e) {
-      failures.add(new AssertionError("JPF had an internal error", e));
-    }
-
-    jpf.getSearchErrors().stream().forEach(error -> failures
-        .add(new AssertionError("JPF found test failures: " + 
error.getDescription())));
-
-    return failures;
-  }
-
-  private String[] getUserConfiguration(Method child) {
-    JpfRunnerConfig annotation = 
child.getDeclaringClass().getAnnotation(JpfRunnerConfig.class);
-    if (annotation != null) {
-      return annotation.value();
-    }
-
-    return new String[] {};
-  }
-
-  private String getClasspath() {
-    Collection<String> classpath = 
pathElements(System.getProperty("java.class.path"));
-    Collection<String> bootClasspath = 
pathElements(System.getProperty("sun.boot.class.path"));
-    classpath.removeAll(bootClasspath);
-    return String.join(File.pathSeparator, classpath);
-  }
-
-  private Collection<String> pathElements(String path) {
-    return new 
LinkedHashSet<String>(Arrays.asList(path.split(File.pathSeparator)));
-  }
-
-  public static class TestMain {
-    public static void main(String[] args) throws Exception {
-      String clazzName = args[0];
-      String methodName = args[1];
-      Class clazz = Class.forName(clazzName);
-      Object instance = clazz.newInstance();
-      Method method = clazz.getMethod(methodName, ParallelExecutor.class);
-      ParallelExecutorImpl parallelExecutor = new ParallelExecutorImpl();
-      method.invoke(instance, parallelExecutor);
-    }
-  }
-}
diff --git 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/JpfRunnerConfig.java
 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/JpfRunnerConfig.java
deleted file mode 100644
index 4ca3c18..0000000
--- 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/JpfRunnerConfig.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.geode.test.concurrency.jpf;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Configuration options for the JPF Runner. This currently takes a list of 
options that are passed
- * directly to JPF.
- *
- * For example: <code>
- * {@literal 
@}JpfRunnerConfig({"+listener+=gov.nasa.jpf.listener.CGMonitor,gov.nasa.jpf.listener.MethodTracker"})
- * </code>
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface JpfRunnerConfig {
-  String[] value();
-}
diff --git 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/ParallelExecutorImpl.java
 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/ParallelExecutorImpl.java
deleted file mode 100644
index 65c4c77..0000000
--- 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/ParallelExecutorImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.geode.test.concurrency.jpf;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.geode.test.concurrency.ParallelExecutor;
-import org.apache.geode.test.concurrency.RunnableWithException;
-
-class ParallelExecutorImpl implements ParallelExecutor {
-  List<ThreadFuture<?>> futures = new ArrayList<>();
-
-  @Override
-  public <T> Future<T> inParallel(Callable<T> callable) {
-    ThreadFuture<T> future = newThread(callable);
-    futures.add(future);
-    return future;
-  }
-
-  @Override
-  public void execute() throws ExecutionException, InterruptedException {
-    for (ThreadFuture future : futures) {
-      future.start();
-    }
-    for (ThreadFuture future : futures) {
-      future.get();
-    }
-  }
-
-
-  private static <T> ThreadFuture<T> newThread(Callable<T> callable) {
-    ThreadFuture<T> future = new ThreadFuture<T>(callable);
-    Thread thread = new Thread(future);
-    future.setThread(thread);
-    return future;
-  }
-
-  private static class ThreadFuture<T> extends FutureTask<T> {
-
-    private Thread thread;
-
-    public ThreadFuture(Callable<T> callable) {
-      super(callable);
-    }
-
-    public void setThread(Thread thread) {
-      this.thread = thread;
-    }
-
-    @Override
-    public T get() throws InterruptedException, ExecutionException {
-      thread.join();
-      return super.get();
-    }
-
-    @Override
-    public T get(long timeout, TimeUnit unit)
-        throws InterruptedException, ExecutionException, TimeoutException {
-      thread.join(unit.toMillis(timeout));
-      return super.get(0, TimeUnit.MILLISECONDS);
-    }
-
-    public void start() {
-      thread.start();
-    }
-  }
-}
diff --git 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/logging/EmptyLogger.java
 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/logging/EmptyLogger.java
deleted file mode 100644
index a5a7ab2..0000000
--- 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/logging/EmptyLogger.java
+++ /dev/null
@@ -1,1975 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.geode.test.concurrency.jpf.logging;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.message.EntryMessage;
-import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.util.MessageSupplier;
-import org.apache.logging.log4j.util.Supplier;
-
-public class EmptyLogger implements Logger {
-  @Override
-  public void catching(Level level, Throwable t) {
-
-  }
-
-  @Override
-  public void catching(Throwable t) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, Message msg) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, CharSequence message) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, Object message) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Object... params) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Supplier<?>... 
paramSuppliers) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(Message msg) {
-
-  }
-
-  @Override
-  public void debug(Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void debug(MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(CharSequence message) {
-
-  }
-
-  @Override
-  public void debug(CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(Object message) {
-
-  }
-
-  @Override
-  public void debug(Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(String message) {
-
-  }
-
-  @Override
-  public void debug(String message, Object... params) {
-
-  }
-
-  @Override
-  public void debug(String message, Supplier<?>... paramSuppliers) {
-
-  }
-
-  @Override
-  public void debug(String message, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void debug(Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Object p0) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Object p0, Object p1, 
Object p2) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void debug(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public void debug(String message, Object p0) {
-
-  }
-
-  @Override
-  public void debug(String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void debug(String message, Object p0, Object p1, Object p2) {
-
-  }
-
-  @Override
-  public void debug(String message, Object p0, Object p1, Object p2, Object 
p3) {
-
-  }
-
-  @Override
-  public void debug(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4) {
-
-  }
-
-  @Override
-  public void debug(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5) {
-
-  }
-
-  @Override
-  public void debug(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void debug(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void debug(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void debug(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public void entry() {
-
-  }
-
-  @Override
-  public void entry(Object... params) {
-
-  }
-
-  @Override
-  public void error(Marker marker, Message msg) {
-
-  }
-
-  @Override
-  public void error(Marker marker, Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void error(Marker marker, MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void error(Marker marker, MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void error(Marker marker, CharSequence message) {
-
-  }
-
-  @Override
-  public void error(Marker marker, CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void error(Marker marker, Object message) {
-
-  }
-
-  @Override
-  public void error(Marker marker, Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Object... params) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Supplier<?>... 
paramSuppliers) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Throwable t) {
-
-  }
-
-  @Override
-  public void error(Marker marker, Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void error(Marker marker, Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void error(Message msg) {
-
-  }
-
-  @Override
-  public void error(Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void error(MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void error(MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void error(CharSequence message) {
-
-  }
-
-  @Override
-  public void error(CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void error(Object message) {
-
-  }
-
-  @Override
-  public void error(Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void error(String message) {
-
-  }
-
-  @Override
-  public void error(String message, Object... params) {
-
-  }
-
-  @Override
-  public void error(String message, Supplier<?>... paramSuppliers) {
-
-  }
-
-  @Override
-  public void error(String message, Throwable t) {
-
-  }
-
-  @Override
-  public void error(Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void error(Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Object p0) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Object p0, Object p1, 
Object p2) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void error(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public void error(String message, Object p0) {
-
-  }
-
-  @Override
-  public void error(String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void error(String message, Object p0, Object p1, Object p2) {
-
-  }
-
-  @Override
-  public void error(String message, Object p0, Object p1, Object p2, Object 
p3) {
-
-  }
-
-  @Override
-  public void error(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4) {
-
-  }
-
-  @Override
-  public void error(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5) {
-
-  }
-
-  @Override
-  public void error(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void error(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void error(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void error(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public void exit() {
-
-  }
-
-  @Override
-  public <R> R exit(R result) {
-    return null;
-  }
-
-  @Override
-  public void fatal(Marker marker, Message msg) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, CharSequence message) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, Object message) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Object... params) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Supplier<?>... 
paramSuppliers) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(Message msg) {
-
-  }
-
-  @Override
-  public void fatal(Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void fatal(MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(CharSequence message) {
-
-  }
-
-  @Override
-  public void fatal(CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(Object message) {
-
-  }
-
-  @Override
-  public void fatal(Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(String message) {
-
-  }
-
-  @Override
-  public void fatal(String message, Object... params) {
-
-  }
-
-  @Override
-  public void fatal(String message, Supplier<?>... paramSuppliers) {
-
-  }
-
-  @Override
-  public void fatal(String message, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void fatal(Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Object p0) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Object p0, Object p1, 
Object p2) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void fatal(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public void fatal(String message, Object p0) {
-
-  }
-
-  @Override
-  public void fatal(String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void fatal(String message, Object p0, Object p1, Object p2) {
-
-  }
-
-  @Override
-  public void fatal(String message, Object p0, Object p1, Object p2, Object 
p3) {
-
-  }
-
-  @Override
-  public void fatal(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4) {
-
-  }
-
-  @Override
-  public void fatal(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5) {
-
-  }
-
-  @Override
-  public void fatal(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void fatal(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void fatal(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void fatal(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public Level getLevel() {
-    return null;
-  }
-
-  @Override
-  public <MF extends MessageFactory> MF getMessageFactory() {
-    return null;
-  }
-
-  @Override
-  public String getName() {
-    return null;
-  }
-
-  @Override
-  public void info(Marker marker, Message msg) {
-
-  }
-
-  @Override
-  public void info(Marker marker, Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void info(Marker marker, MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void info(Marker marker, MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void info(Marker marker, CharSequence message) {
-
-  }
-
-  @Override
-  public void info(Marker marker, CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void info(Marker marker, Object message) {
-
-  }
-
-  @Override
-  public void info(Marker marker, Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Object... params) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Supplier<?>... 
paramSuppliers) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Throwable t) {
-
-  }
-
-  @Override
-  public void info(Marker marker, Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void info(Marker marker, Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void info(Message msg) {
-
-  }
-
-  @Override
-  public void info(Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void info(MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void info(MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void info(CharSequence message) {
-
-  }
-
-  @Override
-  public void info(CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void info(Object message) {
-
-  }
-
-  @Override
-  public void info(Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void info(String message) {
-
-  }
-
-  @Override
-  public void info(String message, Object... params) {
-
-  }
-
-  @Override
-  public void info(String message, Supplier<?>... paramSuppliers) {
-
-  }
-
-  @Override
-  public void info(String message, Throwable t) {
-
-  }
-
-  @Override
-  public void info(Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void info(Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Object p0) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Object p0, Object p1, Object 
p2) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void info(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public void info(String message, Object p0) {
-
-  }
-
-  @Override
-  public void info(String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void info(String message, Object p0, Object p1, Object p2) {
-
-  }
-
-  @Override
-  public void info(String message, Object p0, Object p1, Object p2, Object p3) 
{
-
-  }
-
-  @Override
-  public void info(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4) {
-
-  }
-
-  @Override
-  public void info(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4,
-      Object p5) {
-
-  }
-
-  @Override
-  public void info(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4, Object p5,
-      Object p6) {
-
-  }
-
-  @Override
-  public void info(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4, Object p5,
-      Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void info(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4, Object p5,
-      Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void info(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4, Object p5,
-      Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public boolean isDebugEnabled() {
-    return false;
-  }
-
-  @Override
-  public boolean isDebugEnabled(Marker marker) {
-    return false;
-  }
-
-  @Override
-  public boolean isEnabled(Level level) {
-    return false;
-  }
-
-  @Override
-  public boolean isEnabled(Level level, Marker marker) {
-    return false;
-  }
-
-  @Override
-  public boolean isErrorEnabled() {
-    return false;
-  }
-
-  @Override
-  public boolean isErrorEnabled(Marker marker) {
-    return false;
-  }
-
-  @Override
-  public boolean isFatalEnabled() {
-    return false;
-  }
-
-  @Override
-  public boolean isFatalEnabled(Marker marker) {
-    return false;
-  }
-
-  @Override
-  public boolean isInfoEnabled() {
-    return false;
-  }
-
-  @Override
-  public boolean isInfoEnabled(Marker marker) {
-    return false;
-  }
-
-  @Override
-  public boolean isTraceEnabled() {
-    return false;
-  }
-
-  @Override
-  public boolean isTraceEnabled(Marker marker) {
-    return false;
-  }
-
-  @Override
-  public boolean isWarnEnabled() {
-    return false;
-  }
-
-  @Override
-  public boolean isWarnEnabled(Marker marker) {
-    return false;
-  }
-
-  @Override
-  public void log(Level level, Marker marker, Message msg) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, MessageSupplier msgSupplier, 
Throwable t) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, CharSequence message) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, CharSequence message, Throwable 
t) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, Object message) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Object... 
params) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Supplier<?>... 
paramSuppliers) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Throwable t) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, Supplier<?> msgSupplier, 
Throwable t) {
-
-  }
-
-  @Override
-  public void log(Level level, Message msg) {
-
-  }
-
-  @Override
-  public void log(Level level, Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void log(Level level, MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void log(Level level, MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void log(Level level, CharSequence message) {
-
-  }
-
-  @Override
-  public void log(Level level, CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void log(Level level, Object message) {
-
-  }
-
-  @Override
-  public void log(Level level, Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void log(Level level, String message) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Object... params) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Supplier<?>... paramSuppliers) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Throwable t) {
-
-  }
-
-  @Override
-  public void log(Level level, Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void log(Level level, Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Object p0) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Object p0, 
Object p1) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Object p0, 
Object p1, Object p2) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Object p0, 
Object p1, Object p2,
-      Object p3) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Object p0, 
Object p1, Object p2,
-      Object p3, Object p4) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Object p0, 
Object p1, Object p2,
-      Object p3, Object p4, Object p5) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Object p0, 
Object p1, Object p2,
-      Object p3, Object p4, Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Object p0, 
Object p1, Object p2,
-      Object p3, Object p4, Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Object p0, 
Object p1, Object p2,
-      Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void log(Level level, Marker marker, String message, Object p0, 
Object p1, Object p2,
-      Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object 
p9) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Object p0) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Object p0, Object p1, Object 
p2) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Object p0, Object p1, Object 
p2, Object p3) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void log(Level level, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public void printf(Level level, Marker marker, String format, Object... 
params) {
-
-  }
-
-  @Override
-  public void printf(Level level, String format, Object... params) {
-
-  }
-
-  @Override
-  public <T extends Throwable> T throwing(Level level, T t) {
-    return null;
-  }
-
-  @Override
-  public <T extends Throwable> T throwing(T t) {
-    return null;
-  }
-
-  @Override
-  public void trace(Marker marker, Message msg) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, CharSequence message) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, Object message) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Object... params) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Supplier<?>... 
paramSuppliers) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(Message msg) {
-
-  }
-
-  @Override
-  public void trace(Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void trace(MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(CharSequence message) {
-
-  }
-
-  @Override
-  public void trace(CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(Object message) {
-
-  }
-
-  @Override
-  public void trace(Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(String message) {
-
-  }
-
-  @Override
-  public void trace(String message, Object... params) {
-
-  }
-
-  @Override
-  public void trace(String message, Supplier<?>... paramSuppliers) {
-
-  }
-
-  @Override
-  public void trace(String message, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void trace(Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Object p0) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Object p0, Object p1, 
Object p2) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void trace(Marker marker, String message, Object p0, Object p1, 
Object p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public void trace(String message, Object p0) {
-
-  }
-
-  @Override
-  public void trace(String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void trace(String message, Object p0, Object p1, Object p2) {
-
-  }
-
-  @Override
-  public void trace(String message, Object p0, Object p1, Object p2, Object 
p3) {
-
-  }
-
-  @Override
-  public void trace(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4) {
-
-  }
-
-  @Override
-  public void trace(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5) {
-
-  }
-
-  @Override
-  public void trace(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void trace(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void trace(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void trace(String message, Object p0, Object p1, Object p2, Object 
p3, Object p4,
-      Object p5, Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public EntryMessage traceEntry() {
-    return null;
-  }
-
-  @Override
-  public EntryMessage traceEntry(String format, Object... params) {
-    return null;
-  }
-
-  @Override
-  public EntryMessage traceEntry(Supplier<?>... paramSuppliers) {
-    return null;
-  }
-
-  @Override
-  public EntryMessage traceEntry(String format, Supplier<?>... paramSuppliers) 
{
-    return null;
-  }
-
-  @Override
-  public EntryMessage traceEntry(Message message) {
-    return null;
-  }
-
-  @Override
-  public void traceExit() {
-
-  }
-
-  @Override
-  public <R> R traceExit(R result) {
-    return null;
-  }
-
-  @Override
-  public <R> R traceExit(String format, R result) {
-    return null;
-  }
-
-  @Override
-  public void traceExit(EntryMessage message) {
-
-  }
-
-  @Override
-  public <R> R traceExit(EntryMessage message, R result) {
-    return null;
-  }
-
-  @Override
-  public <R> R traceExit(Message message, R result) {
-    return null;
-  }
-
-  @Override
-  public void warn(Marker marker, Message msg) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, CharSequence message) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, Object message) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Object... params) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Supplier<?>... 
paramSuppliers) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(Message msg) {
-
-  }
-
-  @Override
-  public void warn(Message msg, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(MessageSupplier msgSupplier) {
-
-  }
-
-  @Override
-  public void warn(MessageSupplier msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(CharSequence message) {
-
-  }
-
-  @Override
-  public void warn(CharSequence message, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(Object message) {
-
-  }
-
-  @Override
-  public void warn(Object message, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(String message) {
-
-  }
-
-  @Override
-  public void warn(String message, Object... params) {
-
-  }
-
-  @Override
-  public void warn(String message, Supplier<?>... paramSuppliers) {
-
-  }
-
-  @Override
-  public void warn(String message, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(Supplier<?> msgSupplier) {
-
-  }
-
-  @Override
-  public void warn(Supplier<?> msgSupplier, Throwable t) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Object p0) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Object p0, Object p1, Object 
p2) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void warn(Marker marker, String message, Object p0, Object p1, Object 
p2, Object p3,
-      Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) {
-
-  }
-
-  @Override
-  public void warn(String message, Object p0) {
-
-  }
-
-  @Override
-  public void warn(String message, Object p0, Object p1) {
-
-  }
-
-  @Override
-  public void warn(String message, Object p0, Object p1, Object p2) {
-
-  }
-
-  @Override
-  public void warn(String message, Object p0, Object p1, Object p2, Object p3) 
{
-
-  }
-
-  @Override
-  public void warn(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4) {
-
-  }
-
-  @Override
-  public void warn(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4,
-      Object p5) {
-
-  }
-
-  @Override
-  public void warn(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4, Object p5,
-      Object p6) {
-
-  }
-
-  @Override
-  public void warn(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4, Object p5,
-      Object p6, Object p7) {
-
-  }
-
-  @Override
-  public void warn(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4, Object p5,
-      Object p6, Object p7, Object p8) {
-
-  }
-
-  @Override
-  public void warn(String message, Object p0, Object p1, Object p2, Object p3, 
Object p4, Object p5,
-      Object p6, Object p7, Object p8, Object p9) {
-
-  }
-}
diff --git 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_java_util_concurrent_locks_ReentrantReadWriteLock.java
 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_java_util_concurrent_locks_ReentrantReadWriteLock.java
deleted file mode 100644
index 9fa8274..0000000
--- 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_java_util_concurrent_locks_ReentrantReadWriteLock.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.geode.test.concurrency.jpf.peers;
-
-import gov.nasa.jpf.annotation.MJI;
-import gov.nasa.jpf.vm.MJIEnv;
-import gov.nasa.jpf.vm.NativePeer;
-
-/**
- * MJI class to make ReentrantReadWriteLock work with later versions of Java 8.
- *
- * The issue is that ReentrantReadWriteLock uses unsafe find a thread id, but 
JPF's thread class is
- * different than the JDK.
- *
- * This class allows us to use the JDK's ReentrantReadWriteLock by overriding 
the behavior to get
- * the thread id.
- */
-public class JPF_java_util_concurrent_locks_ReentrantReadWriteLock extends 
NativePeer {
-
-  @MJI
-  public void $clinit____V(MJIEnv env, int clsObjRef) {
-    // Overriding the JDK's class initialization which looks up the location of
-    // the tid field on Thread.class
-  }
-
-  @MJI
-  public long getThreadId(MJIEnv env, int clsObjRef, int rThread0) {
-    return env.getThreadInfoForObjRef(rThread0).getId();
-  }
-}
diff --git 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_geode_distributed_internal_InternalDistributedSystem.java
 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_geode_distributed_internal_InternalDistributedSystem.java
deleted file mode 100644
index c5ba6ae..0000000
--- 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_geode_distributed_internal_InternalDistributedSystem.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.geode.test.concurrency.jpf.peers;
-
-import gov.nasa.jpf.annotation.MJI;
-import gov.nasa.jpf.vm.MJIEnv;
-import gov.nasa.jpf.vm.NativePeer;
-
-public class 
JPF_org_apache_geode_distributed_internal_InternalDistributedSystem
-    extends NativePeer {
-
-  @MJI
-  public void $clinit____V(MJIEnv env, int clsObjRef) {
-    // Override initialization
-  }
-}
diff --git 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_geode_internal_logging_LogService.java
 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_geode_internal_logging_LogService.java
deleted file mode 100644
index 4e1d5ce..0000000
--- 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_geode_internal_logging_LogService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.geode.test.concurrency.jpf.peers;
-
-import gov.nasa.jpf.annotation.MJI;
-import gov.nasa.jpf.vm.MJIEnv;
-import gov.nasa.jpf.vm.NativePeer;
-
-import org.apache.geode.test.concurrency.jpf.logging.EmptyLogger;
-
-public class JPF_org_apache_geode_internal_logging_LogService extends 
NativePeer {
-
-  @MJI
-  public void $clinit____V(MJIEnv env, int clsObjRef) {
-    // Override LogService initialization, which tries to load some log4j 
classes
-    // which in turn will try to read from zip files, etc...
-  }
-
-  @MJI
-  public int 
getLogger__Ljava_lang_String_2__Lorg_apache_logging_log4j_Logger_2(MJIEnv env,
-      int clsObjRef, int rString0) {
-    return getLogger____Lorg_apache_logging_log4j_Logger_2(env, clsObjRef);
-  }
-
-  @MJI
-  public int getLogger____Lorg_apache_logging_log4j_Logger_2(MJIEnv env, int 
clsObjRef) {
-    int logger = env.newObject(EmptyLogger.class.getName());
-    return logger;
-  }
-}
diff --git 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_geode_internal_logging_log4j_LogMarker.java
 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_geode_internal_logging_log4j_LogMarker.java
deleted file mode 100644
index 683f465..0000000
--- 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_geode_internal_logging_log4j_LogMarker.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.geode.test.concurrency.jpf.peers;
-
-import gov.nasa.jpf.annotation.MJI;
-import gov.nasa.jpf.vm.MJIEnv;
-import gov.nasa.jpf.vm.NativePeer;
-
-public class JPF_org_apache_geode_internal_logging_log4j_LogMarker extends 
NativePeer {
-
-  @MJI
-  public void $clinit____V(MJIEnv env, int clsObjRef) {
-    // MarkierManager does a whole bunch of stuff
-  }
-}
diff --git 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_logging_log4j_LogManager.java
 
b/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_logging_log4j_LogManager.java
deleted file mode 100644
index 51c06f4..0000000
--- 
a/geode-concurrency-test/src/main/java/org/apache/geode/test/concurrency/jpf/peers/JPF_org_apache_logging_log4j_LogManager.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.geode.test.concurrency.jpf.peers;
-
-import gov.nasa.jpf.annotation.MJI;
-import gov.nasa.jpf.vm.MJIEnv;
-import gov.nasa.jpf.vm.NativePeer;
-
-import org.apache.geode.test.concurrency.jpf.logging.EmptyLogger;
-
-public class JPF_org_apache_logging_log4j_LogManager extends NativePeer {
-
-  @MJI
-  public void $clinit____V(MJIEnv env, int clsObjRef) {
-    // Override LogManager initialization, which tries to load a bunch of 
stuff from jars
-  }
-}
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 45e315a..d781c59 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -24,12 +24,6 @@ sourceSets {
     compileClasspath += configurations.compile
     runtimeClasspath += configurations.runtime
   }
-  jpfTest {
-    compileClasspath += configurations.compile
-    compileClasspath += main.output
-    runtimeClasspath += configurations.runtime
-    runtimeClasspath += main.output
-  }
 }
 
 
@@ -163,7 +157,7 @@ dependencies {
   testCompile 'com.pholser:junit-quickcheck-guava:' + 
project.'junit-quickcheck.version'
 
   testRuntime 'xerces:xercesImpl:' + project.'xercesImpl.version'
-  jpfTestCompile project(':geode-concurrency-test')
+  testCompile project(':geode-concurrency-test')
 }
 
 def generatedResources = "$buildDir/generated-resources/main"
@@ -238,11 +232,6 @@ task jcaJar (type: Jar, dependsOn: raJar) {
   from raJar.archivePath
 }
 
-task jpfTest(type: Test) {
-  classpath = sourceSets.jpfTest.runtimeClasspath
-  testClassesDir = sourceSets.jpfTest.output.classesDir
-}
-
 configurations {
   classesOutput {
     extendsFrom compile
diff --git 
a/geode-core/src/jpfTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
similarity index 95%
rename from 
geode-core/src/jpfTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
rename to 
geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
index f3bba25..07c2a00 100644
--- 
a/geode-core/src/jpfTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
@@ -23,6 +23,7 @@ import java.util.Set;
 import java.util.concurrent.Future;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 import org.apache.geode.distributed.DistributedMember;
@@ -36,8 +37,10 @@ import org.apache.geode.test.concurrency.ParallelExecutor;
 import org.apache.geode.test.concurrency.annotation.ConcurrentTestConfig;
 import org.apache.geode.test.concurrency.loop.LoopRunner;
 import org.apache.geode.test.concurrency.loop.LoopRunnerConfig;
+import org.apache.geode.test.junit.categories.IntegrationTest;
 
 @RunWith(ConcurrentTestRunner.class)
+@Category(IntegrationTest.class)
 public class FilterProfileConcurrencyTest {
 
   @Test

-- 
To stop receiving notification emails like this one, please contact
upthewatersp...@apache.org.

Reply via email to