Author: hboutemy
Date: Sun Jan 20 15:23:01 2013
New Revision: 1435865
URL: http://svn.apache.org/viewvc?rev=1435865&view=rev
Log:
[MSITE-680] added IT to show the problem, but disabled since it is still failing
Added:
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/invoker.properties
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/pom.xml (with
props)
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/src/
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/src/site/
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/src/site/site.xml
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/verify.groovy
(with props)
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
Added:
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/effective-site/invoker.properties?rev=1435865&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/invoker.properties
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/invoker.properties
Sun Jan 20 15:23:01 2013
@@ -0,0 +1,4 @@
+invoker.goals = clean site site:effective-site
+invoker.mavenOpts = -Doutput=effective-site.xml
+# see MSITE-680
+invoker.maven.version = 3.0+
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/invoker.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/effective-site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/effective-site/pom.xml?rev=1435865&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/effective-site/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/effective-site/pom.xml Sun Jan
20 15:23:01 2013
@@ -0,0 +1,59 @@
+<?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 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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.site.its</groupId>
+ <artifactId>effective-site</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>site:effective-site IT</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>@projectInfoReportsPluginVersion@</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/effective-site/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/effective-site/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/effective-site/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/effective-site/src/site/site.xml?rev=1435865&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/src/site/site.xml
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/src/site/site.xml
Sun Jan 20 15:23:01 2013
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+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 name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+
+ <body>
+ <menu name="Welcome">
+ <item name="Index" href="index.html"/>
+ </menu>
+ <menu ref="reports"/>
+ </body>
+</project>
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/effective-site/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/effective-site/verify.groovy?rev=1435865&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/effective-site/verify.groovy
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/effective-site/verify.groovy
Sun Jan 20 15:23:01 2013
@@ -0,0 +1,22 @@
+
+/*
+ * 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.
+ */
+assert new File( basedir, 'effective-site.xml' ).exists();
+
+return true;
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/effective-site/verify.groovy
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties?rev=1435865&r1=1435864&r2=1435865&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
Sun Jan 20 15:23:01 2013
@@ -1,3 +1,2 @@
invoker.goals.1 = clean
invoker.goals.2 = site-deploy
-invoker.goals.3 = site:effective-site
