diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-08-29 21:22:51 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-08-29 21:22:51 +0000 |
| commit | b528f2d89f40c780205cc7093eee4df0816c17bd (patch) | |
| tree | 38a5e66d9b02a0ad284c2927ac1b79b1fe9f0755 /archiva-docs | |
| parent | e713a4d1610c3332e1e1209b785ca4fcb4a76bae (diff) | |
| download | archiva-b528f2d89f40c780205cc7093eee4df0816c17bd.tar.gz archiva-b528f2d89f40c780205cc7093eee4df0816c17bd.zip | |
simplify svnpub sub configuration: just use mvn site-deploy is easier and as usual :-)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1378742 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-docs')
| -rw-r--r-- | archiva-docs/deploySite.sh | 1 | ||||
| -rw-r--r-- | archiva-docs/pom.xml | 20 |
2 files changed, 13 insertions, 8 deletions
diff --git a/archiva-docs/deploySite.sh b/archiva-docs/deploySite.sh deleted file mode 100644 index 9ba6df0a9..000000000 --- a/archiva-docs/deploySite.sh +++ /dev/null @@ -1 +0,0 @@ -mvn clean site-deploy && mvn scm-publish:publish-scm diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index 6484f600e..3cff952fe 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -38,10 +38,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> @@ -56,7 +52,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-publish-plugin</artifactId> <configuration> - <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/docs/${project.version}</pubScmUrl> <checkinComment>Apache Archiva Versionned docs for ${project.version}</checkinComment> </configuration> </plugin> @@ -64,15 +59,26 @@ </pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <executions> <execution> - <id>site</id> + <id>site-generate-resources</id> <phase>generate-resources</phase> <goals> <goal>site</goal> </goals> </execution> + <execution> + <id>stage-for-scm-publish</id> + <phase>post-site</phase> + <goals> + <goal>stage</goal> + </goals> + <configuration> + <skipDeploy>false</skipDeploy> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -115,7 +121,7 @@ <distributionManagement> <site> <id>apache.website</id> - <url>${siteUrlDeployment}</url> + <url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/docs/${project.version}</url> </site> </distributionManagement> |