You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2018/05/01 18:20:30 UTC
[archiva] branch master updated (aa9f78d -> 6baab5a)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from aa9f78d Trying to fix repo dir
new 8b16d7b Changing path for url cache
new 6baab5a Switching back to old repository dir
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 11 ++++++-----
archiva-modules/archiva-base/archiva-converter/pom.xml | 10 ++++++++++
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../archiva-proxy/src/test/resources/spring-context.xml | 2 +-
.../archiva-base/archiva-repository-scanner/pom.xml | 10 ++++++++++
.../archiva-scheduler/archiva-scheduler-repository/pom.xml | 1 +
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
archiva-modules/plugins/problem-reports/pom.xml | 10 ++++++++++
8 files changed, 40 insertions(+), 8 deletions(-)
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva] 02/02: Switching back to old repository dir
Posted by ma...@apache.org.
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
commit 6baab5a26848aba0689279e355bfe7b5c531282d
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Tue May 1 20:19:58 2018 +0200
Switching back to old repository dir
---
Jenkinsfile | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0a7bda5..9458f4f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,9 +14,7 @@ pipeline {
stage('Checkout') {
steps {
script {
- currentBuild.description = "This builds, tests and deploys the current artifact from archiva master branch."
- REPO_DIR = "${PWD}/.repo-${env.JOB_NAME.replace('/', '_')}"
- echo "Info: Job-Name=${JOB_NAME}, Branch=${BRANCH_NAME}, Workspace=${PWD}, Repo-Dir=${REPO_DIR}"
+ echo "Info: Job-Name=${JOB_NAME}, Branch=${BRANCH_NAME}, Workspace=${PWD}"
}
checkout scm
}
@@ -32,7 +30,7 @@ pipeline {
timeout(120) {
withMaven(maven: buildMvn, jdk: buildJdk,
mavenSettingsConfig: deploySettings,
- mavenLocalRepo: REPO_DIR
+ mavenLocalRepo: ".repository"
)
{
sh "chmod 755 ./src/ci/scripts/prepareWorkspace.sh"
@@ -69,7 +67,7 @@ pipeline {
timeout(120) {
withMaven(maven: buildMvn, jdk: buildJdk,
mavenSettingsConfig: deploySettings,
- mavenLocalRepo: REPO_DIR
+ mavenLocalRepo: ".repository"
)
{
sh "mvn deploy -B -Dmaven.test.skip=true"
@@ -88,6 +86,9 @@ pipeline {
unstable {
notifyBuild("Unstable Build")
}
+ always {
+ cleanWs deleteDirs: true, notFailBuild: true, patterns: [[pattern: '.repository', type: 'EXCLUDE']]
+ }
}
}
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva] 01/02: Changing path for url cache
Posted by ma...@apache.org.
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
commit 8b16d7b24a805d80fee1e20ea58c9c310f037650
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Tue May 1 20:19:20 2018 +0200
Changing path for url cache
---
archiva-modules/archiva-base/archiva-converter/pom.xml | 10 ++++++++++
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../archiva-proxy/src/test/resources/spring-context.xml | 2 +-
.../archiva-base/archiva-repository-scanner/pom.xml | 10 ++++++++++
.../archiva-scheduler/archiva-scheduler-repository/pom.xml | 1 +
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
archiva-modules/plugins/problem-reports/pom.xml | 10 ++++++++++
7 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml
index 98a7abe..91d1cc6 100644
--- a/archiva-modules/archiva-base/archiva-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-converter/pom.xml
@@ -138,6 +138,16 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <basedir>${basedir}</basedir>
+ <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
index 7ed448f..676edf7 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
@@ -39,7 +39,7 @@
destroy-method="dispose">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="true"/>
- <property name="diskStorePath" value="${java.io.tmpdir}/archiva/urlcache"/>
+ <property name="diskStorePath" value="${appserver.base}/tmp/urlcache"/>
<property name="maxElementsInMemory" value="1000"/>
<property name="memoryEvictionPolicy" value="LRU"/>
<property name="name" value="url-failures-cache"/>
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
index 65599f7..e8781bc 100755
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
@@ -71,7 +71,7 @@
destroy-method="dispose">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="false"/>
- <property name="diskStorePath" value="${java.io.tmpdir}/archiva/urlcache"/>
+ <property name="diskStorePath" value="${appserver.base}/tmp/urlcache"/>
<property name="maxElementsInMemory" value="1000"/>
<property name="memoryEvictionPolicy" value="LRU"/>
<property name="name" value="url-failures-cache"/>
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
index 8bb08b9..7b76e7b 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
@@ -88,6 +88,16 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <basedir>${basedir}</basedir>
+ <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index bd4e3c1..1b72a32 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -171,6 +171,7 @@
<configuration>
<systemPropertyVariables>
<archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id>
+ <appserver.base>${project.build.directory}/appserver-base</appserver.base>
</systemPropertyVariables>
</configuration>
</plugin>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 0197c32..8fe7145 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -147,7 +147,7 @@
destroy-method="dispose">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="true"/>
- <property name="diskStorePath" value="${java.io.tmpdir}/archiva/urlcache"/>
+ <property name="diskStorePath" value="${appserver.base}/tmp/urlcache"/>
<property name="maxElementsInMemory" value="1000"/>
<property name="memoryEvictionPolicy" value="LRU"/>
<property name="name" value="url-failures-cache"/>
diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml
index d08bccb..3ffb4b3 100644
--- a/archiva-modules/plugins/problem-reports/pom.xml
+++ b/archiva-modules/plugins/problem-reports/pom.xml
@@ -123,6 +123,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <basedir>${basedir}</basedir>
+ <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.