Author: olamy
Date: Thu Aug 30 21:55:58 2012
New Revision: 1379177
URL: http://svn.apache.org/viewvc?rev=1379177&view=rev
Log:
rename property to avoid issue with the one used in javadoc plugin
Modified:
archiva/parent/pom.xml
archiva/redback/redback-components/trunk/deploySite.sh
archiva/redback/redback-components/trunk/redback-components-parent/pom.xml
archiva/redback/redback-core/trunk/pom.xml
archiva/trunk/archiva-modules/pom.xml
Modified: archiva/parent/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/parent/pom.xml?rev=1379177&r1=1379176&r2=1379177&view=diff
==============================================================================
--- archiva/parent/pom.xml (original)
+++ archiva/parent/pom.xml Thu Aug 30 21:55:58 2012
@@ -79,7 +79,7 @@
<maven-project-info-reports-plugin.version>2.5</maven-project-info-reports-plugin.version>
<checkstyleVersion>2.9.1</checkstyleVersion>
<jxrVersion>2.3</jxrVersion>
- <javadocVersion>2.8.1</javadocVersion>
+ <javadocPluginVersion>2.8.1</javadocPluginVersion>
</properties>
@@ -656,7 +656,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadocVersion}</version>
+ <version>${javadocPluginVersion}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: archiva/redback/redback-components/trunk/deploySite.sh
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/deploySite.sh?rev=1379177&r1=1379176&r2=1379177&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/deploySite.sh (original)
+++ archiva/redback/redback-components/trunk/deploySite.sh Thu Aug 30 21:55:58
2012
@@ -1 +1 @@
-mvn clean site-deploy -f redback-components-parent/pom.xml -Pall && mvn
scm-publish:publish-scm -f redback-components-parent/pom.xml
+mvn clean site-deploy -f redback-components-parent/pom.xml -Pall
Modified:
archiva/redback/redback-components/trunk/redback-components-parent/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/redback-components-parent/pom.xml?rev=1379177&r1=1379176&r2=1379177&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/redback-components-parent/pom.xml
(original)
+++ archiva/redback/redback-components/trunk/redback-components-parent/pom.xml
Thu Aug 30 21:55:58 2012
@@ -43,7 +43,6 @@
<distUrlReleaseRepo>https://archiva-repository.apache.org/archiva/repository/archiva-releases-stage/</distUrlReleaseRepo>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <siteFilePath>${user.home}/redback-components-site-deploy</siteFilePath>
<scmPubCheckoutDirectory>${user.home}/redback-components-site-content</scmPubCheckoutDirectory>
</properties>
@@ -58,7 +57,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>${siteUrlDeployment}</url>
+
<url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components</url>
</site>
</distributionManagement>
@@ -196,7 +195,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/redback/components</pubScmUrl>
<checkinComment>Apache Redback Components site
deployment</checkinComment>
</configuration>
</plugin>
@@ -237,7 +235,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadocVersion}</version>
+ <version>${javadocPluginVersion}</version>
<configuration>
<docletArtifact>
<groupId>com.google.doclava</groupId>
Modified: archiva/redback/redback-core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/pom.xml?rev=1379177&r1=1379176&r2=1379177&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/pom.xml (original)
+++ archiva/redback/redback-core/trunk/pom.xml Thu Aug 30 21:55:58 2012
@@ -65,7 +65,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>${siteUrlDeployment}</url>
+
<url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/core</url>
</site>
</distributionManagement>
@@ -84,7 +84,6 @@
<redbackTestJdbcUrl>jdbc:hsqldb:mem:redback-test</redbackTestJdbcUrl>
<redbackTestJdbcDriver>org.hsqldb.jdbcDriver</redbackTestJdbcDriver>
- <siteFilePath>${user.home}/redback-core-site-deploy</siteFilePath>
<scmPubCheckoutDirectory>${user.home}/redback-core-site-content</scmPubCheckoutDirectory>
</properties>
@@ -684,9 +683,27 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ <executions>
+ <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>
+ <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/redback/core</pubScmUrl>
<checkinComment>Apache Redback Core site
deployment</checkinComment>
</configuration>
</plugin>
@@ -817,9 +834,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadocVersion}</version>
+ <version>${javadocPluginVersion}</version>
<inherited>false</inherited>
<configuration>
+ <javadocVersion>1.6</javadocVersion>
<docletArtifact>
<groupId>com.google.doclava</groupId>
<artifactId>doclava</artifactId>
Modified: archiva/trunk/archiva-modules/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/pom.xml?rev=1379177&r1=1379176&r2=1379177&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/pom.xml (original)
+++ archiva/trunk/archiva-modules/pom.xml Thu Aug 30 21:55:58 2012
@@ -99,7 +99,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadocVersion}</version>
+ <version>${javadocPluginVersion}</version>
<configuration>
<source>1.5</source>
<links>
