maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1641094 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src: it/mpir-229/ it/mpir-229/module1/ main/java/org/apache/maven/report/projectinfo/ test/java/org/apache/maven/report/projectinfo/
Date Sat, 22 Nov 2014 17:51:16 GMT
Author: hboutemy
Date: Sat Nov 22 17:51:16 2014
New Revision: 1641094

URL: http://svn.apache.org/r1641094
Log:
[MPIR-279] fixed MPIR-229 IT which was inadvertently broken

Modified:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/it/mpir-229/module1/pom.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/it/mpir-229/pom.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/it/mpir-229/module1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/mpir-229/module1/pom.xml?rev=1641094&r1=1641093&r2=1641094&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/it/mpir-229/module1/pom.xml
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/it/mpir-229/module1/pom.xml
Sat Nov 22 17:51:16 2014
@@ -33,4 +33,11 @@
 
   <url>${artifacts.url}/${project.artifactId}-${project.version}</url>
 
+  <distributionManagement>
+    <site>
+      <id>site</id>
+      <url>scp://my.server/${project.artifactId}-${project.version}</url>
+    </site>
+  </distributionManagement>
+
 </project>

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/it/mpir-229/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/mpir-229/pom.xml?rev=1641094&r1=1641093&r2=1641094&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/it/mpir-229/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/it/mpir-229/pom.xml Sat Nov
22 17:51:16 2014
@@ -36,6 +36,13 @@
 
   <url>${artifacts.url}</url>
 
+  <distributionManagement>
+    <site>
+      <id>site</id>
+      <url>scp://my.server/</url>
+    </site>
+  </distributionManagement>
+
   <build>
     <plugins>
       <plugin>

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java?rev=1641094&r1=1641093&r2=1641094&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
Sat Nov 22 17:51:16 2014
@@ -148,12 +148,12 @@ public class ModulesReport
                     setDistMgmntSiteUrl( moduleModel, module.toString() );
                 }
 
-                final String moduleName = name( moduleModel );
+                final String moduleName =
+                    ( moduleModel.getName() == null ) ? moduleModel.getArtifactId() : moduleModel.getName();
                 final String moduleHref = getRelativeLink( baseUrl, getDistMgmntSiteUrl(
moduleModel ),
                                             moduleModel.getArtifactId() );
 
                 tableRow( new String[] { linkedName( moduleName, moduleHref ), moduleModel.getDescription()
} );
-
             }
 
             endTable();
@@ -225,19 +225,6 @@ public class ModulesReport
             }
         }
 
-        private static String name( final Model model )
-        {
-            String name = model.getName();
-
-            if ( name == null )
-            {
-                name = "Unnamed &#x2013; " + model.getGroupId() + ":" + model.getArtifactId()
+ ":"
-                        + model.getPackaging() + ":" + model.getVersion();
-            }
-
-            return name;
-        }
-
         // adapted from DefaultSiteTool#appendMenuItem
         private String getRelativeLink( String baseUrl, String href, String defaultHref )
         {

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java?rev=1641094&r1=1641093&r2=1641094&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
Sat Nov 22 17:51:16 2014
@@ -200,6 +200,7 @@ public abstract class AbstractProjectInf
         MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE
);
         ProfileManager profileManager = new DefaultProfileManager( getContainer(), null,
null );
 
+        assertNotNull( "Local repository", mojo.localRepository );
         testMavenProject = builder.buildWithDependencies( pluginXmlFile, mojo.localRepository,
profileManager );
 
         File outputDir = mojo.getReportOutputDirectory();



Mime
View raw message