Author: bimargulies
Date: Sun Jul 17 13:49:35 2011
New Revision: 1147613
URL: http://svn.apache.org/viewvc?rev=1147613&view=rev
Log:
Copy more configuration from the standard plugin parent to see if I can't fix
up the site issues that Hervé
pointed out. This is certainly not all the fixes needed.
Modified:
maven/jxr/trunk/maven-jxr-plugin/pom.xml
maven/jxr/trunk/maven-jxr/pom.xml
maven/jxr/trunk/pom.xml
Modified: maven/jxr/trunk/maven-jxr-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/pom.xml?rev=1147613&r1=1147612&r2=1147613&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr-plugin/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr-plugin/pom.xml Sun Jul 17 13:49:35 2011
@@ -48,7 +48,7 @@ under the License.
<properties>
<mavenVersion>2.0.9</mavenVersion>
- <sitePluginVersion>2.2</sitePluginVersion>
+ <sitePluginVersion>2.3</sitePluginVersion>
<doxia-sitetoolsVersion>1.2</doxia-sitetoolsVersion>
<doxiaVersion>1.2</doxiaVersion>
</properties>
@@ -73,10 +73,6 @@ under the License.
<forkMode>always</forkMode>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>${sitePluginVersion}</version>
- </plugin>
</plugins>
</pluginManagement>
@@ -84,6 +80,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>2.8</version>
<executions>
<execution>
<id>generated-helpmojo</id>
@@ -185,6 +182,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>2.8</version>
</plugin>
</plugins>
</reporting>
@@ -235,7 +233,7 @@ under the License.
</file>
</activation>
<properties>
- <sitePluginVersion>3.0-beta-1-SNAPSHOT</sitePluginVersion>
+ <sitePluginVersion>3.0-beta-4-SNAPSHOT</sitePluginVersion>
</properties>
</profile>
@@ -246,13 +244,13 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
+ <version>2.8</version>
<configuration>
<tagletArtifacts>
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.5</version>
+ <version>2.8</version>
</tagletArtifact>
<tagletArtifact>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/jxr/trunk/maven-jxr/pom.xml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/pom.xml?rev=1147613&r1=1147612&r2=1147613&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr/pom.xml Sun Jul 17 13:49:35 2011
@@ -101,6 +101,7 @@ under the License.
</site>
</distributionManagement>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/jxr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/pom.xml?rev=1147613&r1=1147612&r2=1147613&view=diff
==============================================================================
--- maven/jxr/trunk/pom.xml (original)
+++ maven/jxr/trunk/pom.xml Sun Jul 17 13:49:35 2011
@@ -60,6 +60,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
<version>4.8.2</version>
</dependency>
</dependencies>
@@ -69,6 +70,13 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/jxr/${project.artifactId}-${project.version}</stagingSiteURL>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/maven/jxr/tags</tagBase>
