Author: hboutemy
Date: Tue May 8 19:21:48 2012
New Revision: 1335705
URL: http://svn.apache.org/viewvc?rev=1335705&view=rev
Log:
[MPIR-244] With Maven 3, "Dependency Repository Locations" in dependencies
report shows my local repository manager id and url instead of public
repository info: added a non-blocking IT
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/pom.xml
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/verify.bsh
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/settings.xml
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/pom.xml?rev=1335705&r1=1335704&r2=1335705&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/pom.xml
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/pom.xml
Tue May 8 19:21:48 2012
@@ -183,7 +183,6 @@
<version>@pom.version@</version>
<configuration>
<introduction>mail list intro text foo</introduction>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
<reportSets>
<reportSet>
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/verify.bsh?rev=1335705&r1=1335704&r2=1335705&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/verify.bsh
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/verify.bsh
Tue May 8 19:21:48 2012
@@ -95,6 +95,19 @@ try
System.err.println( "dependencies.html doesn't contain
doxia-core-1.2.jar" );
return false;
}
+ if ( !content.contains( "<td>central</td>" ) )
+ {
+ if ( content.contains( "<td>mirror-test</td><td><a
class=\"externalLink\"
href=\"http://mirrors.ibiblio.org/pub/mirrors/maven2/\";>http://mirrors.ibiblio.org/pub/mirrors/maven2/</a></td>"
) )
+ {
+ System.err.println( "[WARN] MPIR-244: 'Dependency Repository
Locations' in dependencies.html doesn't refer to central repository but
mirror-test which is its corresponding mirror." );
+ // MPIR-244: need more research to determine if its a bug or a
difference that should be documented
+ }
+ else
+ {
+ System.err.println( "[ERROR] 'Dependency Repository Locations' in
dependencies.html doesn't refer to central repository nor mirror-test." );
+ return false;
+ }
+ }
File dependencyMgmt = new File( siteDir, "dependency-management.html");
content = FileUtils.fileRead( dependencyMgmt, "UTF-8" );
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/settings.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/settings.xml?rev=1335705&r1=1335704&r2=1335705&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/it/settings.xml
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/it/settings.xml
Tue May 8 19:21:48 2012
@@ -19,7 +19,8 @@ specific language governing permissions
under the License.
-->
-<settings>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0
http://maven.apache.org/xsd/settings-1.1.0.xsd";>
<profiles>
<profile>
<id>it-repo</id>
@@ -52,4 +53,11 @@ under the License.
</pluginRepositories>
</profile>
</profiles>
+ <mirrors>
+ <mirror>
+ <id>mirror-test</id>
+ <mirrorOf>central</mirrorOf>
+ <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
+ </mirror>
+ </mirrors>
</settings>
