|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
From 073dfb83021ec59bca50ee09762c552c77b98bd9 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
From: Fabio Valentini <decathorpe@gmail.com>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
Date: Tue, 25 Aug 2020 11:32:48 +0200
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
Subject: [PATCH] enable support for JDTJavaCompiler and AntJavaCompiler
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
---
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
impl/pom.xml | 33 +++++++------------
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
.../jasper/compiler/JDTJavaCompiler.java | 4 +++
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
pom.xml | 1 +
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
3 files changed, 17 insertions(+), 21 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
diff --git a/impl/pom.xml b/impl/pom.xml
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
index 8cb08ca..7e6e2f3 100644
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
--- a/impl/pom.xml
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+++ b/impl/pom.xml
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
@@ -149,18 +149,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
<configuration>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
<source>1.7</source>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
<target>1.7</target>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- <compilerArgument>-Xlint:unchecked</compilerArgument>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
<excludes>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- <exclude>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- org/apache/jasper/compiler/JDTJavaCompiler.java
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- </exclude>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- <exclude>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- org/apache/jasper/compiler/AntJavaCompiler.java
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- </exclude>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- <exclude>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
-
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- org/apache/jasper/util/SystemLogHandler.java
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- </exclude>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
<exclude>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
org/apache/jasper/runtime/PerThreadTagHandlerPool.java
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
@@ -270,15 +259,17 @@
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
<artifactId>jakarta.servlet.jsp-api</artifactId>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
<version>2.3.6</version>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
</dependency>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
-
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
-
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- Needed only if we include JDTJavaCompiler.java
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- <dependency>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- <groupId>eclipse</groupId>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- <artifactId>jdtcore</artifactId>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- <version>3.1.0</version>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- <scope>compile</scope>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
- </dependency>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
--->
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ <dependency>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ <groupId>org.eclipse.jdt</groupId>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ <artifactId>core</artifactId>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ <version>3.1.0</version>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ <scope>provided</scope>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ </dependency>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ <dependency>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ <groupId>org.apache.ant</groupId>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ <artifactId>ant</artifactId>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ <version>1.10.8</version>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ <scope>provided</scope>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ </dependency>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
</dependencies>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
</project>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
diff --git a/impl/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java b/impl/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
index d6d8b9e..0fa3d99 100644
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
--- a/impl/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+++ b/impl/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
@@ -224,6 +224,10 @@ public class JDTJavaCompiler implements JavaCompiler {
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
return className.toCharArray();
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
}
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ public boolean ignoreOptionalProblems() {
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ return false;
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
public char[] getContents() {
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
char[] result = null;
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
Reader reader = null;
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
diff --git a/pom.xml b/pom.xml
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
index 23203cc..9e4462f 100644
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
--- a/pom.xml
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+++ b/pom.xml
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
@@ -53,6 +53,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
<modules>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
<module>api</module>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
+ <module>impl</module>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
<module>spec</module>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
</modules>
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
--
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
2.26.2
|
|
![](https://seccdn.libravatar.org/avatar/67f4ac6a6b20752d6c2ff1f21b29d10c6fcdd05a35ffccdca789fe670dfc3efb?s=16&d=retro) |
bfe61b8 |
|