You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2007/10/20 23:10:26 UTC
svn commit: r586801 - in /maven/plugins/trunk/maven-site-plugin: ./ src/it/
src/it/MSITE-265/ src/it/MSITE-265/src/ src/it/MSITE-265/src/site/
src/it/MSITE-265/src/site/xdoc/ src/it/MSITE-265/src/site/xdoc/releases/
Author: olamy
Date: Sat Oct 20 14:10:25 2007
New Revision: 586801
URL: http://svn.apache.org/viewvc?rev=586801&view=rev
Log:
[MSITE-265] filename with dot are considered as duplicate
upgrade doxia version to 1.0-alpha-10-SNAPSHOT
add an it test for this issue
Added:
maven/plugins/trunk/maven-site-plugin/src/it/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/index.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.3.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh (with props)
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=586801&r1=586800&r2=586801&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Oct 20 14:10:25 2007
@@ -22,7 +22,7 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>9-SNAPSHOT</version>
+ <version>9</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-site-plugin</artifactId>
@@ -127,8 +127,8 @@
</contributor>
</contributors>
<properties>
- <doxiaVersion>1.0-alpha-9</doxiaVersion>
- <doxiaSitetoolsVersion>1.0-alpha-9</doxiaSitetoolsVersion>
+ <doxiaVersion>1.0-alpha-10-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>1.0-alpha-10-SNAPSHOT</doxiaSitetoolsVersion>
</properties>
<dependencies>
<dependency>
@@ -203,5 +203,71 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <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-install-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <file>${project.build.directory}/${project.build.finalName}.jar</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <packaging>${project.packaging}</packaging>
+ <pomFile>${basedir}/pom.xml</pomFile>
+ <createChecksum>true</createChecksum>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <localRepositoryId>it-local-repo</localRepositoryId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.0</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>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml?rev=586801&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml Sat Oct 20 14:10:25 2007
@@ -0,0 +1,29 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<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>
+ <groupId>test</groupId>
+ <artifactId>MSITE-265</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>MSITE-265 It</name>
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml?rev=586801&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml Sat Oct 20 14:10:25 2007
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--$Id$-->
+<project name="MSITE-265">
+ <publishDate format="dd MMM yyyy HH:mm"/>
+ <version position="left"/>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-stylus-skin</artifactId>
+ </skin>
+ <body>
+ <menu name="Releases TODO">
+ <item name="release1.6" href="releases/release1.6.html"/>
+ <item name="release1.6.3" href="releases/release1.6.3.html"/>
+ </menu>
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ <menu ref="modules"/>
+ </body>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/index.xml?rev=586801&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/index.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/index.xml Sat Oct 20 14:10:25 2007
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<document>
+ <body>
+ <section name="Overview">
+ <p>MSITE-265.</p>
+ </section>
+ </body>
+</document>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/index.xml
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/index.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/index.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.3.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.3.xml?rev=586801&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.3.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.3.xml Sat Oct 20 14:10:25 2007
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<document>
+ <body>
+ <section name="todo">
+ <p>Release TODO 1.6.3</p>
+ </section>
+ </body>
+</document>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.3.xml
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.3.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.3.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.xml?rev=586801&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.xml Sat Oct 20 14:10:25 2007
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<document>
+ <body>
+ <section name="todo">
+ <p>Release TODO 1.6</p>
+ </section>
+ </body>
+</document>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.xml
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/xdoc/releases/release1.6.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh?rev=586801&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh Sat Oct 20 14:10:25 2007
@@ -0,0 +1,66 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.*;
+
+boolean result = true;
+
+try
+{
+ File target = new File( basedir, "target" );
+ if ( !target.exists() || !target.isDirectory() )
+ {
+ System.err.println( "target file is missing or not a directory." );
+ return false;
+ }
+
+ File siteDirectory = new File ( target, "site" );
+ if ( !siteDirectory.exists() || !siteDirectory.isDirectory() )
+ {
+ System.err.println( "site file is missing or not a directory." );
+ return false;
+ }
+
+ File releaseDirectory = new File ( siteDirectory, "releases" );
+ if ( !releaseDirectory.exists() || !releaseDirectory.isDirectory() )
+ {
+ System.err.println( "releaseDirectory file is missing or not a directory." );
+ return false;
+ }
+ File release163 = new File ( releaseDirectory, "release1.6.3.html" );
+ if ( !release163.exists() || release163.isDirectory() )
+ {
+ System.err.println( "release163 file is missing or a directory." );
+ return false;
+ }
+ File release16 = new File ( releaseDirectory, "release1.6.html" );
+ if ( !release16.exists() || release16.isDirectory() )
+ {
+ System.err.println( "release16 file is missing or a directory." );
+ return false;
+ }
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh
------------------------------------------------------------------------------
svn:executable = *