From: Olivier Lamy Date: Fri, 3 May 2013 23:30:53 +0000 (+0000) Subject: simplify site deployment X-Git-Tag: archiva-1.4-M4~34 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2eaa058a7b0c68bd9af3c6cee71a1b7d6dd1500f;p=archiva.git simplify site deployment git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1479005 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/deploySite.sh b/archiva-modules/deploySite.sh index c876c99d6..44a13e0e9 100644 --- a/archiva-modules/deploySite.sh +++ b/archiva-modules/deploySite.sh @@ -1 +1 @@ -mvn clean site-deploy scm-publish:publish-scm $@ +mvn clean site site:stage -Preporting scm-publish:publish-scm $@ diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index 0af6f5499..d6ac47991 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -32,7 +32,7 @@ ${user.home}/archiva-sites/archiva-ref-${project.version}/ file://${siteFilePath} - ${user.home}/archiva-sites/archiva-ref-${project.version}-content + ${basedir}/.site-content @@ -53,7 +53,7 @@ scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/ref/${project.version} Apache Archiva Versionned ref for ${project.version} - ${siteFilePath} + ${project.build.directory}/staging @@ -83,13 +83,6 @@ true config/maven_checks.xml - - - - checkstyle-aggregate - - - @@ -168,6 +161,30 @@ + + + reporting + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${checkstyleVersion} + false + + + + checkstyle-aggregate + + + + + + + + + +