- Dependency on jsp-api is not "provided"

Kin Man Chung · Kin Man Chung · commit 227852e4fa24 · 2011-11-28T21:11:49.000Z
- Allow JDK 7

svn path=/trunk/; revision=1409
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -297,7 +297,6 @@
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>javax.servlet.jsp-api</artifactId>
             <version>2.2.1</version>
-            <scope>provided</scope>
         </dependency>
 
 <!--
diff --git a/impl/src/main/java/org/apache/jasper/JspC.java b/impl/src/main/java/org/apache/jasper/JspC.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -147,8 +147,12 @@ public class JspC implements Options {
     private static final String JAVA_1_4 = "1.4";
     private static final String JAVA_1_5 = "1.5";
     private static final String JAVA_1_6 = "1.6";
+    private static final String JAVA_1_7 = "1.7";
+    private static final String JAVA_1_8 = "1.8";
     private static final String JAVA_5 = "5";
     private static final String JAVA_6 = "6";
+    private static final String JAVA_7 = "7";
+    private static final String JAVA_8 = "8";
     // END SJSAS 6402545
 
     // Logger
@@ -671,20 +675,25 @@ public String getCompilerTargetVM() {
 
     public void setCompilerTargetVM(String vm) {
         // START SJSAS 6402545
+        String tvm = vm;
+        if (JAVA_5.equals(vm)) {
+            vm = JAVA_1_5;
+        } else if (JAVA_6.equals(vm)) {
+            vm = JAVA_1_6;
+        } else if (JAVA_7.equals(vm)) {
+            vm = JAVA_1_7;
+        } else if (JAVA_8.equals(vm)) {
+            vm = JAVA_1_8;
+        }
         if (!JAVA_1_1.equals(vm) && !JAVA_1_2.equals(vm) 
                 && !JAVA_1_3.equals(vm) && !JAVA_1_4.equals(vm)
                 && !JAVA_1_5.equals(vm) && !JAVA_1_6.equals(vm)
-                && !JAVA_5.equals(vm) && !JAVA_6.equals(vm)) {
+                && !JAVA_1_7.equals(vm) && !JAVA_1_8.equals(vm)){
             throw new IllegalArgumentException(
-                Localizer.getMessage("jspc.illegalCompilerTargetVM", vm));
+                Localizer.getMessage("jspc.illegalCompilerTargetVM", tvm));
         }
         // END SJSAS 6402545
         // START SJSAS 6403017
-        if (JAVA_5.equals(vm)) {
-            vm = JAVA_1_5;
-        } else if (JAVA_6.equals(vm)) {
-            vm = JAVA_1_6;
-        }
         Double targetVersion = Double.valueOf(vm);
         if (targetVersion.compareTo(Double.valueOf(myJavaVersion)) > 0) {
             throw new IllegalArgumentException(
@@ -708,7 +717,9 @@ public void setCompilerSourceVM(String vm) {
         // START SJSAS 6402545
         if (!JAVA_1_3.equals(vm) && !JAVA_1_4.equals(vm) 
                 && !JAVA_1_5.equals(vm) && !JAVA_5.equals(vm)
-                && !JAVA_1_6.equals(vm) && !JAVA_6.equals(vm)) {
+                && !JAVA_1_6.equals(vm) && !JAVA_6.equals(vm)
+                && !JAVA_1_7.equals(vm) && !JAVA_7.equals(vm)
+                && !JAVA_1_8.equals(vm) && !JAVA_8.equals(vm)) {
             throw new IllegalArgumentException(
                 Localizer.getMessage("jspc.illegalCompilerSourceVM", vm));
         }
