Fixing build and test configuration

Jenkinsfile

@@ -31,7 +31,7 @@ pipeline {
                     withMaven(maven: buildMvn, jdk: buildJdk,
                             mavenSettingsConfig: deploySettings,
                             mavenLocalRepo: ".repository",
-                            options: [artifactsPublisher(disabled: true), junitPublisher(disabled: true, ignoreAttachments: false)]
+                            publisherStrategy='EXPLICIT'
                     )
                             {
                                 sh "chmod 755 ./src/ci/scripts/prepareWorkspace.sh"
@@ -54,10 +54,16 @@ pipeline {
             }
             post {
                 always {
-                    junit testDataPublishers: [[$class: 'StabilityTestDataPublisher']], testResults: '**/target/surefire-reports/TEST-*.xml'
+                    junit testResults: '**/target/surefire-reports/TEST-*.xml'
                 }
                 success {
                     archiveArtifacts '**/target/*.war,**/target/*-bin.zip'
+                    script {
+                        def previousResult = currentBuild.previousBuild?.result
+                        if (previousResult && previousResult != currentBuild.result) {
+                            notifyBuild("Fixed")
+                        }
+                    }
                 }
                 failure {
                     notifyBuild("Build / Test failure")

archiva-modules/plugins/maven2-repository/pom.xml

@@ -293,7 +293,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <systemPropertyVariables>
-            <appserver.base>${project.build.directory}/test-repository</appserver.base>
+            <appserver.base>${project.build.directory}/appserver-base</appserver.base>
           </systemPropertyVariables>
         </configuration>
       </plugin>

archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java

@@ -121,7 +121,7 @@ public class TestConfiguration
                 StringUtils.isNotEmpty(configuration.getArchivaRuntimeConfiguration().getDataDirectory())) {
             return Paths.get(configuration.getArchivaRuntimeConfiguration().getDataDirectory());
         } else {
-            return getAppServerBaseDir().resolve("");
+            return getAppServerBaseDir().resolve("data");
         }
     }
 }

archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java

@@ -578,7 +578,7 @@ public class Maven2RepositoryMetadataResolverTest
     public void testGetRootNamespaces()
         throws Exception
     {
-        assertEquals( Arrays.asList( "com", "org", "remotes"), storage.listRootNamespaces( TEST_REPO_ID, ALL ) );
+        assertEquals( Arrays.asList( "com", "org"), storage.listRootNamespaces( TEST_REPO_ID, ALL ) );
     }
 
     @Test