You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/11/23 22:01:44 UTC
[maven-project-info-reports-plugin] 03/03: More fixes
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch holy-moly
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
commit b8a487df41c0e5a1c4960562bbb2a9096c27d790
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Nov 23 23:01:32 2022 +0100
More fixes
---
src/it/dependencies-java-1.7-and-1.8/verify.groovy | 28 +++++++++++-----------
src/it/full-pom/pom.xml | 2 +-
src/it/minimal-pom/pom.xml | 2 +-
src/it/multi-module/pom.xml | 5 +---
src/it/multi-module/verify.groovy | 4 ++--
.../report/projectinfo/DependenciesReport.java | 4 ++--
.../projectinfo/DependencyConvergenceReport.java | 9 +++++++
.../renderer/DependenciesRenderer.java | 7 +++++-
8 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/src/it/dependencies-java-1.7-and-1.8/verify.groovy b/src/it/dependencies-java-1.7-and-1.8/verify.groovy
index 2edcd4e..2a344fe 100644
--- a/src/it/dependencies-java-1.7-and-1.8/verify.groovy
+++ b/src/it/dependencies-java-1.7-and-1.8/verify.groovy
@@ -19,24 +19,24 @@
File dependencies = new File( basedir, 'target/site/dependencies.html' )
def mavenModel = '''\
<tr class="a">
-<td align="left">maven-model-3.3.9.jar</td>
-<td align="right">164 kB</td>
-<td align="right">71</td>
-<td align="right">54</td>
-<td align="right">3</td>
-<td align="center">1.7</td>
-<td align="center">Yes</td></tr>
+<td style="text-align: left;">maven-model-3.3.9.jar</td>
+<td style="text-align: right;">164 kB</td>
+<td style="text-align: right;">71</td>
+<td style="text-align: right;">54</td>
+<td style="text-align: right;">3</td>
+<td style="text-align: center;">1.7</td>
+<td style="text-align: center;">Yes</td></tr>
'''
def jacksonDataTypeJsr310 = '''\
<tr class="a">
-<td align="left">jackson-datatype-jsr310-2.6.4.jar</td>
-<td align="right">78.1 kB</td>
-<td align="right">69</td>
-<td align="right">51</td>
-<td align="right">5</td>
-<td align="center">1.8</td>
-<td align="center">Yes</td></tr>
+<td style="text-align: left;">jackson-datatype-jsr310-2.6.4.jar</td>
+<td style="text-align: right;">78.1 kB</td>
+<td style="text-align: right;">69</td>
+<td style="text-align: right;">51</td>
+<td style="text-align: right;">5</td>
+<td style="text-align: center;">1.8</td>
+<td style="text-align: center;">Yes</td></tr>
'''
assert dependencies.text.contains( mavenModel.replaceAll( "\n", System.getProperty( "line.separator" ) ) )
diff --git a/src/it/full-pom/pom.xml b/src/it/full-pom/pom.xml
index c6e92f3..ff4ef62 100644
--- a/src/it/full-pom/pom.xml
+++ b/src/it/full-pom/pom.xml
@@ -174,7 +174,7 @@
<artifactId>maven-site-plugin</artifactId>
<version>@sitePluginVersion@</version>
<configuration>
- <locales>en,cs,de,en,es,fr,gl,hu,it,ja,ko,lt,nl,no,pl,pt,pt_BR,ru,sk,sv,tr,zh_CN,zh_TW</locales>
+ <locales>default,en,cs,de,en,es,fr,gl,hu,it,ja,ko,lt,nl,no,pl,pt,pt_BR,ru,sk,sv,tr,zh_CN,zh_TW</locales>
</configuration>
</plugin>
</plugins>
diff --git a/src/it/minimal-pom/pom.xml b/src/it/minimal-pom/pom.xml
index a2c013b..0c92814 100644
--- a/src/it/minimal-pom/pom.xml
+++ b/src/it/minimal-pom/pom.xml
@@ -44,7 +44,7 @@
<artifactId>maven-site-plugin</artifactId>
<version>@sitePluginVersion@</version>
<configuration>
- <locales>en,cs,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh_CN,zh_TW</locales>
+ <locales>default,en,cs,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh_CN,zh_TW</locales>
</configuration>
</plugin>
</plugins>
diff --git a/src/it/multi-module/pom.xml b/src/it/multi-module/pom.xml
index 60cd695..cccb3d0 100644
--- a/src/it/multi-module/pom.xml
+++ b/src/it/multi-module/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>16</version>
+ <version>28</version>
</parent>
<groupId>org.apache.maven.plugins.project-info-reports.its</groupId>
@@ -79,9 +79,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>@sitePluginVersion@</version>
- <configuration>
- <locales>en</locales>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/src/it/multi-module/verify.groovy b/src/it/multi-module/verify.groovy
index 7fdfb6b..afc2cb4 100644
--- a/src/it/multi-module/verify.groovy
+++ b/src/it/multi-module/verify.groovy
@@ -21,5 +21,5 @@ File mainDependencies = new File( basedir, 'main/target/site/dependencies.html'
// Dependency File Details section should display dep-1.0-SNAPSHOT.jar packaged from previous build (package phase),
// not dep/target/classes from current build (site phase)
-assert !mainDependencies.text.contains( '<td align="left">dep/target/classes</td>' )
-assert mainDependencies.text.contains( '<td align="left">dep-1.0-SNAPSHOT.jar</td>' )
+assert !mainDependencies.text.contains( '<td style="text-align: left;">dep/target/classes</td>' )
+assert mainDependencies.text.contains( '<td style="text-align: left;">dep-1.0-SNAPSHOT.jar</td>' )
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
index 1f3b963..a11c202 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
@@ -135,9 +135,9 @@ public class DependenciesReport
}
catch ( IOException e )
{
- getLog().error( "Cannot copy ressources", e );
+ getLog().error( "Cannot copy resources", e );
}
-
+
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest( getSession().getProjectBuildingRequest() );
buildingRequest.setLocalRepository( localRepository );
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
index a04f8d6..cefe5cf 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
@@ -300,6 +300,7 @@ public class DependencyConvergenceReport
private void generateDependencyDetails( Locale locale, Sink sink, List<ReverseDependencyLink> depList )
{
sink.table();
+ sink.tableRows( null, false );
Map<String, List<ReverseDependencyLink>> artifactMap = getSortedUniqueArtifactMap( depList );
@@ -314,6 +315,7 @@ public class DependencyConvergenceReport
sink.tableCell();
sink.table();
+ sink.tableRows( null, false );
for ( String version : artifactMap.keySet() )
{
@@ -328,11 +330,14 @@ public class DependencyConvergenceReport
sink.tableRow_();
}
+ sink.tableRows_();
sink.table_();
+
sink.tableCell_();
sink.tableRow_();
+ sink.tableRows_();
sink.table_();
}
@@ -518,6 +523,7 @@ public class DependencyConvergenceReport
private void generateLegend( Locale locale, Sink sink )
{
sink.table();
+ sink.tableRows( null, false );
sink.tableCaption();
sink.bold();
sink.text( getI18nString( locale, "legend" ) );
@@ -535,6 +541,7 @@ public class DependencyConvergenceReport
sink.tableRow_();
+ sink.tableRows_();
sink.table_();
}
@@ -557,6 +564,7 @@ public class DependencyConvergenceReport
// Create report
sink.table();
+ sink.tableRows( null, false );
sink.tableCaption();
sink.bold();
sink.text( getI18nString( locale, "stats.caption" ) );
@@ -665,6 +673,7 @@ public class DependencyConvergenceReport
sink.tableCell_();
sink.tableRow_();
+ sink.tableRows_();
sink.table_();
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
index 43eb156..e14cb3f 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -857,7 +857,7 @@ public class DependenciesRenderer
String javascript = String.format( "<img id=\"%s\" src=\"%s\" alt=\"%s\""
+ " onclick=\"toggleDependencyDetails( '%s', '%s' );\""
- + " style=\"cursor: pointer; vertical-align: text-bottom;\"></img>",
+ + " style=\"cursor: pointer; vertical-align: text-bottom;\" />",
imgId, IMG_INFO_URL, getI18nString( "graph.icon.information" ), dependencyDetailId, imgId );
sink.rawText( javascript );
@@ -911,6 +911,7 @@ public class DependenciesRenderer
List<License> licenses = artifactProject.getLicenses();
sink.table();
+ sink.tableRows( null, false );
sink.tableRow();
sink.tableHeaderCell();
@@ -1007,10 +1008,12 @@ public class DependenciesRenderer
sink.tableCell_();
sink.tableRow_();
+ sink.tableRows_();
sink.table_();
}
catch ( ProjectBuildingException e )
{
+ sink.text( getI18nString( "index", "nodescription" ) );
if ( log.isDebugEnabled() )
{
log.debug( "Unable to create Maven project from repository for artifact '"
@@ -1026,6 +1029,7 @@ public class DependenciesRenderer
else
{
sink.table();
+ sink.tableRows( null, false );
sink.tableRow();
sink.tableHeaderCell();
@@ -1056,6 +1060,7 @@ public class DependenciesRenderer
sink.tableCell_();
sink.tableRow_();
+ sink.tableRows_();
sink.table_();
}