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:41 UTC
[maven-project-info-reports-plugin] branch holy-moly updated (68921ba -> b8a487d)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch holy-moly
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
omit 68921ba Prepare for Doxia 2.0.0
add 9af2ff8 Prepare for Doxia 2.0.0
new 9f436c1 Update
new 7590d3d Add todo
new b8a487d More fixes
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (68921ba)
\
N -- N -- N refs/heads/holy-moly (b8a487d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 8 +++----
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 ++--
.../projectinfo/AbstractProjectInfoReport.java | 1 +
.../report/projectinfo/DependenciesReport.java | 4 ++--
.../projectinfo/DependencyConvergenceReport.java | 1 +
.../renderer/DependenciesRenderer.java | 3 ++-
10 files changed, 29 insertions(+), 29 deletions(-)
[maven-project-info-reports-plugin] 02/03: Add todo
Posted by mi...@apache.org.
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 7590d3d64988189441c06c52504f2416d9b1d745
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Nov 23 21:29:01 2022 +0100
Add todo
---
.../org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
index 4d6f9c9..8fb5027 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
@@ -329,6 +329,7 @@ public abstract class AbstractProjectInfoReport
return getI18nString( locale, "description" );
}
+ // TODO Review, especially Locale.getDefault()
private static class CustomI18N
implements I18N
{
[maven-project-info-reports-plugin] 03/03: More fixes
Posted by mi...@apache.org.
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_();
}
[maven-project-info-reports-plugin] 01/03: Update
Posted by mi...@apache.org.
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 9f436c1cf63c06f99b5a88fc8886b9bca08b7ebd
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Oct 31 20:21:23 2022 +0100
Update
---
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index dd713a4..7751ca1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,12 +119,12 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <doxiaVersion>2.0.0-M3</doxiaVersion>
- <doxia-sitetoolsVersion>2.0.0-M3</doxia-sitetoolsVersion>
+ <doxiaVersion>2.0.0-M4</doxiaVersion>
+ <doxia-sitetoolsVersion>2.0.0-M4-SNAPSHOT</doxia-sitetoolsVersion>
<mavenVersion>3.2.5</mavenVersion>
<scmVersion>1.13.0</scmVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>
- <sitePluginVersion>4.0.0-M3</sitePluginVersion>
+ <sitePluginVersion>4.0.0-M4-SNAPSHOT</sitePluginVersion>
<fluidoSkinVersion>1.11.1</fluidoSkinVersion>
<surefire.version>2.22.2</surefire.version>
<checkstyle.violation.ignore>ParameterNumber,MethodLength</checkstyle.violation.ignore>
@@ -135,12 +135,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>4.0.0-M2</version>
+ <version>4.0.0-M3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>4.0.0-M2</version>
+ <version>4.0.0-M3-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
@@ -393,7 +393,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.4.2</version>
+ <version>3.5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>