This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch JXR-154 in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
commit 42f0d11d35c50c458b00934a9e246c5389c7b4e0 Author: rfscholte <[email protected]> AuthorDate: Fri May 29 20:06:13 2020 +0200 [JXR-154] xref-test package summary lists also classes from main source directories --- maven-jxr-plugin/src/it/simple-project/verify.groovy | 12 +++++++++++- maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java | 2 -- .../java/org/apache/maven/jxr/pacman/PackageManager.java | 2 -- maven-jxr/src/test/java/org/apache/maven/jxr/JXR141Test.java | 6 +++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/maven-jxr-plugin/src/it/simple-project/verify.groovy b/maven-jxr-plugin/src/it/simple-project/verify.groovy index 4ad612d..0ef06fb 100644 --- a/maven-jxr-plugin/src/it/simple-project/verify.groovy +++ b/maven-jxr-plugin/src/it/simple-project/verify.groovy @@ -35,4 +35,14 @@ assert new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/AppTest content = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/App.html' ).text; assert content.contains( 'App2.html' ); -return true; \ No newline at end of file +xrefPackageSummary = new File( basedir, 'target/site/xref/org/apache/maven/jxr/it/package-summary.html' ).text +assert xrefPackageSummary.contains( 'App.html' ) +assert xrefPackageSummary.contains( 'App2.html' ) +assert !xrefPackageSummary.contains( 'AppTest.html' ) + +testXrefPackageSummary = new File( basedir, 'target/site/xref-test/org/apache/maven/jxr/it/package-summary.html' ).text +assert !testXrefPackageSummary.contains( 'App.html' ) +assert !testXrefPackageSummary.contains( 'App2.html' ) +assert testXrefPackageSummary.contains( 'AppTest.html' ) + +return true; diff --git a/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java b/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java index a719ff0..46b7ddd 100644 --- a/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java +++ b/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java @@ -32,7 +32,6 @@ import java.util.Locale; import javax.inject.Inject; import javax.inject.Named; -import javax.inject.Singleton; /** * Main entry point into Maven used to kick off the XReference code building. @@ -41,7 +40,6 @@ import javax.inject.Singleton; * @version $Id$ */ @Named -@Singleton public class JXR extends AbstractLogEnabled { @Inject diff --git a/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java b/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java index 3288dc2..18f638a 100644 --- a/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java +++ b/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java @@ -32,14 +32,12 @@ import java.util.Set; import javax.inject.Inject; import javax.inject.Named; -import javax.inject.Singleton; /** * Given a list of directories, parse them out and store them as rendered * packages, classes, imports, etc. */ @Named -@Singleton public class PackageManager extends AbstractLogEnabled { @Inject diff --git a/maven-jxr/src/test/java/org/apache/maven/jxr/JXR141Test.java b/maven-jxr/src/test/java/org/apache/maven/jxr/JXR141Test.java index 5937a50..e5afaa6 100644 --- a/maven-jxr/src/test/java/org/apache/maven/jxr/JXR141Test.java +++ b/maven-jxr/src/test/java/org/apache/maven/jxr/JXR141Test.java @@ -66,8 +66,8 @@ public class JXR141Test extends PlexusTestCase assertNotNull( "Line #27 not found - has source of Test141.java changed?", line27 ); assertEquals( "<a class=\"jxr_linenumber\" name=\"L27\" href=\"#L27\">27</a> " + "<strong class=\"jxr_keyword\">public</strong> <strong class=\"jxr_keyword\">static</strong> " + - "<strong class=\"jxr_keyword\">final</strong> <a name=\"Test141\" href=\"..//Test141.html#Test141\">" + - "Test141</a> instance = <strong class=\"jxr_keyword\">new</strong> " + - "<a name=\"Test141\" href=\"..//Test141.html#Test141\">Test141</a>();" , line27 ); + "<strong class=\"jxr_keyword\">final</strong> " + + "Test141 instance = <strong class=\"jxr_keyword\">new</strong> " + + "Test141();" , line27 ); } } \ No newline at end of file
