From 51482fa2985338e40188c373aa6c3f335923acdb Mon Sep 17 00:00:00 2001
From: David Arthur <mumrah@gmail.com>
Date: Tue, 8 Oct 2024 10:51:33 -0400
Subject: [PATCH] MINOR Consolidate junit-platform.properties (#17399)

Reviewers: Chia-Ping Tsai <chia7712@gmail.com>
---
 build.gradle                                      |  2 ++
 .../src/test/resources/junit-platform.properties  | 15 ---------------
 .../src/test/resources/junit-platform.properties  |  0
 .../src/test/resources/junit-platform.properties  | 15 ---------------
 4 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 server-common/src/test/resources/junit-platform.properties
 rename {core => test-common}/src/test/resources/junit-platform.properties (100%)
 delete mode 100644 tools/src/test/resources/junit-platform.properties

diff --git a/build.gradle b/build.gradle
index 06fe8fd6bcdc0..3f6814b840f06 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2155,6 +2155,7 @@ project(':server-common') {
     testImplementation libs.mockitoCore
 
     testRuntimeOnly runtimeTestLibs
+    testRuntimeOnly project(":test-common")
   }
 
   task createVersionFile() {
@@ -2506,6 +2507,7 @@ project(':tools') {
     testImplementation libs.apachedsLdifPartition
 
     testRuntimeOnly libs.junitPlatformLanucher
+    testRuntimeOnly project(':test-common')
   }
 
   javadoc {
diff --git a/server-common/src/test/resources/junit-platform.properties b/server-common/src/test/resources/junit-platform.properties
deleted file mode 100644
index 05069923a7f21..0000000000000
--- a/server-common/src/test/resources/junit-platform.properties
+++ /dev/null
@@ -1,15 +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.
-junit.jupiter.params.displayname.default = "{displayName}.{argumentsWithNames}"
diff --git a/core/src/test/resources/junit-platform.properties b/test-common/src/test/resources/junit-platform.properties
similarity index 100%
rename from core/src/test/resources/junit-platform.properties
rename to test-common/src/test/resources/junit-platform.properties
diff --git a/tools/src/test/resources/junit-platform.properties b/tools/src/test/resources/junit-platform.properties
deleted file mode 100644
index 05069923a7f21..0000000000000
--- a/tools/src/test/resources/junit-platform.properties
+++ /dev/null
@@ -1,15 +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.
-junit.jupiter.params.displayname.default = "{displayName}.{argumentsWithNames}"