Author: rfscholte
Date: Sun Mar 24 15:43:55 2013
New Revision: 1460407
URL: http://svn.apache.org/r1460407
Log:
Add a submodule to the multimodule-hierarchical IT, so all kind of modules
(with or without submodule) are covered
Added:
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/submodule/
(with props)
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/submodule/pom.xml
Modified:
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/pom.xml
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/verify.groovy
Modified:
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/pom.xml?rev=1460407&r1=1460406&r2=1460407&view=diff
==============================================================================
---
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/pom.xml
(original)
+++
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/pom.xml
Sun Mar 24 15:43:55 2013
@@ -9,4 +9,8 @@
<artifactId>module</artifactId>
<packaging>pom</packaging>
+ <modules>
+ <module>submodule</module>
+ </modules>
+
</project>
\ No newline at end of file
Propchange:
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/submodule/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sun Mar 24 15:43:55 2013
@@ -0,0 +1 @@
+MSHARED-\d+
Propchange:
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/submodule/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added:
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/submodule/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/submodule/pom.xml?rev=1460407&view=auto
==============================================================================
---
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/submodule/pom.xml
(added)
+++
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/module/submodule/pom.xml
Sun Mar 24 15:43:55 2013
@@ -0,0 +1,12 @@
+<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.shared.project.utils.it.multimodule-hierarchical</groupId>
+ <artifactId>module</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>submodule</artifactId>
+ <packaging>pom</packaging>
+
+</project>
\ No newline at end of file
Modified:
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/verify.groovy?rev=1460407&r1=1460406&r2=1460407&view=diff
==============================================================================
---
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/verify.groovy
(original)
+++
maven/shared/trunk/maven-project-utils/src/it/multimodule-hierarchical/verify.groovy
Sun Mar 24 15:43:55 2013
@@ -19,3 +19,4 @@
File buildLog = new File( basedir, 'build.log' )
assert buildLog.text.contains( '[INFO] Resolved distributionManagement site
URL for
org.apache.maven.shared.project.utils.it.multimodule-hierarchical:multimodule:pom:0.0.1-SNAPSHOT:
http://localhost/multimodule')
assert buildLog.text.contains( '[INFO] Resolved distributionManagement site
URL for
org.apache.maven.shared.project.utils.it.multimodule-hierarchical:module:pom:0.0.1-SNAPSHOT:
http://localhost/multimodule/module' )
+assert buildLog.text.contains( '[INFO] Resolved distributionManagement site
URL for
org.apache.maven.shared.project.utils.it.multimodule-hierarchical:submodule:pom:0.0.1-SNAPSHOT:
http://localhost/multimodule/module/submodule' )
