Author: hboutemy
Date: Wed Dec 30 19:07:34 2015
New Revision: 1722396
URL: http://svn.apache.org/viewvc?rev=1722396&view=rev
Log:
renamed and simplified IT
Added:
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/
- copied from r1722375,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.groovy
- copied, changed from r1722375,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh
Removed:
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.bsh
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/invoker.properties
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/parent/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/pom.xml
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/invoker.properties?rev=1722396&r1=1722375&r2=1722396&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/invoker.properties
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/invoker.properties
Wed Dec 30 19:07:34 2015
@@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals.1 = clean
-invoker.goals.2 = site-deploy
+invoker.goals = clean site-deploy
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/parent/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/parent/pom.xml?rev=1722396&r1=1722375&r2=1722396&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/parent/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/parent/pom.xml
Wed Dec 30 19:07:34 2015
@@ -32,7 +32,7 @@ under the License.
<name>site-interpolation IT - parent</name>
<properties>
- <interpolated>interpolation</interpolated>
+ <interpolated>pom-interpolation</interpolated>
<site.server>site-deploy</site.server>
<site.repository>file://@project.build.directory@/it/${interpolated}/target/site-deployed/parent/</site.repository>
</properties>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/pom.xml?rev=1722396&r1=1722375&r2=1722396&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/pom.xml Wed
Dec 30 19:07:34 2015
@@ -31,7 +31,7 @@ under the License.
<relativePath>parent/</relativePath>
</parent>
- <artifactId>interpolation</artifactId>
+ <artifactId>pom-interpolation</artifactId>
<packaging>pom</packaging>
<name>site-interpolation IT</name>
@@ -46,24 +46,10 @@ under the License.
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <generateReports>false</generateReports>
+ </configuration>
</plugin>
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
</project>
Copied:
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.groovy
(from r1722375,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.groovy?p2=maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.groovy&p1=maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh&r1=1722375&r2=1722396&rev=1722396&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.groovy
Wed Dec 30 19:07:34 2015
@@ -18,41 +18,4 @@
* under the License.
*/
-import java.io.*;
-import org.codehaus.plexus.util.*;
-
-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." );
- System.err.println( target.getAbsolutePath() );
- result = false;
- }
-
- File siteDirectory = new File( target, "site-deployed/interpolation" );
- if ( !siteDirectory.exists() || !siteDirectory.isDirectory() )
- {
- System.err.println( "site file is missing or not a directory." );
- System.err.println( siteDirectory.getAbsolutePath() );
- result = false;
- }
-
- File index = new File( siteDirectory, "index.html" );
- if ( !index.exists() || index.isDirectory() )
- {
- System.err.println( "index.html file is missing or a directory." );
- System.err.println( index.getAbsolutePath() );
- result = false;
- }
-}
-catch ( IOException e )
-{
- e.printStackTrace();
- result = false;
-}
-
-return result;
+assert new File( basedir, 'target/site-deployed/pom-interpolation/index.html'
).isFile();
