You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2009/01/11 00:12:57 UTC
svn commit: r733397 -
/maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml
Author: ltheussl
Date: Sat Jan 10 15:12:56 2009
New Revision: 733397
URL: http://svn.apache.org/viewvc?rev=733397&view=rev
Log:
Align pom with trunk. Bump some version numbers, in particular doxia-1.1-SNAPSHOT.
Modified:
maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml
Modified: maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml?rev=733397&r1=733396&r2=733397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-doxia-beta-1/pom.xml Sat Jan 10 15:12:56 2009
@@ -1,4 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,30 +20,23 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>11</version>
+ <version>12</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
+
<name>Maven Site Plugin</name>
- <version>2.0-beta-8-SNAPSHOT</version>
<description>
The Maven Site Plugin is a plugin that generates a site for the current project.
</description>
- <prerequisites>
- <maven>2.0.11-SNAPSHOT</maven>
- </prerequisites>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.codehaus.org/browse/MSITE</url>
- </issueManagement>
-
<contributors>
<contributor>
<name>Naoki Nose</name>
@@ -139,146 +133,75 @@
<role>Danish translator</role>
</roles>
</contributor>
+ <contributor>
+ <name>Samuel Santos</name>
+ <email>samaxes@gmail.com</email>
+ <roles>
+ <role>Portuguese translator</role>
+ </roles>
+ </contributor>
</contributors>
+ <prerequisites>
+ <!--
+ NOTE: 2.1.0-M2 trunk does not yet use doxia-1.1, need to build locally.
+ Plan is to switch 2.1.0-M3 to doxia-1.1, see MNG-3402
+ -->
+ <maven>2.1.0-M2-SNAPSHOT</maven>
+ </prerequisites>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/</developerConnection>
<url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/</url>
</scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.codehaus.org/browse/MSITE</url>
+ </issueManagement>
- <build>
- <pluginManagement>
- <plugins>
- <!-- TODO: remove when maven-plugins parent pom 12 is released -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.4.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>integration-tests</id>
- <activation>
- <property>
- <name>maven.test.skip</name>
- <value>!true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>1.2.1-SNAPSHOT</version>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <pomIncludes>
- <pomInclude>**/**/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify.bsh</postBuildHookScript>
- <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
- <goals>
- <goal>clean</goal>
- <goal>${project.groupId}:${project.artifactId}:${project.version}:site</goal>
- </goals>
- <settingsFile>src/it/settings.xml</settingsFile>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>reporting</id>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>l10n-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
- <configuration>
- <locales>
- <locale>ca</locale>
- <locale>cs</locale>
- <locale>da</locale>
- <locale>de</locale>
- <locale>es</locale>
- <locale>fr</locale>
- <locale>hu</locale>
- <locale>it</locale>
- <locale>ja</locale>
- <locale>ko</locale>
- <locale>nl</locale>
- <locale>no</locale>
- <locale>pl</locale>
- <locale>pt_BR</locale>
- <locale>sk</locale>
- <locale>sv</locale>
- <locale>tr</locale>
- <locale>zh_CN</locale>
- </locales>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- </profiles>
+ <properties>
+ <doxiaVersion>1.1-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>1.1-SNAPSHOT</doxiaSitetoolsVersion>
+ <wagonVersion>1.0-beta-4</wagonVersion>
+ </properties>
<dependencies>
<!-- Maven -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.2</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
- <version>2.0.2</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0.2</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>2.0</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.1.0-M2-SNAPSHOT</version>
</dependency>
<!-- Doxia -->
@@ -297,16 +220,19 @@
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-apt</artifactId>
<version>${doxiaVersion}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-xdoc</artifactId>
<version>${doxiaVersion}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-fml</artifactId>
<version>${doxiaVersion}</version>
+ <scope>runtime</scope>
</dependency>
<!-- Doxia-sitetools -->
@@ -344,7 +270,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-doxia-tools</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<!-- Wagon -->
@@ -397,9 +323,76 @@
</dependency>
</dependencies>
- <properties>
- <doxiaVersion>1.0-beta-1-SNAPSHOT</doxiaVersion>
- <doxiaSitetoolsVersion>1.0-beta-1-SNAPSHOT</doxiaSitetoolsVersion>
- <wagonVersion>1.0-beta-3</wagonVersion>
- </properties>
+ <profiles>
+ <profile>
+ <id>run-its</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.3</version>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ <postBuildHookScript>verify</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <goals>
+ <goal>clean</goal>
+ <goal>${project.groupId}:${project.artifactId}:${project.version}:site</goal>
+ </goals>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>l10n-maven-plugin</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ <configuration>
+ <locales>
+ <locale>ca</locale>
+ <locale>cs</locale>
+ <locale>da</locale>
+ <locale>de</locale>
+ <locale>es</locale>
+ <locale>fr</locale>
+ <locale>hu</locale>
+ <locale>it</locale>
+ <locale>ja</locale>
+ <locale>ko</locale>
+ <locale>nl</locale>
+ <locale>no</locale>
+ <locale>pl</locale>
+ <locale>pt</locale>
+ <locale>pt_BR</locale>
+ <locale>sk</locale>
+ <locale>sv</locale>
+ <locale>tr</locale>
+ <locale>zh_CN</locale>
+ </locales>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
</project>