Merge pull request #23312 from eclipse-ee4j/6.0.0-BRANCH
6.0.0 branch
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 f4ad607..3eb0ae3 100644
--- a/appserver/extras/embedded/all/pom.xml
+++ b/appserver/extras/embedded/all/pom.xml
@@ -454,13 +454,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.main.jaxr-ra</groupId>
- <artifactId>jaxr-ra-rar</artifactId>
- <version>${project.version}</version>
- <type>rar</type>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>org.glassfish.main.batch</groupId>
<artifactId>glassfish-batch-commands</artifactId>
<version>${project.version}</version>
@@ -1318,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 c5897eb..5c7a626 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 99d839e..eec4031 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 f7fa3ef..8bbf0e6 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 1bfe3ee..57d4d58 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/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java
index bcd72fb..d16387a 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java
@@ -117,7 +117,7 @@
initTransactionProperties();
setInstance(this);
- transactionManagerImpl = TransactionManagerImpl.getTransactionManagerImpl();
+ //transactionManagerImpl = TransactionManagerImpl.getTransactionManagerImpl();
}
public boolean useLAO() {
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 9b846bc..3fa6640 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/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen
index 1a2310f..7f2c915 100644
--- a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen
+++ b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021 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
@@ -30,4 +30,4 @@
JAVA=${AS_JAVA}/bin/java
fi
-exec "$JAVA" -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jaxb-osgi.jar" com.sun.tools.jxc.SchemaGeneratorFacade "$@"
+exec "$JAVA" -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.activation.jar" com.sun.tools.jxc.SchemaGeneratorFacade "$@"
diff --git a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat
index eb145a5..58ccdb4 100644
--- a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat
+++ b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat
@@ -1,7 +1,7 @@
@echo off
REM
-REM Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+REM Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
REM
REM This program and the accompanying materials are made available under the
REM terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,4 +33,4 @@
set JAVA=java
:run
-%JAVA% -cp "%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jaxb-osgi.jar" com.sun.tools.jxc.SchemaGeneratorFacade %*
+%JAVA% -cp "%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.activation.jar" com.sun.tools.jxc.SchemaGeneratorFacade %*
diff --git a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen
index 8178b34..245fce1 100644
--- a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen
+++ b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021 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
@@ -30,4 +30,4 @@
JAVA=${AS_JAVA}/bin/java
fi
-exec "$JAVA" $WSGEN_OPTS -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jaxb-osgi.jar" com.sun.tools.ws.WsGen "$@"
+exec "$JAVA" $WSGEN_OPTS -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.activation.jar" com.sun.tools.ws.WsGen "$@"
diff --git a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat
index d5c0fe1..c907bc7 100644
--- a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat
+++ b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat
@@ -1,7 +1,7 @@
@echo off
REM
-REM Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+REM Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
REM
REM This program and the accompanying materials are made available under the
REM terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,4 +33,4 @@
set JAVA=java
:run
-%JAVA% %WSGEN_OPTS% -cp "%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jaxb-osgi.jar" com.sun.tools.ws.WsGen %*
+%JAVA% %WSGEN_OPTS% -cp "%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.activation.jar" com.sun.tools.ws.WsGen %*
diff --git a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport
index e0376f0..132cd36 100644
--- a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport
+++ b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021 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
@@ -30,4 +30,4 @@
JAVA=${AS_JAVA}/bin/java
fi
-exec "$JAVA" $WSIMPORT_OPTS -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jaxb-osgi.jar" com.sun.tools.ws.WsImport "$@"
+exec "$JAVA" $WSIMPORT_OPTS -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.activation.jar" com.sun.tools.ws.WsImport "$@"
diff --git a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat
index ec2060b..907a465 100644
--- a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat
+++ b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat
@@ -1,7 +1,7 @@
@echo off
REM
-REM Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+REM Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
REM
REM This program and the accompanying materials are made available under the
REM terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,4 +33,4 @@
set JAVA=java
:run
-%JAVA% %WSIMPORT_OPTS% -cp "%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jaxb-osgi.jar" com.sun.tools.ws.WsImport %*
+%JAVA% %WSIMPORT_OPTS% -cp "%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.activation.jar" com.sun.tools.ws.WsImport %*
diff --git a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc
index ea86a11..1b05a27 100644
--- a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc
+++ b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021 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
@@ -30,4 +30,4 @@
JAVA=${AS_JAVA}/bin/java
fi
-exec "$JAVA" -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jaxb-osgi.jar" com.sun.tools.xjc.Driver "$@"
+exec "$JAVA" -cp "$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.activation.jar" com.sun.tools.xjc.Driver "$@"
diff --git a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat
index 21ab01c..129f4ec 100644
--- a/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat
+++ b/appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat
@@ -1,7 +1,7 @@
@echo off
REM
-REM Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+REM Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
REM
REM This program and the accompanying materials are made available under the
REM terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,4 +33,4 @@
set JAVA=java
:run
-%JAVA% -cp "%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jaxb-osgi.jar" com.sun.tools.xjc.Driver %*
+%JAVA% -cp "%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.activation.jar" com.sun.tools.xjc.Driver %*
diff --git a/docs/website/src/main/resources/README.md b/docs/website/src/main/resources/README.md
index 7b2c70f..82b58f9 100644
--- a/docs/website/src/main/resources/README.md
+++ b/docs/website/src/main/resources/README.md
@@ -4,10 +4,16 @@
Eclipse GlassFish is a [Jakarta EE compatible implementation](compatibility)
sponsored by the Eclipse Foundation.
-Eclipse GlassFish 5.1 is also Java EE 8 Compatible.
+
+
## Latest News
+## December 31, 2020 -- Eclipse GlassFish 6 Stable Release
+
+We are pleased to announce the stable release of Eclipse GlassFish 6.0. This release provides implementations
+of the Jakarta EE 9 Platform and Web Profile specifications. Download links are available from the [GlassFish Download page](https://eclipse-ee4j.github.io/glassfish/download). Eclipse GlassFish 6 implements the Jakarta EE 9 specification ([Jakarta EE 9 Platform](https://jakarta.ee/specifications/platform/9/), [Jakarta EE 9 Web Profile](https://jakarta.ee/specifications/webprofile/9/)).
+
### October 24, 2020 -- Eclipse GLassFish 6.0 Release Candidate 1 is released
This is the first release candidate of Eclipse GlassFish 6.0 and is available for [download](https://eclipse-ee4j.github.io/glassfish/download).
@@ -19,7 +25,7 @@
### September 10, 2019 -- Eclipse GlassFish 5.1 is certified compatible with Eclipse Jakarta EE 8
-Eclipse GlassFish 5.1 was certified as part of the release of the Jakarta EE 8 specification. This certification was completed without requiring any changes to Eclipse GlassFish 5.1, released in January of this same year.
+Eclipse GlassFish 5.1 was certified as part of the release of the Jakarta EE 8 specification. This certification was completed without requiring any changes to Eclipse GlassFish 5.1, released in January of this same year. Eclipse GlassFish 5.1 is compatible with both Jakarta EE 8 and also Java EE 8.
### January 28, 2019 -- Eclipse GlassFish 5.1 is released
diff --git a/docs/website/src/main/resources/certifications/jakarta-full-profile/9.0/TCK-Results.md b/docs/website/src/main/resources/certifications/jakarta-full-profile/9.0/TCK-Results.md
index 8bc0e8e..73115f8 100644
--- a/docs/website/src/main/resources/certifications/jakarta-full-profile/9.0/TCK-Results.md
+++ b/docs/website/src/main/resources/certifications/jakarta-full-profile/9.0/TCK-Results.md
@@ -10,7 +10,7 @@
- Product Name, Version and download URL (if applicable): <br/>
[Eclipse GlassFish 6.0](https://eclipse-ee4j.github.io/glassfish/download)
- [glassfish-6.0.0-RC2.zip](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-RC2.zip)
+ [glassfish-6.0.0.zip](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0.zip), SHA-256: `A528811169E2C97D13618C1985BF6A70160E251B1B8A68BB22D43D9EE367E2E0`
- Specification Name, Version and download URL: <br/>
[Jakarta EE Platform, 9.0](https://jakarta.ee/specifications/platform/9/)
@@ -423,7 +423,7 @@
Stage Name: jsonb
[runcts] OUT => [javatest.batch] ********************************************************************************
[runcts] OUT => [javatest.batch] Completed running 1082 tests.
- [runcts] OUT => [javatest.batch] Number of Tests Passed = 1082
+ [runcts] OUT => [javatest.batch] Number of Tests Passed = 1062
[runcts] OUT => [javatest.batch] Number of Tests Failed = 0
[runcts] OUT => [javatest.batch] Number of Tests with Errors = 0
[runcts] OUT => [javatest.batch] ********************************************************************************
@@ -479,7 +479,7 @@
Stage Name: servlet
[runcts] OUT => [javatest.batch] ********************************************************************************
[runcts] OUT => [javatest.batch] Completed running 1735 tests.
- [runcts] OUT => [javatest.batch] Number of Tests Passed = 1735
+ [runcts] OUT => [javatest.batch] Number of Tests Passed = 1733
[runcts] OUT => [javatest.batch] Number of Tests Failed = 0
[runcts] OUT => [javatest.batch] Number of Tests with Errors = 0
[runcts] OUT => [javatest.batch] ********************************************************************************
diff --git a/docs/website/src/main/resources/certifications/jakarta-messaging/3.0/TCK-Results.md b/docs/website/src/main/resources/certifications/jakarta-messaging/3.0/TCK-Results.md
new file mode 100644
index 0000000..aa18cf2
--- /dev/null
+++ b/docs/website/src/main/resources/certifications/jakarta-messaging/3.0/TCK-Results.md
@@ -0,0 +1,39 @@
+TCK Results
+===========
+
+As required by the
+[Eclipse Foundation Technology Compatibility Kit License](https://www.eclipse.org/legal/tck.php),
+following is a summary of the TCK results for Jakarta Messaging, 3.0 with Eclipse GlassFish 6.0 (includes Eclipse Open MQ 6.0)
+
+# Eclipse Open MQ 6.0.0, Certification Summary
+
+- Product Name, Version and download URL (if applicable): <br/>
+ Eclipse GlassFish 6.0, includes: Eclipse Open MQ 6.0.0, which provides Jakarta Messaging API 3.0.0
+ [Eclipse GlassFish 6.0](https://eclipse-ee4j.github.io/glassfish/download)
+ For reference, use imqbrokerd command from GlassFish distribution: glassfish6/mq (bin).
+- Specification Name, Version and download URL: <br/>
+ [Jakarta Messaging 3.0](https://jakarta.ee/specifications/messaging/3.0)
+- TCK Version, digital SHA-256 fingerprint and download URL: <br/>
+ [Jakarta Messaging 3.0, TCK](https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-messaging-tck-3.0.0.zip), SHA-256: `2f5e099d9862227d9494e413ebd15033961c4271237453d1d48eb0b0005fd89c`
+- Public URL of TCK Results Summary: <br/>
+ [TCK results summary](TCK-Results.html)
+- Any Additional Specification Certification Requirements: <br/>
+ None
+- Java runtime used to run the implementation: <br/>
+ Oracle JDK 1.8.0_191
+- Summary of the information for the certification environment, operating system, cloud, ...: <br/>
+ Linux Centos 7
+
+Test results:
+
+```
+[javatest.batch] ********************************************************************************
+[javatest.batch] Number of tests completed: 904 (904 passed, 0 failed, 0 with errors)
+[javatest.batch] Number of tests remaining: 0
+[javatest.batch] ********************************************************************************
+[javatest.batch] Completed running 904 tests.
+[javatest.batch] Number of Tests Passed = 904
+[javatest.batch] Number of Tests Failed = 0
+[javatest.batch] Number of Tests with Errors = 0
+[javatest.batch] ********************************************************************************
+```
diff --git a/docs/website/src/main/resources/certifications/jakarta-web-profile/9.0/TCK-Results.md b/docs/website/src/main/resources/certifications/jakarta-web-profile/9.0/TCK-Results.md
index c68d969..ba78a31 100644
--- a/docs/website/src/main/resources/certifications/jakarta-web-profile/9.0/TCK-Results.md
+++ b/docs/website/src/main/resources/certifications/jakarta-web-profile/9.0/TCK-Results.md
@@ -10,7 +10,7 @@
- Product Name, Version and download URL (if applicable): <br/>
[Eclipse GlassFish 6.0, Web Profile](https://eclipse-ee4j.github.io/glassfish/download)
- [web-6.0.0-RC2.zip](https://download.eclipse.org/ee4j/glassfish/web-6.0.0-RC2.zip)
+ [web-6.0.0.zip](https://download.eclipse.org/ee4j/glassfish/web-6.0.0.zip) SHA-256: `e191efd4c5d19468a483aacd563fe293b735df5a8b067ea8fb8151c3c689ef0f`
- Specification Name, Version and download URL: <br/>
[Jakarta EE Platform, Web Profile 9.0](https://jakarta.ee/specifications/webprofile/9/)
diff --git a/docs/website/src/main/resources/certifications/jakarta-ws-metadata/2.0/TCK-Results.md b/docs/website/src/main/resources/certifications/jakarta-ws-metadata/2.0/TCK-Results.md
new file mode 100644
index 0000000..5864610
--- /dev/null
+++ b/docs/website/src/main/resources/certifications/jakarta-ws-metadata/2.0/TCK-Results.md
@@ -0,0 +1,30 @@
+TCK Results
+===========
+
+As required by the
+[Eclipse Foundation Technology Compatibility Kit License](https://www.eclipse.org/legal/tck.php),
+following is a summary of the TCK results for releases of Jakarta Web Services Metadata.
+
+# Eclipse GlassFish 6.0, Full Profile, Certification Summary
+
+- Product Name, Version and download URL (if applicable): <br/>
+ [Eclipse GlassFish 6.0](https://eclipse-ee4j.github.io/glassfish/download)
+ Includes Web Services Metadata 2.0
+- Specification Name, Version and download URL: <br/>
+ [Jakarta Web Services Metadata 2.0](https://jakarta.ee/specifications/ws-metadata/2.0/)
+- TCK Version, digital SHA-256 fingerprint and download URL: <br/>
+ [Jakarta EE Platform TCK 9.0](http://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-jakartaeetck-9.0.0.zip), SHA-256: 75b2493a117e7f8fe775cc7e2e8a605a203611895091f4bb9aaabed57f813392
+- Public URL of TCK Results Summary: <br/>
+ There is no stand-alone TCK for this specification. See Full Platform CTS for results.
+ [TCK results summary](https://eclipse-ee4j.github.io/glassfish/certifications/jakarta-full-profile/9.0/TCK-Results)
+- Any Additional Specification Certification Requirements: <br/>
+ None
+- Java runtime used to run the implementation: <br/>
+ Oracle JDK 1.8.0_191
+- Summary of the information for the certification environment, operating system, cloud, ...: <br/>
+ Linux Centos 7
+
+
+Test results:
+
+[TCK results summary](https://eclipse-ee4j.github.io/glassfish/certifications/jakarta-full-profile/9.0/TCK-Results)
\ No newline at end of file
diff --git a/docs/website/src/main/resources/certifications/jakarta-xml-binding/3.0/TCK-Results.md b/docs/website/src/main/resources/certifications/jakarta-xml-binding/3.0/TCK-Results.md
new file mode 100644
index 0000000..8f610ac
--- /dev/null
+++ b/docs/website/src/main/resources/certifications/jakarta-xml-binding/3.0/TCK-Results.md
@@ -0,0 +1,54 @@
+TCK Results, Eclipse XML Binding 3.0
+====================================
+
+As required by the [Eclipse Foundation Technology Compatibility Kit License](https://www.eclipse.org/legal/tck.php), following is a summary of the TCK results for release of Eclipse GlassFish 6.0.
+
+## Eclipse XML Binding Implementation, Certification Summary
+
+- Product Name, Version and download URL (if applicable): <br/>
+ Eclipse GlassFish 6, provides XML Binding 3.0, included in Eclipse GlassFish 6.0.0-RC2 <br/>
+ [Eclipse GlassFish Downloads](https://eclipse-ee4j.github.io/glassfish/download)
+
+- Specification Name, Version and download URL: <br/>
+ [Jakarta XML Binding 3.0](https://jakarta.ee/specifications/xml-binding/3.0)
+
+- TCK Version, digital SHA-256 fingerprint and download URL: <br/>
+ [Jakarta XML Binding 3.0, TCK](https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-xml-binding-tck-3.0.0.zip), SHA-256: `4ee5f5c12edf5212c7fe16f0a51e74ae48c7b7a72ffc40450dfdb07204fb5c0b`
+
+- Public URL of TCK Results Summary: <br/>
+ [TCK results summary](TCK-Results.html)
+
+- Any Additional Specification Certification Requirements: <br/>
+ None
+
+- Java runtime used to run the implementation: <br/>
+ Oracle JDK 1.8.0_191
+
+- Summary of the information for the certification environment, operating system, cloud, ...: <br/>
+ Linux Centos 7
+
+Test results: (from home/jenkins/agent/workspace/jaxb-tck_master/JAXB_REPORT/JAXB-TCK/html/report.html)
+
+| Keyword | Passed | Total |
+| ------------------------------------------------- | --------- | --------- |
+| bindinfo document positive | 75 | 75 |
+| bindinfo empty_output positive schema | 2 | 2 |
+| bindinfo negative schema | 11 | 11 |
+| bindinfo positive schema | 48 | 48 |
+| cttest positive runtime | 1 | 1 |
+| document positive | 5070 | 5070 |
+| document positive runtime | 195 | 195 |
+| document positive validation_checker | 5613 | 5613 |
+| empty_output java_to_schema jaxb positive runtime | 2 | 2 |
+| empty_output jaxb positive rtgen runtime | 2 | 2 |
+| empty_output positive schema | 25 | 25 |
+| java_to_schema jaxb negative runtime | 22 | 22 |
+| java_to_schema jaxb positive runtime | 309 | 309 |
+| jaxb positive rtgen runtime | 308 | 308 |
+| jaxb positive runtime | 1 | 1 |
+| jaxb rtgen runtime | 22 | 22 |
+| negative schema | 2678 | 2678 |
+| positive runtime | 16 | 16 |
+| positive schema | 10224 | 10224 |
+| runtime | 4 | 4 |
+| **Total** | **24628** | **24628** |
\ No newline at end of file
diff --git a/docs/website/src/main/resources/compatibility.md b/docs/website/src/main/resources/compatibility.md
index e6ec220..d010c03 100644
--- a/docs/website/src/main/resources/compatibility.md
+++ b/docs/website/src/main/resources/compatibility.md
@@ -2,15 +2,135 @@
Eclipse GlassFish is a Compatible Implementation of a number of Jakarta EE Specifications. For each specification we are required by the [Eclipse Foundation Technology Compatibility Kit License](https://www.eclipse.org/legal/tck.php) to publish a summary of the TCK results.
-## Jakarta Platform, Full Profile
+# Jakarta EE 9 Certifications
-* [Jakarta Platform, Full Profile 8.0](certifications/jakarta-full-profile/8.0/TCK-Results)
+## Jakarta EE Platform, 9
-## Jakarta Platform, Web Profile
+* [Jakarta EE Platform 9.0](certifications/jakarta-full-profile/9.0/TCK-Results)
+* Includes results for
+ * Jakarta Dependency Injection 2.0
+ * Jakarta Contexts and Dependency Injection 3.0
+ * Jakarta Bean Validation 3.0
-* [Jakarta Platform, Web Profile 8.0](certifications/jakarta-web-profile/8.0/TCK-Results)
+## Jakarta EE Web Profile, 9
-## Jakarta EE 8 Platform Specification
+* [Jakarta EE, Web Profile 9.0](certifications/jakarta-web-profile/9.0/TCK-Results)
+* Includes results for
+ * Jakarta Dependency Injection 2.0
+ * Jakarta Contexts and Dependency Injection 3.0
+ * Jakarta Bean Validation 3.0
+
+## Jakarta EE 9 Component Specifications
+
+### Jakarta Annotations
+
+* [Jakarta Annotations 2.0](certifications/jakarta-annotations/2.0/TCK-Results)
+
+### Jakarta Authentication
+
+* [Jakarta Authentication 2.0](certifications/jakarta-authentication/2.0/TCK-Results)
+
+### Jakarta Authorization
+
+* [Jakarta Authorization 2.0](certifications/jakarta-authorization/2.0/TCK-Results)
+
+### Jakarta Concurrency
+
+* [Jakarta Concurrency 2.0](certifications/jakarta-concurrency/2.0/TCK-Results)
+
+### Jakarta Connectors
+
+* [Jakarta Connectors 2.0](certifications/jakarta-connectors/2.0/TCK-Results)
+
+### Jakarta Debugging Support for Other Languages
+
+* [Jakarta Debugging Support for Other Languages 2.0](certifications/jakarta-debugging/2.0/TCK-Results)
+
+### Jakarta Deployment
+
+* Pruned
+
+### Jakarta Enterprise Beans
+
+* [Jakarta Enterprise Beans 4.0](certifications/jakarta-enterprise-beans/4.0/TCK-Results)
+
+### Jakarta Enterprise Web Services
+
+* [Jakarta Enterprise Web Services 2.0](certifications/jakarta-enterprise-web-services/2.0/TCK-Results)
+
+### Jakarta Expression Language
+
+* [Jakarta Expression Language 4.0](certifications/jakarta-expression-language/4.0/TCK-Results)
+
+### Jakarta Interceptors
+
+* [Jakarta Interceptors 2.0](certifications/jakarta-interceptors/2.0/TCK-Results)
+
+### Jakarta Managed Beans
+
+* [Jakarta Managed Beans 2.0](certifications/jakarta-managed-beans/2.0/TCK-Results)
+
+### Jakarta Management
+
+* Pruned
+
+### Jakarta Messaging
+
+* [Jakarta Messaging 3.0](certifications/jakarta-messaging/3.0/TCK-Results)
+
+### Jakarta Security
+
+* [Jakarta Security 2.0](certifications/jakarta-security/2.0/TCK-Results)
+
+### Jakarta Server Faces
+
+* [Jakarta Server Faces 2.3](certifications/jakarta-faces/3.0/TCK-Results)
+
+### Jakarta Server Pages
+
+* [Jakarta Server Pages 3.0](certifications/jakarta-pages/3.0/TCK-Results)
+
+### Jakarta Servlet
+
+* [Jakarta Servlet 5.0](certifications/jakarta-servlet/5.0/TCK-Results)
+
+### Jakarta Standard Tag Library
+
+* [Jakarta Standard Tag Library 2.0](certifications/jakarta-tags/2.0/TCK-Results)
+
+### Jakarta Transactions
+
+* [Jakarta Transactions 2.0](certifications/jakarta-transactions/2.0/TCK-Results)
+
+### Jakarta WebSocket
+
+* [Jakarta WebSocket 2.0](certifications/jakarta-websocket/2.0/TCK-Results)
+
+### Jakarta Web Services Metadata
+
+* [Jakarta Web Services Metadata 2.0](certifications/jakarta-ws-metadata/2.0/TCK-Results)
+
+### Jakarta XML Binding
+
+* [Jakarta XML Binding 3.0](certifications/jakarta-xml-binding/3.0/TCK-Results)
+
+### Jakarta XML Registries
+
+* Pruned
+
+----
+
+# Jakarta EE 8 Certifications
+
+## Jakarta EE Platform, 8
+
+* [Jakarta EE Platform 8.0](certifications/jakarta-full-profile/8.0/TCK-Results)
+
+## Jakarta EE Web Profile, 8
+
+* [Jakarta EE, Web Profile 8.0](certifications/jakarta-web-profile/8.0/TCK-Results)
+
+## Jakarta EE 8 Component Specifications
### Jakarta Annotations
@@ -90,7 +210,6 @@
### Jakarta Transactions
-* [Jakarta Server Pages 2.3](certifications/jakarta-pages/2.3/TCK-Results)
* [Jakarta Transactions 1.3](certifications/jakarta-transactions/1.3/TCK-Results)
### Jakarta WebSocket
diff --git a/docs/website/src/main/resources/download.md b/docs/website/src/main/resources/download.md
index eb096f3..0402e5e 100644
--- a/docs/website/src/main/resources/download.md
+++ b/docs/website/src/main/resources/download.md
@@ -1,47 +1,61 @@
# Eclipse GlassFish Downloads
-## Eclipse GLassFish 6, Release Candidate 2
+## Eclipse GlassFish 6
-This is the first release candidate for GlassFish 6.0 and is functionally complete and has passed an in-progress version of the Jakarta EE 9 TCK for both Web Profile and Full Profile.
-For more details on Jakarta EE 9, please see the [Jakarte EE Platform Specification Project](https://eclipse-ee4j.github.io/jakartaee-platform/). We welcome your feedback! Please include the details provided in the **info** link when reporting any [issues](https://github.com/eclipse-ee4j/glassfish/issues).
+The latest stable release for Eclipse GlassFish 6.0. It is functionally complete and meets the compatibility requirements of the approved final version of the Jakarta EE 9 Specification. Downloads are provided for both Jakarta EE Platform 9 and Jakarta EE Web Profile 9.
+For more details on Jakarta EE 9, please see the [Jakarte EE Platform Specification Project](https://eclipse-ee4j.github.io/jakartaee-platform/).
-* [Eclipse GlassFish 6, Full Platform 6.0.0-RC2](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-RC2.zip), - [info](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-RC2.info)
-* [Eclipse Glassfish 6, Web Profile 6.0.0-RC2](https://download.eclipse.org/ee4j/glassfish/web-6.0.0-RC2.zip), - [info](https://download.eclipse.org/ee4j/glassfish/web-6.0.0-RC2.info)
+NOTE: Users upgrading from Jakarta EE 8 to Jakarta EE 9 may want to review the Spec. changes describing how to upgrade an EE 8 application to EE 9 (for example, you might start by watching [this video](https://youtu.be/3ClvncBrKJw?t=405)).
+* [Eclipse GlassFish 6.0.0, Jakarta EE Platform, 9](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0.zip), - [info](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0.info)
+* [Eclipse Glassfish 6.0.0, Jakarta EE Web Profile, 9](https://download.eclipse.org/ee4j/glassfish/web-6.0.0.zip), - [info](https://download.eclipse.org/ee4j/glassfish/web-6.0.0.info)
-## Eclipse GLassFish 6, Release Candidate 1
+We welcome your feedback! Please include the details provided in the **info** link when reporting any [issues](https://github.com/eclipse-ee4j/glassfish/issues).
-This is the first release candidate for GlassFish 6.0 and is functionally complete and has passed an in-progress version of the Jakarta EE 9 TCK for both Web Profile and Full Profile.
-For more details on Jakarta EE 9, please see the [Jakarte EE Platform Specification Project](https://eclipse-ee4j.github.io/jakartaee-platform/). We welcome your feedback! Please include the details provided in the **info** link when reporting any [issues](https://github.com/eclipse-ee4j/glassfish/issues).
-
-* [Eclipse GlassFish 6, Full Platform 6.0.0-RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-RC1.zip), - [info](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-RC1.info)
-* [Eclipse Glassfish 6, Web Profile 6.0.0-RC1](https://download.eclipse.org/ee4j/glassfish/web-6.0.0-RC1.zip), - [info](https://download.eclipse.org/ee4j/glassfish/web-6.0.0-RC1.info)
-
-## Eclipse GlassFish 6, Prerelease, milestone
-
-This is a pre-release to allow users, vendors, and all community members a glimpse into the changes forthcoming with Jakarta EE 9. This is not a stable release and is intended to allow users to begin evaluation of the proposed name-space and pruning changes included in this new EE 9 specification release. For more details on Jakarta EE 9, please see the [Jakarte EE Platform Specification Project](https://eclipse-ee4j.github.io/jakartaee-platform/). We welcome your feedback! Please include the details provided in the **info** link when reporting any [issues](https://github.com/eclipse-ee4j/glassfish/issues).
-
-* [Eclipse GlassFish 6, Full Platform 6.0.0-M1](http://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-M1.zip), - [info](http://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-M1.info)
-* [Eclipse Glassfish 6, Web Profile 6.0.0-M1](http://download.eclipse.org/ee4j/glassfish/web-6.0.0-M1.zip), - [info](http://download.eclipse.org/ee4j/glassfish/web-6.0.0-M1.info)
-
-## Eclipse GlassFish 6, latest checkpoint
-
-These are constantly evolving. Check the latest [PR activity](https://github.com/eclipse-ee4j/glassfish/pulls) to see what is new and changed. We welcome your feedback! Please include the details provided in the **info** link when reporting any [issues](https://github.com/eclipse-ee4j/glassfish/issues).
-
-* [Eclipse GlassFish 6, Full Platform 6.0.0-SNAPSHOT](http://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-SNAPSHOT-nightly.zip), - [info](http://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-SNAPSHOT-nightly.info)
-* [Eclipse Glassfish 6, Web Profile 6.0.0-SNAPSHOT](http://download.eclipse.org/ee4j/glassfish/web-6.0.0-SNAPSHOT-nightly.zip), - [info](http://download.eclipse.org/ee4j/glassfish/web-6.0.0-SNAPSHOT-nightly.info)
## Eclipse GlassFish 5.1 Downloads
-These are the latest stable releases of Eclipse GlassFish
+The latest stable releases of Eclipse GlassFish 5.1. This version is compatible with Jakarta EE 8 Specification.
-* [Eclipse GlassFish 5.1 - Full Platform](https://www.eclipse.org/downloads/download.php?file=/glassfish/glassfish-5.1.0.zip)
-* [Eclipse GlassFish 5.1 - Web Profile](https://www.eclipse.org/downloads/download.php?file=/glassfish/web-5.1.0.zip)
+* [Eclipse GlassFish 5.1.0 - Jakarta EE Platform, 8](https://www.eclipse.org/downloads/download.php?file=/glassfish/glassfish-5.1.0.zip)
+* [Eclipse GlassFish 5.1.0 - Jakarta EE Web Profile, 8](https://www.eclipse.org/downloads/download.php?file=/glassfish/web-5.1.0.zip)
+
+----
+
+# Legacy
+
+The downloads below are for legacy use only. Most users will want to use the stable releases listed above.
+
+### Eclipse GlassFish 6, Release Candidate 2
+
+This is the first release candidate for GlassFish 6.0 and is functionally complete and has passed an in-progress version of the Jakarta EE 9 TCK for both Web Profile and Full Profile.
+For more details on Jakarta EE 9, please see the [Jakarte EE Platform Specification Project](https://eclipse-ee4j.github.io/jakartaee-platform/). We welcome your feedback! Please include the details provided in the **info** link when reporting any [issues](https://github.com/eclipse-ee4j/glassfish/issues).
+
+* [Eclipse GlassFish 6.0.0-RC2, Jakarta EE Platform 9](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-RC2.zip), - [info](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-RC2.info)
+* [Eclipse Glassfish Web Profile 6.0.0-RC2 Jakarta EE Web Profile 9](https://download.eclipse.org/ee4j/glassfish/web-6.0.0-RC2.zip), - [info](https://download.eclipse.org/ee4j/glassfish/web-6.0.0-RC2.info)
+
+
+### Eclipse GlassFish 6, Release Candidate 1
+
+This is the first release candidate for GlassFish 6.0 and is functionally complete and has passed an in-progress version of the Jakarta EE 9 TCK for both Web Profile and Full Profile.
+For more details on Jakarta EE 9, please see the [Jakarte EE Platform Specification Project](https://eclipse-ee4j.github.io/jakartaee-platform/). We welcome your feedback! Please include the details provided in the **info** link when reporting any [issues](https://github.com/eclipse-ee4j/glassfish/issues).
+
+* [Eclipse GlassFish 6.0.0-RC1, Jakarta EE Platform 9](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-RC1.zip), - [info](https://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-RC1.info)
+* [Eclipse Glassfish Web Profile 6.0.0-RC1, Jakarta EE Web Profile 9](https://download.eclipse.org/ee4j/glassfish/web-6.0.0-RC1.zip), - [info](https://download.eclipse.org/ee4j/glassfish/web-6.0.0-RC1.info)
+
+### Eclipse GlassFish 6, Prerelease, milestone
+
+This is a pre-release to allow users, vendors, and all community members a glimpse into the changes forthcoming with Jakarta EE 9. This is not a stable release and is intended to allow users to begin evaluation of the proposed name-space and pruning changes included in this new EE 9 specification release. For more details on Jakarta EE 9, please see the [Jakarte EE Platform Specification Project](https://eclipse-ee4j.github.io/jakartaee-platform/). We welcome your feedback! Please include the details provided in the **info** link when reporting any [issues](https://github.com/eclipse-ee4j/glassfish/issues).
+
+* [Eclipse GlassFish 6.0.0-M1, Jakarta EE Platform 9](http://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-M1.zip), - [info](http://download.eclipse.org/ee4j/glassfish/glassfish-6.0.0-M1.info)
+* [Eclipse Glassfish Web Profile 6.0.0-M1, Jakarta EE Web Profile 9](http://download.eclipse.org/ee4j/glassfish/web-6.0.0-M1.zip), - [info](http://download.eclipse.org/ee4j/glassfish/web-6.0.0-M1.info)
+
+----
## Looking for Java EE 8?
Java EE has been contributed to the Eclipse Foundation.
The Jakarta EE community is responsible for all evolution of the
project formerly known as Java EE.
-If you are looking for details of the Java EE GlassFish project, you can
+If you are looking for details of the archived Java EE GlassFish project, you are welcome to
[browse here](https://javaee.github.io/glassfish).
diff --git a/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingOutputStream.java b/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingOutputStream.java
index 1b0b2c3..06acb7c 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingOutputStream.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021 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
@@ -188,7 +188,17 @@
public LoggingPrintStream(ByteArrayOutputStream os) {
super(os, true);
-
+ ensureLoaded(StackTraceObjects.class);
+ }
+
+ private void ensureLoaded(Class<?> k) {
+ try {
+ Class.forName(k.getName());
+ } catch (ClassNotFoundException ex) {
+ throw (NoClassDefFoundError)
+ new NoClassDefFoundError(ex.toString()).initCause(ex);
+ } catch (SecurityException ignore) {
+ }
}
public void setLogger(Logger l) {
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
diff --git a/nucleus/security/core/src/main/resources/config/cacerts.jks b/nucleus/security/core/src/main/resources/config/cacerts.jks
index 5349943..35b47f0 100644
--- a/nucleus/security/core/src/main/resources/config/cacerts.jks
+++ b/nucleus/security/core/src/main/resources/config/cacerts.jks
Binary files differ
diff --git a/nucleus/security/core/src/main/resources/config/keystore.jks b/nucleus/security/core/src/main/resources/config/keystore.jks
index 33a95a0..52f852d 100644
--- a/nucleus/security/core/src/main/resources/config/keystore.jks
+++ b/nucleus/security/core/src/main/resources/config/keystore.jks
Binary files differ
