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 2013/05/09 22:05:40 UTC
svn commit: r1480749 - in
/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site:
./ invoker.properties module1/ module1/pom.xml pom.xml root/ root/pom.xml
verify.groovy
Author: hboutemy
Date: Thu May 9 20:05:40 2013
New Revision: 1480749
URL: http://svn.apache.org/r1480749
Log:
[MSITE-687] added IT showing wrong site:stage location when parent pom (not in reactor) has same site
Added:
maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/
maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/invoker.properties (with props)
maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/module1/
maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/module1/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/root/
maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/root/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/verify.groovy (with props)
Added: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/invoker.properties?rev=1480749&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/invoker.properties (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/invoker.properties Thu May 9 20:05:40 2013
@@ -0,0 +1,2 @@
+invoker.goals.1 = clean
+invoker.goals.2 = site:site site:deploy site:stage site:stage-deploy
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/invoker.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/invoker.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/module1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/module1/pom.xml?rev=1480749&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/module1/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/module1/pom.xml Thu May 9 20:05:40 2013
@@ -0,0 +1,36 @@
+<?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.its.sameparentsite</groupId>
+ <artifactId>main</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>module1</artifactId>
+
+ <name>module 1</name>
+
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/module1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/module1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/module1/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/pom.xml?rev=1480749&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/pom.xml Thu May 9 20:05:40 2013
@@ -0,0 +1,49 @@
+<?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.its.sameparentsite</groupId>
+ <artifactId>root</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>root/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>main</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>top-parent-same-site</name>
+ <description>MSITE-687: wrong site stage location when parent pom (not in reactor) has same site</description>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>file://@project.build.directory@/it/site-sd-top-parent-same-site/deploy/</url>
+ </site>
+ </distributionManagement>
+
+ <modules>
+ <module>module1</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/root/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/root/pom.xml?rev=1480749&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/root/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/root/pom.xml Thu May 9 20:05:40 2013
@@ -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.its.sameparentsite</groupId>
+ <artifactId>root</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>root</name>
+ <url>http://dummy.com/</url>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>file://@project.build.directory@/it/site-sd-top-parent-same-site/root-deploy</url>
+ </site>
+ </distributionManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/root/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/root/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/root/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/verify.groovy?rev=1480749&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/verify.groovy (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/verify.groovy Thu May 9 20:05:40 2013
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+target = new File( basedir, 'target' );
+assert target.isDirectory();
+
+// deploy
+deployDirectory = new File( basedir, 'deploy' );
+assert deployDirectory.isDirectory();
+assert new File( deployDirectory, 'module1' ).isDirectory();
+
+// stage
+stageDirectory = new File( target, 'staging' );
+assert stageDirectory.isDirectory();
+assert new File( stageDirectory, 'module1' ).isDirectory();
+
+// stage deploy
+stageDeployDirectory = new File( deployDirectory, 'staging' );
+assert stageDeployDirectory.isDirectory();
+assert new File( stageDeployDirectory, 'module1' ).isDirectory();
+
+return true;
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-sd-top-parent-same-site/verify.groovy
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision