Merge pull request #647 from markt-asf/issue-624

Fix Issue 624
jakartaee · Mar 10, 2021 · 262bea0 · 262bea0
2 parents 98fa8e8 + c764473
commit 262bea0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/com/sun/ts/tests/jsp/common/xml/common.xml b/src/com/sun/ts/tests/jsp/common/xml/common.xml
@@ -1,6 +1,7 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2021 Oracle and/or its affiliates and others.
+    All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -37,7 +38,6 @@
     <target name="compile" description="JSP specific compile target.">
         <ts.javac includes="${pkg.dir}/**/*.java,
                   ${tests.pkg.dir}/common/webclient/**/*.java,
-                  ${jspcommon.dir}/**/*.java,
-        ${jsp.commondir}/**/*.java"/>
+                  ${jspcommon.dir}/**/*.java"/>
     </target>
 </project>
diff --git a/src/com/sun/ts/tests/jsp/spec/el/jsp/build.xml b/src/com/sun/ts/tests/jsp/spec/el/jsp/build.xml
@@ -1,6 +1,7 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2021 Oracle and/or its affiliates and others.
+    All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,4 +34,9 @@
         </tscontent.war>
     </target>
 
+    <target name="compile">
+        <ts.javac includes="${pkg.dir}/**/*.java,
+                           ${elcommon.dir}/**/*.java"/>
+    </target>
+
 </project>