This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new 214bdc4 Fixing build and test configuration
214bdc4 is described below
commit 214bdc43609d31780f2946526c2fc8fd2d146e48
Author: Martin Stockhammer <[email protected]>
AuthorDate: Wed May 2 23:10:06 2018 +0200
Fixing build and test configuration
---
Jenkinsfile | 10 ++++++++--
archiva-modules/plugins/maven2-repository/pom.xml | 2 +-
.../org/apache/archiva/configuration/TestConfiguration.java | 2 +-
.../storage/maven2/Maven2RepositoryMetadataResolverTest.java | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2b07b49..5fd6b23 100644
--- a/Jenkinsfile
+++ b/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")
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml
b/archiva-modules/plugins/maven2-repository/pom.xml
index b151a4e..2acfa79 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/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>
diff --git
a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
index 95084a5..ac24a34 100644
---
a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
+++
b/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");
}
}
}
diff --git
a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
index 2a4bbe7..338c227 100644
---
a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
+++
b/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
--
To stop receiving notification emails like this one, please contact
[email protected].
