You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/01/10 19:24:55 UTC
svn commit: r1723943 - in /maven/plugins/trunk/maven-site-plugin/src/it:
inheritance-interpolation/ inheritance-interpolation/child/
inheritance-interpolation/child/src/
inheritance-interpolation/child/src/site/
inheritance-interpolation/child/src/site...
Author: hboutemy
Date: Sun Jan 10 18:24:55 2016
New Revision: 1723943
URL: http://svn.apache.org/viewvc?rev=1723943&view=rev
Log:
replaced pom-interpolation IT with more complete inheritance-interpolation
Added:
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/index.apt (with props)
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/pom.apt.vm (with props)
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/invoker.properties (with props)
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/src/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/src/site/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/src/site/apt/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/src/site/apt/index.apt (with props)
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/relative-parent/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/relative-parent/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/src/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/src/site/
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/src/site/site.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy (with props)
Removed:
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/
Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/pom.xml?rev=1723943&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/pom.xml Sun Jan 10 18:24:55 2016
@@ -0,0 +1,57 @@
+<?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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.site.its.inheritance-interpolation</groupId>
+ <artifactId>reactor-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../reactor-parent/</relativePath>
+ </parent>
+
+ <artifactId>child</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <property>prop-value-from-child</property>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <!--phase>pre-site</phase-->
+ <goals>
+ <goal>console</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/index.apt?rev=1723943&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/index.apt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/index.apt Sun Jan 10 18:24:55 2016
@@ -0,0 +1,33 @@
+ -----
+ POMs and Site Decoration Model Inheritance and Interpolation
+ -----
+ Hervé Boutemy
+ -----
+ 2016-01-10
+ -----
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+POMs and Site Decoration Model Inheritance and Interpolation
+
+ * {{{./pom.html} POM Inheritance and Interpolation}}
+
+ * Site Decoration Model Inheritance and Interpolation: see this page
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/index.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/index.apt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/pom.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/pom.apt.vm?rev=1723943&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/pom.apt.vm (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/pom.apt.vm Sun Jan 10 18:24:55 2016
@@ -0,0 +1,77 @@
+ -----
+ POM Inheritance and Interpolation
+ -----
+ Hervé Boutemy
+ -----
+ 2015-12-31
+ -----
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+POM Inheritance and Interpolation
+
+ Since maven-site-plugin uses parent projects values, we need to be sure they have been
+ properly interpolated, which is not necessary to general Maven use: outside the reactor, Maven core
+ may not do the interpolation job but stop at inheritance step (yet to be proven, but there is
+ code in Doxia Sitetools that does workaround against such things, without IT to prove when it
+ is/was useful).
+
+ Then maven-site-plugin does project interpolation itself in Doxia Sitetools,
+ where usually it relies on core work already done.
+
+* Usual Field Inheritance and Interpolation
+
+ Usual fields (not urls) are inherited "as-is" from parent POM to child, then interpolated at the end.
+
+ This test shows the value of a property that has been defined in parent pom with a value containing
+ <<<$\{project.artifactId}>>> expression: here are values at runtime when iterating from project
+ to parent:
+
+#set( $p = $project )
+*-------*------*-------*
+|| level || artifactId || <<<prop>>> property value ||
+*-------+------+--------+
+#foreach( $i in [1..4] )
+#if( $p )| $i| <<<$p.artifactId>>> | <<<$p.properties.getProperty("prop")>>>
+*-------+------+--------+
+#set( $p = $p.parent )#end
+#end
+
+
+* Url Field Inheritance and Interpolation
+
+ Url fields (<<<project.url>>>, <<<project.scm.connection>>>, <<<project.scm.developerConnection>>>,
+ <<<project.scm.url>>> and <<<project.distributionManagement.site.url>>>)
+ are inherited with the addition of artifactId, then interpolated at the end: see
+ {{{http://maven.apache.org/ref/3-LATEST/maven-model-builder/} reference documentation}}.
+
+ Same test with <<<project.url>>>: top parent defines url with a property that is
+ not defined, then property is defined in some childs:
+
+#set( $p = $project )
+*-------*------*-------*
+|| level || artifactId || <<<project.url>>> value ||
+*-------+------+--------+
+#foreach( $i in [1..4] )
+#if( $p )| $i| <<<$p.artifactId>>> | <<<$p.url>>>
+*-------+------+--------+
+#set( $p = $p.parent )#end
+#end
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/pom.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/child/src/site/apt/pom.apt.vm
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/invoker.properties?rev=1723943&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/invoker.properties (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/invoker.properties Sun Jan 10 18:24:55 2016
@@ -0,0 +1,21 @@
+# 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.
+
+invoker.goals.1 = -f repo-parent/pom.xml install
+invoker.debug.1 = false
+invoker.goals.2 = clean site
+invoker.debug.2 = true
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/invoker.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml?rev=1723943&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml Sun Jan 10 18:24:55 2016
@@ -0,0 +1,55 @@
+<?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.inheritance-interpolation</groupId>
+ <artifactId>reactor</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>POM and Site Decoration Model inheritance and interpolation tests</name>
+ <description>
+ this POM is reactor linking to reactor-accessible poms: child and reactor-parent
+ relative-parent is not expected to be in reactor, but accessible from relative path
+ repo-parent is expected to be only available in repo (installed before execution)
+ </description>
+
+ <modules>
+ <module>reactor-parent</module>
+ <module>child</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/pom.xml?rev=1723943&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/pom.xml Sun Jan 10 18:24:55 2016
@@ -0,0 +1,39 @@
+<?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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.site.its.inheritance-interpolation</groupId>
+ <artifactId>relative-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../relative-parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>reactor-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <property>prop-value-from-reactor-parent</property>
+ </properties>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/src/site/apt/index.apt?rev=1723943&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/src/site/apt/index.apt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/src/site/apt/index.apt Sun Jan 10 18:24:55 2016
@@ -0,0 +1,32 @@
+ -----
+ Site Decoration Model Inheritance and Interpolation
+ -----
+ Hervé Boutemy
+ -----
+ 2016-01-10
+ -----
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Site Decoration Model Inheritance and Interpolation
+
+ Site name inherited from repo-parent then interpolated: once interpolated,
+ expression from repo-parent should match current artifactId.
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/src/site/apt/index.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/reactor-parent/src/site/apt/index.apt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/relative-parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/relative-parent/pom.xml?rev=1723943&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/relative-parent/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/relative-parent/pom.xml Sun Jan 10 18:24:55 2016
@@ -0,0 +1,48 @@
+<?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>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.site.its.inheritance-interpolation</groupId>
+ <artifactId>repo-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>relative-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <generateReports>false</generateReports>
+ <saveProcessedContent>true</saveProcessedContent>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/relative-parent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/relative-parent/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/relative-parent/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml?rev=1723943&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml Sun Jan 10 18:24:55 2016
@@ -0,0 +1,63 @@
+<?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.inheritance-interpolation</groupId>
+ <artifactId>repo-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>project name = project.artifactId = '${project.artifactId}'</name>
+ <description>
+ project.name should be interpolated to the current project artifact id
+ and url will be inherited, with the addition of artifactId, before interpolation
+ </description>
+ <url>http://maven.apache.org/${property}</url>
+
+ <properties>
+ <project.source.encoding>UTF-8</project.source.encoding>
+ <prop>project.artifactId = '${project.artifactId}'</prop>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.4</version><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
+ <configuration>
+ <generateReports>false</generateReports>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/src/site/site.xml?rev=1723943&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/src/site/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/src/site/site.xml Sun Jan 10 18:24:55 2016
@@ -0,0 +1,34 @@
+<?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/DECORATION/1.6.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd">
+ <bannerLeft>
+ <name>project.artifactId = ${project.artifactId}</name>
+ </bannerLeft>
+
+ <body>
+ <breadcrumbs>
+ <item name="Maven" href="http://maven.apache.org/index.html" />
+ </breadcrumbs>
+ </body>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/repo-parent/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy?rev=1723943&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy Sun Jan 10 18:24:55 2016
@@ -0,0 +1,40 @@
+
+/*
+ * 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.
+ */
+
+// POM inheritance+interpolation
+content = new File( basedir, 'child/target/generated-site/processed/pom.apt' ).text;
+
+// normal field check
+assert content.contains( "<<<project.artifactId = 'repo-parent'>>>" );
+assert content.contains( "<<<project.artifactId = 'relative-parent'>>>" );
+assert content.contains( "<<<project.artifactId = 'reactor-parent'>>>" );
+assert content.contains( "<<<project.artifactId = 'child'>>>" );
+
+// url check (with its inheritance)
+assert content.contains( '<<<http://maven.apache.org/${property}>>>' ); // repo-parent
+assert content.contains( '<<<http://maven.apache.org/${property}/relative-parent>>>' ); // relative-parent
+assert content.contains( '<<<http://maven.apache.org/prop-value-from-reactor-parent/relative-parent/reactor-parent>>>' ); // reactor-parent
+assert content.contains( '<<<http://maven.apache.org/prop-value-from-child/relative-parent/reactor-parent/child>>>' ); // child
+
+// Site Decoration Model inheritance+interpolation
+childContent = new File( basedir, 'child/target/site/index.html' ).text;
+
+
+reactorContent = new File( basedir, 'reactor-parent/target/site/index.html' ).text;
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/inheritance-interpolation/verify.groovy
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision