author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Sat, 30 Jul 2016 09:46:03 -0700 | |
changeset 6533 | de74a7d8f718 |
parent 6267 | c6b5d4730d84 |
permissions | -rw-r--r-- |
6267
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
|
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
--- org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
+++ org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
@@ -18,7 +18,6 @@ |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
import java.util.Hashtable; |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
import java.util.List; |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
|
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
-import org.eclipse.jdt.core.JavaCore; |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
import org.eclipse.jdt.core.compiler.CharOperation; |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
import org.eclipse.jdt.internal.compiler.CompilationResult; |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies; |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
@@ -189,7 +188,7 @@ |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
ProblemReporter problemReporter = |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
new ProblemReporter( |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
DefaultErrorHandlingPolicies.proceedWithAllProblems(), |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
- new CompilerOptions(JavaCore.getOptions()), |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+ new CompilerOptions(), |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
new DefaultProblemFactory()); |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
Parser parser = new Parser(problemReporter, false); |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
|
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
--- build.xml |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
+++ build.xml |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
@@ -22,8 +22,8 @@ |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
|
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
<javac srcdir="${basedir}" destdir="${output}" |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
debuglevel="lines,source" |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
- source="1.6" |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
- target="1.6"> |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
+ source="1.8" |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
+ target="1.8"> |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
<compilerarg line="-Xlint:none"/> |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
</javac> |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |