Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Enhancement] Display "Latest" Versions in Reports Summary #478

Merged
merged 3 commits into from Dec 1, 2021
Merged

[Enhancement] Display "Latest" Versions in Reports Summary #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e77b3b
Display "Latest" Versions in Reports Summary
sultan Aug 10, 2021
ca47ed0
Display "Latest" Versions in Reports Summary
sultan Aug 10, 2021
ba19c39
Display "Latest" Versions in Reports Summary
sultan Aug 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/it/it-dependency-updates-report-001/verify.bsh
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ try
.replaceAll( "&[^;]+;", " " )
.replaceAll( "\\s+", " " );

if ( result.indexOf( "localhost dummy-api 1.1 compile jar 1.1.0-2 1.1.1 1.2 2.0" ) < 0 )
if ( result.indexOf( "localhost dummy-api 1.1 compile jar 1.1.0-2 1.1.3 1.3 3.0" ) < 0 )
{
System.out.println( "Did not generate summary correctly" );
System.out.println( "Result = \"" + result +"\"" );
Expand Down
2 changes: 1 addition & 1 deletion src/it/it-dependency-updates-report-003/verify.bsh
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ try
.replaceAll( "&[^;]+;", " " )
.replaceAll( "\\s+", " " );

if ( result.indexOf( "localhost dummy-api 1.1 compile jar 1.1.0-2 1.1.1 1.2 2.0" ) < 0 )
if ( result.indexOf( "localhost dummy-api 1.1 compile jar 1.1.0-2 1.1.3 1.3 3.0" ) < 0 )
{
System.out.println( "Did not pick up updated in dependencies section" );
System.out.println( "Result = \"" + result +"\"" );
Expand Down
4 changes: 2 additions & 2 deletions src/it/it-dependency-updates-report-004/verify.bsh
View file
Open in desktop
Expand Up @@ -11,13 +11,13 @@ try
.replaceAll( "&[^;]+;", " " )
.replaceAll( "\\s+", " " );

if ( !result.contains( "localhost dummy-api 1.1 jar 1.1.0-2 1.1.1 1.2 2.0" ) )
if ( !result.contains( "localhost dummy-api 1.1 jar 1.1.0-2 1.1.3 1.3 3.0" ) )
{
System.out.println( "Did not pick up updated in Dependency Management section" );
System.out.println( "Result = \"" + result +"\"" );
return false;
}
if ( !result.contains( "localhost dummy-impl 1.1 jar 1.2 2.0" ) )
if ( !result.contains( "localhost dummy-impl 1.1 jar 1.4 2.2" ) )
{
System.out.println( "Did not pick up updated in Dependency Management section" );
System.out.println( "Result = \"" + result +"\"" );
Expand Down
4 changes: 2 additions & 2 deletions src/it/it-plugin-updates-report-001/verify.bsh
View file
Open in desktop
Expand Up @@ -19,13 +19,13 @@ try
.replaceAll( "&[^;]+;", " " )
.replaceAll( "\\s+", " " );

if ( result.indexOf( "localhost dummy-maven-plugin 1.0 2.0" ) < 0 )
if ( result.indexOf( "localhost dummy-maven-plugin 1.0 3.1" ) < 0 )
{
System.out.println( "Did not generate dependency summary correctly" );
System.out.println( "Result = \"" + result +"\"" );
return false;
}
if ( result.indexOf( "dummy-api 1.1 jar 1.1.0-2 1.1.1 1.2 2.0" ) < 0 )
if ( result.indexOf( "dummy-api 1.1 jar 1.1.0-2 1.1.3 1.3 3.0" ) < 0 )
{
System.out.println( "Did not generate dependency summary correctly" );
System.out.println( "Result = \"" + result +"\"" );
Expand Down
2 changes: 1 addition & 1 deletion src/it/it-plugin-updates-report-002/verify.bsh
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ try
.replaceAll( "&[^;]+;", " " )
.replaceAll( "\\s+", " " );

if ( result.indexOf( "localhost dummy-maven-plugin 1.0 2.0" ) < 0 )
if ( result.indexOf( "localhost dummy-maven-plugin 1.0 3.1" ) < 0 )
{
System.out.println( "Did not generate summary correctly" );
System.out.println( "Result = \"" + result +"\"" );
Expand Down
2 changes: 1 addition & 1 deletion src/it/it-plugin-updates-report-003/verify.bsh
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ try
.replaceAll( "&[^;]+;", " " )
.replaceAll( "\\s+", " " );

if ( result.indexOf( "localhost dummy-maven-plugin 1.0 2.0" ) < 0 )
if ( result.indexOf( "localhost dummy-maven-plugin 1.0 3.1" ) < 0 )
{
System.out.println( "Did not generate summary correctly" );
System.out.println( "Result = \"" + result +"\"" );
Expand Down
6 changes: 3 additions & 3 deletions src/it/it-property-updates-report-001/verify.bsh
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ try
}
if ( result.indexOf( "# of properties where the next version available is smaller than an incremental version update 0" ) < 0 )
{
System.out.println( "Did not generate with subincrermental totals correctly" );
System.out.println( "Did not generate with subincremental totals correctly" );
System.out.println( "Result = \"" + result +"\"" );
return false;
}
Expand All @@ -50,13 +50,13 @@ try
System.out.println( "Result = \"" + result +"\"" );
return false;
}
if ( result.indexOf( "${impl-version} 2.0 2.1" ) < 0 )
if ( result.indexOf( "${impl-version} 2.0 2.2" ) < 0 )
{
System.out.println( "Did not generate summary for ${impl-version} correctly" );
System.out.println( "Result = \"" + result +"\"" );
return false;
}
if ( result.indexOf( "${api-version} 1.0 1.0.1 1.1 2.0" ) < 0 )
if ( result.indexOf( "${api-version} 1.0 1.0.1 1.3 3.0" ) < 0 )
{
System.out.println( "Did not generate summary for ${api-version} correctly" );
System.out.println( "Result = \"" + result +"\"" );
Expand Down
58 changes: 34 additions & 24 deletions src/main/java/org/codehaus/mojo/versions/AbstractVersionsReportRenderer.java
View file
Open in desktop
Expand Up @@ -165,37 +165,37 @@ protected void renderDependencySummaryTableRow( Dependency dependency, ArtifactV
}

sink.tableCell();
if ( details.getOldestUpdate( UpdateScope.SUBINCREMENTAL ) != null )
if ( details.getNewestUpdate( UpdateScope.SUBINCREMENTAL ) != null )
{
safeBold();
sink.text( details.getOldestUpdate( UpdateScope.SUBINCREMENTAL ).toString() );
sink.text( details.getNewestUpdate( UpdateScope.SUBINCREMENTAL ).toString() );
safeBold_();
}
sink.tableCell_();

sink.tableCell();
if ( details.getOldestUpdate( UpdateScope.INCREMENTAL ) != null )
if ( details.getNewestUpdate( UpdateScope.INCREMENTAL ) != null )
{
safeBold();
sink.text( details.getOldestUpdate( UpdateScope.INCREMENTAL ).toString() );
sink.text( details.getNewestUpdate( UpdateScope.INCREMENTAL ).toString() );
safeBold_();
}
sink.tableCell_();

sink.tableCell();
if ( details.getOldestUpdate( UpdateScope.MINOR ) != null )
if ( details.getNewestUpdate( UpdateScope.MINOR ) != null )
{
safeBold();
sink.text( details.getOldestUpdate( UpdateScope.MINOR ).toString() );
sink.text( details.getNewestUpdate( UpdateScope.MINOR ).toString() );
safeBold_();
}
sink.tableCell_();

sink.tableCell();
if ( details.getOldestUpdate( UpdateScope.MAJOR ) != null )
if ( details.getNewestUpdate( UpdateScope.MAJOR ) != null )
{
safeBold();
sink.text( details.getOldestUpdate( UpdateScope.MAJOR ).toString() );
sink.text( details.getNewestUpdate( UpdateScope.MAJOR ).toString() );
safeBold_();
}
sink.tableCell_();
Expand Down Expand Up @@ -291,16 +291,16 @@ protected void renderDependencySummaryTableHeader( boolean includeScope, boolean
sink.tableHeaderCell_();
}
sink.tableHeaderCell();
sink.text( getText( "report.nextVersion" ) );
sink.text( getText( "report.latestSubIncremental" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.nextIncremental" ) );
sink.text( getText( "report.latestIncremental" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.nextMinor" ) );
sink.text( getText( "report.latestMinor" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.nextMajor" ) );
sink.text( getText( "report.latestMajor" ) );
sink.tableHeaderCell_();
sink.tableRow_();
}
Expand Down Expand Up @@ -428,6 +428,7 @@ else if ( details.getOldestUpdate( UpdateScope.MAJOR ) != null )
sink.lineBreak();
}
boolean bold = equals( versions[i], details.getOldestUpdate( UpdateScope.SUBINCREMENTAL ) )
|| equals( versions[i], details.getNewestUpdate( UpdateScope.SUBINCREMENTAL ) )
|| equals( versions[i], details.getOldestUpdate( UpdateScope.INCREMENTAL ) )
|| equals( versions[i], details.getNewestUpdate( UpdateScope.INCREMENTAL ) )
|| equals( versions[i], details.getOldestUpdate( UpdateScope.MINOR ) )
Expand All @@ -448,6 +449,10 @@ else if ( details.getOldestUpdate( UpdateScope.MAJOR ) != null )
{
sink.text( getText( "report.nextVersion" ) );
}
else if ( equals( versions[i], details.getNewestUpdate( UpdateScope.SUBINCREMENTAL ) ) )
{
sink.text( getText( "report.latestSubIncremental" ) );
}
else if ( equals( versions[i], details.getOldestUpdate( UpdateScope.INCREMENTAL ) ) )
{
sink.text( getText( "report.nextIncremental" ) );
Expand Down Expand Up @@ -535,37 +540,37 @@ protected void renderPropertySummaryTableRow( Property property, PropertyVersion
sink.tableCell_();

sink.tableCell();
if ( versions.getOldestUpdate( UpdateScope.SUBINCREMENTAL ) != null )
if ( versions.getNewestUpdate( UpdateScope.SUBINCREMENTAL ) != null )
{
safeBold();
sink.text( versions.getOldestUpdate( UpdateScope.SUBINCREMENTAL ).toString() );
sink.text( versions.getNewestUpdate( UpdateScope.SUBINCREMENTAL ).toString() );
safeBold_();
}
sink.tableCell_();

sink.tableCell();
if ( versions.getOldestUpdate( UpdateScope.INCREMENTAL ) != null )
if ( versions.getNewestUpdate( UpdateScope.INCREMENTAL ) != null )
{
safeBold();
sink.text( versions.getOldestUpdate( UpdateScope.INCREMENTAL ).toString() );
sink.text( versions.getNewestUpdate( UpdateScope.INCREMENTAL ).toString() );
safeBold_();
}
sink.tableCell_();

sink.tableCell();
if ( versions.getOldestUpdate( UpdateScope.MINOR ) != null )
if ( versions.getNewestUpdate( UpdateScope.MINOR ) != null )
{
safeBold();
sink.text( versions.getOldestUpdate( UpdateScope.MINOR ).toString() );
sink.text( versions.getNewestUpdate( UpdateScope.MINOR ).toString() );
safeBold_();
}
sink.tableCell_();

sink.tableCell();
if ( versions.getOldestUpdate( UpdateScope.MAJOR ) != null )
if ( versions.getNewestUpdate( UpdateScope.MAJOR ) != null )
{
safeBold();
sink.text( versions.getOldestUpdate( UpdateScope.MAJOR ).toString() );
sink.text( versions.getNewestUpdate( UpdateScope.MAJOR ).toString() );
safeBold_();
}
sink.tableCell_();
Expand All @@ -586,16 +591,16 @@ protected void renderPropertySummaryTableHeader()
sink.text( getText( "report.currentVersion" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.nextVersion" ) );
sink.text( getText( "report.latestSubIncremental" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.nextIncremental" ) );
sink.text( getText( "report.latestIncremental" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.nextMinor" ) );
sink.text( getText( "report.latestMinor" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.nextMajor" ) );
sink.text( getText( "report.latestMajor" ) );
sink.tableHeaderCell_();
sink.tableRow_();
}
Expand Down Expand Up @@ -697,6 +702,7 @@ else if ( versions.getOldestUpdate( UpdateScope.MAJOR ) != null )
}
boolean allowed = ( rangeVersions.contains( artifactVersions[i].toString() ) );
boolean bold = equals( artifactVersions[i], versions.getOldestUpdate( UpdateScope.SUBINCREMENTAL ) )
|| equals( artifactVersions[i], versions.getNewestUpdate( UpdateScope.SUBINCREMENTAL ) )
|| equals( artifactVersions[i], versions.getOldestUpdate( UpdateScope.INCREMENTAL ) )
|| equals( artifactVersions[i], versions.getNewestUpdate( UpdateScope.INCREMENTAL ) )
|| equals( artifactVersions[i], versions.getOldestUpdate( UpdateScope.MINOR ) )
Expand Down Expand Up @@ -725,6 +731,10 @@ else if ( versions.getOldestUpdate( UpdateScope.MAJOR ) != null )
{
sink.text( getText( "report.nextVersion" ) );
}
else if ( equals( artifactVersions[i], versions.getNewestUpdate( UpdateScope.SUBINCREMENTAL ) ) )
{
sink.text( getText( "report.latestSubIncremental" ) );
}
else if ( equals( artifactVersions[i], versions.getOldestUpdate( UpdateScope.INCREMENTAL ) ) )
{
sink.text( getText( "report.nextIncremental" ) );
Expand Down
31 changes: 18 additions & 13 deletions src/main/java/org/codehaus/mojo/versions/PluginUpdatesRenderer.java
View file
Open in desktop
Expand Up @@ -20,7 +20,6 @@
*/

import java.text.MessageFormat;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;
Expand Down Expand Up @@ -244,16 +243,16 @@ private void renderSummaryTableHeader()
sink.text( getText( "report.currentVersion" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.nextVersion" ) );
sink.text( getText( "report.latestSubIncremental" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.nextIncremental" ) );
sink.text( getText( "report.latestIncremental" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.nextMinor" ) );
sink.text( getText( "report.latestMinor" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.nextMajor" ) );
sink.text( getText( "report.latestMajor" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( getText( "report.dependencyStatus" ) );
Expand Down Expand Up @@ -293,37 +292,37 @@ private void renderPluginSummary( Plugin plugin, PluginUpdatesDetails details )
sink.tableCell_();

sink.tableCell();
if ( details.getArtifactVersions().getOldestUpdate( UpdateScope.SUBINCREMENTAL ) != null )
if ( details.getArtifactVersions().getNewestUpdate( UpdateScope.SUBINCREMENTAL ) != null )
{
safeBold();
sink.text( details.getArtifactVersions().getOldestUpdate( UpdateScope.SUBINCREMENTAL ).toString() );
sink.text( details.getArtifactVersions().getNewestUpdate( UpdateScope.SUBINCREMENTAL ).toString() );
safeBold_();
}
sink.tableCell_();

sink.tableCell();
if ( details.getArtifactVersions().getOldestUpdate( UpdateScope.INCREMENTAL ) != null )
if ( details.getArtifactVersions().getNewestUpdate( UpdateScope.INCREMENTAL ) != null )
{
safeBold();
sink.text( details.getArtifactVersions().getOldestUpdate( UpdateScope.INCREMENTAL ).toString() );
sink.text( details.getArtifactVersions().getNewestUpdate( UpdateScope.INCREMENTAL ).toString() );
safeBold_();
}
sink.tableCell_();

sink.tableCell();
if ( details.getArtifactVersions().getOldestUpdate( UpdateScope.MINOR ) != null )
if ( details.getArtifactVersions().getNewestUpdate( UpdateScope.MINOR ) != null )
{
safeBold();
sink.text( details.getArtifactVersions().getOldestUpdate( UpdateScope.MINOR ).toString() );
sink.text( details.getArtifactVersions().getNewestUpdate( UpdateScope.MINOR ).toString() );
safeBold_();
}
sink.tableCell_();

sink.tableCell();
if ( details.getArtifactVersions().getOldestUpdate( UpdateScope.MAJOR ) != null )
if ( details.getArtifactVersions().getNewestUpdate( UpdateScope.MAJOR ) != null )
{
safeBold();
sink.text( details.getArtifactVersions().getOldestUpdate( UpdateScope.MAJOR ).toString() );
sink.text( details.getArtifactVersions().getNewestUpdate( UpdateScope.MAJOR ).toString() );
safeBold_();
}
sink.tableCell_();
Expand Down Expand Up @@ -432,6 +431,7 @@ else if ( details.getArtifactVersions().getOldestUpdate( UpdateScope.MAJOR ) !=
}
boolean bold = equals( versions[i],
details.getArtifactVersions().getOldestUpdate( UpdateScope.SUBINCREMENTAL ) )
|| equals( versions[i], details.getArtifactVersions().getNewestUpdate( UpdateScope.SUBINCREMENTAL ) )
|| equals( versions[i], details.getArtifactVersions().getOldestUpdate( UpdateScope.INCREMENTAL ) )
|| equals( versions[i], details.getArtifactVersions().getNewestUpdate( UpdateScope.INCREMENTAL ) )
|| equals( versions[i], details.getArtifactVersions().getOldestUpdate( UpdateScope.MINOR ) )
Expand All @@ -453,6 +453,11 @@ else if ( details.getArtifactVersions().getOldestUpdate( UpdateScope.MAJOR ) !=
{
sink.text( getText( "report.nextVersion" ) );
}
else if ( equals( versions[i],
details.getArtifactVersions().getNewestUpdate( UpdateScope.SUBINCREMENTAL ) ) )
{
sink.text( getText( "report.latestSubIncremental" ) );
}
else if ( equals( versions[i],
details.getArtifactVersions().getOldestUpdate( UpdateScope.INCREMENTAL ) ) )
{
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/dependency-updates-report.properties
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@ report.classifier=Classifier
report.type=Type
report.newerVersion=Newer Version(s)
report.nextVersion=Next Version
report.latestSubIncremental=Latest Subincremental
report.nextIncremental=Next Incremental
report.latestIncremental=Latest Incremental
report.nextMinor=Next Minor
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/plugin-updates-report.properties
View file
Open in desktop
Expand Up @@ -44,6 +44,7 @@ report.classifier=Classifier
report.type=Type
report.newerVersion=Newer Version(s)
report.nextVersion=Next Version
report.latestSubIncremental=Latest Subincremental
report.nextIncremental=Next Incremental
report.latestIncremental=Latest Incremental
report.nextMinor=Next Minor
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/property-updates-report.properties
View file
Open in desktop
Expand Up @@ -39,6 +39,7 @@ report.property=Property
report.currentVersion=Current Version
report.newerVersion=Newer Version(s)
report.nextVersion=Next Version
report.latestSubIncremental=Latest Subincremental
report.nextIncremental=Next Incremental
report.latestIncremental=Latest Incremental
report.nextMinor=Next Minor
Expand Down