From 230af9038632760a3b7fc4af0035966e155990fc Mon Sep 17 00:00:00 2001
From: Amish Shah <shahamish150294@gmail.com>
Date: Thu, 29 Aug 2019 08:00:07 -0500
Subject: [PATCH 1/2] [core] Resolve pmd-report failure when java folder in
 filepath  - refs 1465

---
 pmd-core/etc/xslt/pmd-report.xslt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-core/etc/xslt/pmd-report.xslt b/pmd-core/etc/xslt/pmd-report.xslt
index 8a37c85d3b..b6359646dc 100644
--- a/pmd-core/etc/xslt/pmd-report.xslt
+++ b/pmd-core/etc/xslt/pmd-report.xslt
@@ -50,7 +50,7 @@
     <xsl:for-each select="file">
         <xsl:sort data-type="number" order="descending" select="count(violation)"/>
         <xsl:variable name="filename" select="@name"/>
-        <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3>
+        <H3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></H3>
         <table border="0" width="100%" class="details">
             <tr>
                 <th>Begin Line</th>

From e93ec2bcc26fb1e6af2b42934d5b0886d2189d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?=
 <juansotuyo@gmail.com>
Date: Mon, 2 Sep 2019 14:44:35 -0300
Subject: [PATCH 2/2] Update changelog, refs #1994

---
 docs/pages/release_notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 8f48750d25..41990eb4d4 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -39,6 +39,7 @@ about the usage and features of the rule designer.
 ### Fixed Issues
 
 *   all
+    *   [#1465](https://github.com/pmd/pmd/issues/1465): \[core] Stylesheet pmd-report.xslt fails to display filepath if 'java' in path
     *   [#1983](https://github.com/pmd/pmd/pull/1983): \[core] Avoid crashes with analysis cache when classpath references non-existing directories
 *   java-bestpractices
     *   [#1862](https://github.com/pmd/pmd/issues/1862): \[java] New rule for MessageDigest.getInstance
@@ -63,6 +64,7 @@ about the usage and features of the rule designer.
 
 *   [#1970](https://github.com/pmd/pmd/pull/1970): \[java] DoubleBraceInitialization: Fix example - [Tobias Weimer](https://github.com/tweimer)
 *   [#1971](https://github.com/pmd/pmd/pull/1971): \[java] 1862 - Message Digest should not be used as class field - [AnthonyKot](https://github.com/AnthonyKot)
+*   [#1994](https://github.com/pmd/pmd/pull/1994): \[core] Resolve pmd-report failure when java folder in filepath - [Amish Shah](https://github.com/shahamish150294)
 
 {% endtocmaker %}