diff --git a/solr/common-build.xml b/solr/common-build.xml
index 9b7b9d9bb4e..d0ef7afcd80 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -152,11 +152,6 @@
-
-
-
-
-
diff --git a/solr/test-framework/src/java/org/apache/solr/util/SolrSecurityManager.java b/solr/test-framework/src/java/org/apache/solr/util/SolrSecurityManager.java
deleted file mode 100644
index 056f4f7a88f..00000000000
--- a/solr/test-framework/src/java/org/apache/solr/util/SolrSecurityManager.java
+++ /dev/null
@@ -1,95 +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.solr.util;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * A {@link SecurityManager} that prevents tests calling {@link System#exit(int)}.
- * Only the test runner itself is allowed to exit the JVM.
- * All other security checks are handled by the default security policy.
- *
- * Use this with {@code -Djava.security.manager=org.apache.solr.util.SolrSecurityManager}.
- */
-public final class SolrSecurityManager extends SecurityManager {
-
- static final String JUNIT4_TEST_RUNNER_PACKAGE = "com.carrotsearch.ant.tasks.junit4.";
- static final String ECLIPSE_TEST_RUNNER_PACKAGE = "org.eclipse.jdt.internal.junit.runner.";
- static final String IDEA_TEST_RUNNER_PACKAGE = "com.intellij.rt.execution.junit.";
- static final String GRADLE_TEST_RUNNER_PACKAGE = "worker.org.gradle.process.internal.worker";
-
- /**
- * Creates a new SolrSecurityManager. This ctor is called on JVM startup,
- * when {@code -Djava.security.manager=org.apache.lucene.util.TestSecurityManager}
- * is passed to JVM.
- */
- public SolrSecurityManager() {
- super();
- }
-
- /**
- * {@inheritDoc}
- *
This method inspects the stack trace and checks who is calling
- * {@link System#exit(int)} and similar methods
- * @throws SecurityException if the caller of this method is not the test runner itself.
- */
- @Override
- public void checkExit(final int status) {
- AccessController.doPrivileged(new PrivilegedAction() {
- @Override
- public Void run() {
- final String systemClassName = System.class.getName(),
- runtimeClassName = Runtime.class.getName();
- String exitMethodHit = null;
- for (final StackTraceElement se : Thread.currentThread().getStackTrace()) {
- final String className = se.getClassName(), methodName = se.getMethodName();
- if (
- ("exit".equals(methodName) || "halt".equals(methodName)) &&
- (systemClassName.equals(className) || runtimeClassName.equals(className))
- ) {
- exitMethodHit = className + '#' + methodName + '(' + status + ')';
- continue;
- }
-
- if (exitMethodHit != null) {
- if (className.startsWith(JUNIT4_TEST_RUNNER_PACKAGE) ||
- className.startsWith(ECLIPSE_TEST_RUNNER_PACKAGE) ||
- className.startsWith(IDEA_TEST_RUNNER_PACKAGE) ||
- className.startsWith(GRADLE_TEST_RUNNER_PACKAGE)) {
- // this exit point is allowed, we return normally from closure:
- return /*void*/ null;
- } else {
- // anything else in stack trace is not allowed, break and throw SecurityException below:
- break;
- }
- }
- }
-
- if (exitMethodHit == null) {
- // should never happen, only if JVM hides stack trace - replace by generic:
- exitMethodHit = "JVM exit method";
- }
- throw new SecurityException(exitMethodHit + " calls are not allowed because they terminate the test runner's JVM.");
- }
- });
-
- // we passed the stack check, delegate to super, so default policy can still deny permission:
- super.checkExit(status);
- }
-
-}