Merge pull request #23325 from gerdogdu/master
Issues Regarding #23315 and #23320
diff --git a/appserver/admin/template/src/main/resources/config/default-web.xml b/appserver/admin/template/src/main/resources/config/default-web.xml
index 6f98c7c..2af5d47 100644
--- a/appserver/admin/template/src/main/resources/config/default-web.xml
+++ b/appserver/admin/template/src/main/resources/config/default-web.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2020 Oracle and/or its affiliates. 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
@@ -300,7 +300,7 @@
jakarta.servlet.jsp.jstl.jar
jakarta.jms-api.jar
jakarta.faces.jar
- jakarta.servlet.jsp.jar
+ wasp.jar
jspcaching-connector.jar
web-glue.jar
hibernate-validator.jar
diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
index 52de670..d65d0de 100644
--- a/appserver/extras/embedded/all/pom.xml
+++ b/appserver/extras/embedded/all/pom.xml
@@ -1311,8 +1311,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>jakarta.servlet.jsp</artifactId>
+ <groupId>org.glassfish.wasp</groupId>
+ <artifactId>wasp</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
index 8f0623a..179a8f0 100755
--- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
+++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
@@ -1140,8 +1140,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>jakarta.servlet.jsp</artifactId>
+ <groupId>org.glassfish.wasp</groupId>
+ <artifactId>wasp</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
index 0e5a5c2..8ec3b35 100644
--- a/appserver/extras/embedded/web/pom.xml
+++ b/appserver/extras/embedded/web/pom.xml
@@ -1050,8 +1050,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>jakarta.servlet.jsp</artifactId>
+ <groupId>org.glassfish.wasp</groupId>
+ <artifactId>wasp</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml
index 72c206e..fc92a84 100644
--- a/appserver/featuresets/web/pom.xml
+++ b/appserver/featuresets/web/pom.xml
@@ -1017,8 +1017,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>jakarta.servlet.jsp</artifactId>
+ <groupId>org.glassfish.wasp</groupId>
+ <artifactId>wasp</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index e7cf442..cce68d3 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -146,7 +146,7 @@
<!-- Jakarta Server Pages -->
<jsp-api.version>3.0.0</jsp-api.version>
- <jsp-impl.version>3.0.0</jsp-impl.version>
+ <wasp.version>3.0.1</wasp.version>
<!-- Jakarta Standard Tag Library -->
<jstl-api.version>2.0.0</jstl-api.version>
@@ -408,9 +408,9 @@
<version>${jsp-api.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>jakarta.servlet.jsp</artifactId>
- <version>${jsp-impl.version}</version>
+ <groupId>org.glassfish.wasp</groupId>
+ <artifactId>wasp</artifactId>
+ <version>${wasp.version}</version>
</dependency>
<!-- Jakarta XML Web Services -->
@@ -653,7 +653,7 @@
<version>2.1</version>
<configuration>
<dir>${stage.dir}/${install.dir.name}/glassfish/modules</dir>
- <excludes>jakarta.inject-api.jar,jakarta.servlet.jsp.jstl.jar,jakarta.servlet.jsp.jar,jakarta.enterprise.concurrent.jar,
+ <excludes>jakarta.inject-api.jar,jakarta.servlet.jsp.jstl.jar,wasp.jar,jakarta.enterprise.concurrent.jar,
jakarta.persistence.jar</excludes>
<specs>
<spec>
diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java
index 7515d05..8c9f7af 100644
--- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java
+++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020 Oracle and/or its affiliates. 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
@@ -160,7 +160,7 @@
// TODO(Sahoo): Ideally we should have separate sniffer for JSP, but since WebSniffer is already
// handling JSPs, we must make sure that all JSP related modules get installed by WebSniffer as well.
private String[] containerModuleNames = {"org.glassfish.main.web.glue",
- "org.glassfish.web.jakarta.servlet.jsp"
+ "org.glassfish.wasp.wasp"
};
@Override
diff --git a/appserver/web/web-glue/pom.xml b/appserver/web/web-glue/pom.xml
index dc23f54..3a370db 100755
--- a/appserver/web/web-glue/pom.xml
+++ b/appserver/web/web-glue/pom.xml
@@ -136,21 +136,9 @@
<artifactId>deployment-javaee-core</artifactId>
<version>${project.version}</version>
</dependency>
- <!--
<dependency>
- since our minimum requirement is still JDK5,
- we need this dependency. When we we switch
- to minimum JDK6 (which we do at some point toward EE6),
- we can remove this.
- <groupId>org.glassfish.external</groupId>
- <artifactId>ant</artifactId>
- <version>${ant.version}</version>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>jakarta.servlet.jsp</artifactId>
+ <groupId>org.glassfish.wasp</groupId>
+ <artifactId>wasp</artifactId>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
diff --git a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc
index 4aeb0c0..374f78f 100644
--- a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc
+++ b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2020 Oracle and/or its affiliates. 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
@@ -17,7 +17,7 @@
AS_INSTALL=`dirname $0`/..
AS_INSTALL_LIB=$AS_INSTALL/modules
-JSP_IMPL=$AS_INSTALL_LIB/jakarta.servlet.jsp.jar
+JSP_IMPL=$AS_INSTALL_LIB/wasp.jar
EL_IMPL=$AS_INSTALL_LIB/jakarta.el.jar:$AS_INSTALL_LIB/jakarta.el-api.jar
JSTL_IMPL=$AS_INSTALL_LIB/jakarta.servlet.jsp.jstl.jar
AS_LIB=$AS_INSTALL/lib
diff --git a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat
index 1722c9f..e2f8e6a 100644
--- a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat
+++ b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat
@@ -18,7 +18,7 @@
set AS_INSTALL_LIB=%~dp0..\modules
-set JSP_IMPL=%AS_INSTALL_LIB%\jakarta.servlet.jsp.jar
+set JSP_IMPL=%AS_INSTALL_LIB%\wasp.jar
set EL_IMPL=%AS_INSTALL_LIB%\jakarta.el.jar;%AS_INSTALL_LIB%\jakarta.el-api.jar
set JSTL_IMPL=%AS_INSTALL_LIB%\jakarta.servlet.jsp.jstl.jar
set AS_LIB=%~dp0..\lib
