diff --git a/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template b/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
index 4084e4e6497..04e3f2a7c10 100644
--- a/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
@@ -35,7 +35,6 @@
solr/contrib/analysis-extras
../../../..
${top-level}/${module-directory}
- ${top-level}/../..
scm:svn:${vc-anonymous-base-url}/${module-directory}
@@ -95,17 +94,12 @@
${top-level}/solr/core/src/test-files
+
+ ${top-level}/dev-tools/maven/solr
+
+ maven.testlogging.properties
+
+
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- ${surefire-top-level}/solr/testlogging.properties
-
-
-
-
diff --git a/dev-tools/maven/solr/contrib/clustering/pom.xml.template b/dev-tools/maven/solr/contrib/clustering/pom.xml.template
index 5fa0ebb6690..721ba4c9496 100644
--- a/dev-tools/maven/solr/contrib/clustering/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/clustering/pom.xml.template
@@ -35,7 +35,6 @@
solr/contrib/clustering
../../../..
${top-level}/${module-directory}
- ${top-level}/../..
scm:svn:${vc-anonymous-base-url}/${module-directory}
@@ -100,17 +99,12 @@
${top-level}/solr/core/src/test-files
+
+ ${top-level}/dev-tools/maven/solr
+
+ maven.testlogging.properties
+
+
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- ${surefire-top-level}/solr/testlogging.properties
-
-
-
-
diff --git a/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template b/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
index 79f50589108..874b3b3a8d0 100644
--- a/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
@@ -35,7 +35,6 @@
solr/contrib/dataimporthandler-extras
../../../..
${top-level}/${module-directory}
- ${top-level}/../..
scm:svn:${vc-anonymous-base-url}/${module-directory}
@@ -98,17 +97,12 @@
${top-level}/solr/core/src/test-files
+
+ ${top-level}/dev-tools/maven/solr
+
+ maven.testlogging.properties
+
+
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- ${surefire-top-level}/solr/testlogging.properties
-
-
-
-
diff --git a/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template b/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
index e1a7894936b..dc21248a96e 100644
--- a/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
@@ -35,7 +35,6 @@
solr/contrib/dataimporthandler
../../../..
${top-level}/${module-directory}
- ${top-level}/../..
scm:svn:${vc-anonymous-base-url}/${module-directory}
@@ -84,6 +83,12 @@
${top-level}/solr/core/src/test-files
+
+ ${top-level}/dev-tools/maven/solr
+
+ maven.testlogging.properties
+
+
@@ -97,15 +102,6 @@
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- ${surefire-top-level}/solr/testlogging.properties
-
-
-
diff --git a/dev-tools/maven/solr/contrib/extraction/pom.xml.template b/dev-tools/maven/solr/contrib/extraction/pom.xml.template
index 5b235868601..0ded83b32dd 100644
--- a/dev-tools/maven/solr/contrib/extraction/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/extraction/pom.xml.template
@@ -38,7 +38,6 @@
solr/contrib/extraction
../../../..
${top-level}/${module-directory}
- ${top-level}/../..
scm:svn:${vc-anonymous-base-url}/${module-directory}
@@ -96,17 +95,12 @@
${top-level}/solr/core/src/test-files
+
+ ${top-level}/dev-tools/maven/solr
+
+ maven.testlogging.properties
+
+
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- ${surefire-top-level}/solr/testlogging.properties
-
-
-
-
diff --git a/dev-tools/maven/solr/contrib/langid/pom.xml.template b/dev-tools/maven/solr/contrib/langid/pom.xml.template
index cf4dd8a874f..cd46cca202d 100644
--- a/dev-tools/maven/solr/contrib/langid/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/langid/pom.xml.template
@@ -39,7 +39,6 @@
solr/contrib/langid
../../../..
${top-level}/${module-directory}
- ${top-level}/../..
scm:svn:${vc-anonymous-base-url}/${module-directory}
@@ -101,17 +100,12 @@
${top-level}/solr/core/src/test-files
+
+ ${top-level}/dev-tools/maven/solr
+
+ maven.testlogging.properties
+
+
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- ${surefire-top-level}/solr/testlogging.properties
-
-
-
-
diff --git a/dev-tools/maven/solr/contrib/uima/pom.xml.template b/dev-tools/maven/solr/contrib/uima/pom.xml.template
index b671ec9f8d5..bc5eed52a51 100644
--- a/dev-tools/maven/solr/contrib/uima/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/uima/pom.xml.template
@@ -35,7 +35,6 @@
solr/contrib/uima
../../../..
${top-level}/${module-directory}
- ${top-level}/../..
scm:svn:${vc-anonymous-base-url}/${module-directory}
@@ -115,17 +114,12 @@
${module-path}/src/test-files
+
+ ${top-level}/dev-tools/maven/solr
+
+ maven.testlogging.properties
+
+
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- ${surefire-top-level}/solr/testlogging.properties
-
-
-
-
diff --git a/dev-tools/maven/solr/contrib/velocity/pom.xml.template b/dev-tools/maven/solr/contrib/velocity/pom.xml.template
index 51ff7823665..240299368bd 100644
--- a/dev-tools/maven/solr/contrib/velocity/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/velocity/pom.xml.template
@@ -35,7 +35,6 @@
solr/contrib/velocity
../../../..
${top-level}/${module-directory}
- ${top-level}/../..
scm:svn:${vc-anonymous-base-url}/${module-directory}
@@ -136,17 +135,12 @@
${top-level}/solr/core/src/test-files
+
+ ${top-level}/dev-tools/maven/solr
+
+ maven.testlogging.properties
+
+
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- ${surefire-top-level}/solr/testlogging.properties
-
-
-
-
diff --git a/dev-tools/maven/solr/core/pom.xml.template b/dev-tools/maven/solr/core/pom.xml.template
index 37f672ddffa..61a2bb48421 100644
--- a/dev-tools/maven/solr/core/pom.xml.template
+++ b/dev-tools/maven/solr/core/pom.xml.template
@@ -35,7 +35,6 @@
solr/core
../../..
${top-level}/${module-directory}
- ${top-level}/../..
scm:svn:${vc-anonymous-base-url}/${module-directory}
@@ -237,18 +236,14 @@
${top-level}/solr/solrj/src/test-files
+
+ ${top-level}/dev-tools/maven/solr
+
+ maven.testlogging.properties
+
+
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- ${surefire-top-level}/solr/testlogging.properties
- INFO
-
-
-
org.codehaus.mojo
build-helper-maven-plugin
diff --git a/dev-tools/maven/solr/maven.testlogging.properties b/dev-tools/maven/solr/maven.testlogging.properties
new file mode 100644
index 00000000000..4a4df0eab77
--- /dev/null
+++ b/dev-tools/maven/solr/maven.testlogging.properties
@@ -0,0 +1,2 @@
+handlers=java.util.logging.ConsoleHandler
+.level=SEVERE
diff --git a/dev-tools/maven/solr/pom.xml.template b/dev-tools/maven/solr/pom.xml.template
index 6c546006a70..7f69c0b6d88 100644
--- a/dev-tools/maven/solr/pom.xml.template
+++ b/dev-tools/maven/solr/pom.xml.template
@@ -99,6 +99,15 @@
${project.name} ${project.version} API (${now.version})
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ ../test-classes/maven.testlogging.properties
+
+
+