You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/10/11 20:41:21 UTC
svn commit: r703706 - in /maven/plugin-tools/trunk/maven-plugin-plugin: ./
src/it/java-basic/ src/it/plugin-report-failure-it/ src/it/plugin-report/
src/it/plugin-report/src/ src/it/plugin-report/src/main/
src/it/plugin-report/src/main/java/ src/it/plu...
Author: bentmann
Date: Sat Oct 11 11:41:20 2008
New Revision: 703706
URL: http://svn.apache.org/viewvc?rev=703706&view=rev
Log:
o Migrated test for MPLUGIN-105 into automated IT suite
Added:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/invoker.properties (with props)
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml (with props)
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/src/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/src/main/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/src/main/java/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/src/main/java/org/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java (with props)
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/verify.bsh (with props)
Removed:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report-failure-it/
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/pom.xml
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=703706&r1=703705&r2=703706&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Sat Oct 11 11:41:20 2008
@@ -273,10 +273,6 @@
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <pomExcludes>
- <!-- TODO: Investigate whether this is a core IT or a plugin IT. In the latter case, migrate it into the automated build -->
- <pomExclude>plugin-report-failure-it/*</pomExclude>
- </pomExcludes>
<preBuildHookScript>setup.bsh</preBuildHookScript>
<postBuildHookScript>verify.bsh</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/pom.xml?rev=703706&r1=703705&r2=703706&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/pom.xml Sat Oct 11 11:41:20 2008
@@ -34,6 +34,10 @@
java-based mojo sources, install the plugin, and then use it.
</description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/invoker.properties?rev=703706&view=auto
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/invoker.properties (added)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/invoker.properties Sat Oct 11 11:41:20 2008
@@ -0,0 +1 @@
+invoker.goals = clean site
Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml?rev=703706&view=auto
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml (added)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml Sat Oct 11 11:41:20 2008
@@ -0,0 +1,83 @@
+<?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
+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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>plugin-report</artifactId>
+ <version>1.0</version>
+ <packaging>maven-plugin</packaging>
+
+ <name>MPLUGIN-105</name>
+ <description>
+ Test basic site generation to guard against regression of MPLUGIN-105.
+ </description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java?rev=703706&view=auto
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java (added)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java Sat Oct 11 11:41:20 2008
@@ -0,0 +1,65 @@
+package org;
+
+/*
+ * 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 org.apache.maven.plugin.AbstractMojo;
+
+/**
+ * Does nothing.
+ *
+ * @goal noop
+ * @phase process-sources
+ * @requiresDependencyResolution test
+ * @requiresDirectInvocation true
+ * @requiresOnline
+ * @inheritByDefault false
+ * @execute phase="compile"
+ * @aggregator
+ * @since 1.0
+ *
+ * @deprecated You don't use test goals, do you?
+ */
+public class MyMojo
+ extends AbstractMojo
+{
+
+ /**
+ * This is a test.
+ *
+ * @parameter
+ * @required
+ */
+ private String required;
+
+ /**
+ * This is a test.
+ *
+ * @parameter expression="${string}" default-value="${project.version}"
+ * @deprecated Just testing.
+ * @since 1.1
+ */
+ private String string;
+
+ public void execute()
+ {
+ // intentional do nothing
+ }
+
+}
Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/verify.bsh?rev=703706&view=auto
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/verify.bsh (added)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/verify.bsh Sat Oct 11 11:41:20 2008
@@ -0,0 +1,36 @@
+import java.io.*;
+import java.util.*;
+import java.util.regex.*;
+
+try
+{
+ File siteDir = new File( basedir, "target/site" );
+ System.out.println( "Checking for existence of site directory: " + siteDir );
+ if ( !siteDir.isDirectory() )
+ {
+ System.out.println( "FAILED!" );
+ return false;
+ }
+
+ String[] expectedFiles = {
+ "noop-mojo.html",
+ "plugin-info.html",
+ };
+ for ( String path : expectedFiles )
+ {
+ File file = new File( siteDir, path );
+ System.out.println( "Checking for existence of doc file: " + file );
+ if ( !file.isFile() )
+ {
+ System.out.println( "FAILED!" );
+ return false;
+ }
+ }
+}
+catch( Throwable t )
+{
+ t.printStackTrace();
+ return false;
+}
+
+return true;
Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/verify.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision