Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pages TCK compliance with pages 4.0 and EL 6.0 apis #1218

Merged
merged 4 commits into from
Jan 29, 2024
Merged

Pages TCK compliance with pages 4.0 and EL 6.0 apis #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0aea87
Pages TCK compliance with pages 4.0 and EL 6.0
alwin-joseph Jan 17, 2024
5899213
remove instead of commenting the getFeatureDescriptors() usage
alwin-joseph Jan 17, 2024
2a3ec56
copy jsp documentation from 3.1, bundle assembly
alwin-joseph Jan 18, 2024
5affad6
Fix test failures with jsp-api 4.0, delete tests of removed methods
alwin-joseph Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 74 additions & 8 deletions glassfish-runner/jsp-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<packaging>jar</packaging>

<properties>
<jakarta.platform.version>10.0.0</jakarta.platform.version>
<jakarta.platform.version>11.0.0-M1</jakarta.platform.version>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
<tck.artifactId>jsp-tck</tck.artifactId>
<tck.artifactId>jakarta-pages-tck</tck.artifactId>
<tck.version>4.0.0</tck.version>
</properties>

Expand All @@ -42,14 +42,14 @@
</dependency>
<dependency>
<groupId>jakartatck</groupId>
<artifactId>jsp-tck</artifactId>
<version>10.0.0-SNAPSHOT</version>
<artifactId>${tck.artifactId}</artifactId>
<version>${tck.version}</version>
</dependency>
<dependency>
<!-- <dependency>
<groupId>org.glassfish.main.common</groupId>
<artifactId>simple-glassfish-api</artifactId>
<version>${glassfish.container.version}</version>
</dependency>
</dependency> -->
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
Expand Down Expand Up @@ -86,7 +86,72 @@

<build>
<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.3.0</version>
<executions>
<execution>
<goals>
<goal>wget</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<url>https://github.com/eclipse-ee4j/glassfish/releases/download/8.0.0-M1/glassfish-8.0.0-M1.zip</url>
<outputFileName>glassfish.zip</outputFileName>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<goals>
<goal>run</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<tasks>
<echo message="unzipping file"></echo>
<unzip dest="target/" src="target/glassfish.zip"></unzip>
<chmod dir="target/glassfish7/glassfish/bin/asadmin" perm="777"></chmod>
</tasks>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>unpack</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakartatck</groupId>
<artifactId>${tck.artifactId}</artifactId>
<version>${tck.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
Expand All @@ -111,7 +176,8 @@
</configuration>
</execution>
</executions>
</plugin>
</plugin> -->

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand Down Expand Up @@ -277,7 +343,7 @@
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp-api.jar</additionalClasspathElement>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp.jstl-api.jar</additionalClasspathElement>
</additionalClasspathElements>
<dependenciesToScan>jakartatck:jsp-tck</dependenciesToScan>
<dependenciesToScan>jakartatck:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<webServerHome>${project.build.directory}/${glassfish.toplevel.dir}/glassfish</webServerHome>
Expand Down
97 changes: 97 additions & 0 deletions jsp/docs/JakartaServerPages3.1-ReleaseNotes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=windows-1252">
<title>Jakarta Server Pages TCK Release Notes</title>
<!--
Copyright (c) 2018, 2022 Oracle and/or its affiliates and others.
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
http://www.eclipse.org/legal/epl-2.0.

This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
version 2 with the GNU Classpath Exception, which is available at
https://www.gnu.org/software/classpath/license.html.

SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0

-->
<style type="text/css">
<!--
body { background-color: #ffffdd; color: #000000}
pre { background-color: #eeeeee; color: #000099; font-size: smaller}
code { color: #000099; font-size: smaller}
h1 { color: #000099}
h2 { color: #000099}
h3 { color: #000099; text-decoration: underline}
h4 { font-style: italic; color: #000099}
.tabletitle { font-style: italic; color: #ffffcc; font-size: small; font-variant: small-caps}
.subtitle { font-style: italic; color: #ffffcc; font-variant: small-caps}
.emphasize { font-style: italic; color: #000099}
.step { font-weight: bold}
.note { background-color: #fffff0; border-bottom-width: thin; border-top-width: thin; border-top-style: inset; border-bottom-style: inset; font-size: -10%;}
th { background-color: #eeeeee; padding-left: 2pt; padding-right: 2pt;}
-->
</style></head>
<body>
<div align="center">
<h1>Jakarta EE Server Pages Technology Compatibility Kit, Version 3.1<br>
<em class="emphasize">Release Notes, May 2021</em></h1>
</div>
<h2><a name="kit_contents">Kit Contents</a></h2>
<p>The Jakarta EE Server Pages, Version 3.1 Technology Compatibility Kit
(TCK) includes the following items:</p>
<ul>
<li>
<p><strong>Jakarta EE Server Pages TCK tests signature, API, and
End-to-End tests:</strong></p>
</li>
<ul type="square">
<li>
<p>A <strong>signature test</strong> that checks that all of the
public APIs are supported in the Jakarta EE Server Pages Version 3.1
implementation that is being tested</p>
</li>
<li>
<p><strong>API tests</strong> for all of the public APIs under the <code>javax.servlet.jsp</code>
package</p>
</li>
<li>
<p><strong>End-To-End tests</strong> that demonstrate compliance with
the Jakarta EE Server Pages 3.1 specification .</p>
</li>
</ul>
</ul>
<hr>
<h2><a name="platform">Platform Notes</a></h2>
<p>The Jakarta EE Server Pages TCK tests have been built with JDK 8 (1.8)
and tested with Java<font size="-2"><sup>TM</sup></font>
Platform, Standard Edition 8 and 11.</p>
<p>The Jakarta EE Server Pages TCK tests have been run on the following
platforms:</p>
<ul>
<li>CentOS Linux 7</li>
<li>Alpine Linux v3.12</li>
</ul>
<p>The Jakarta EE Server Pages TCK tests have been run against the Eclipse
Jakarta EE Server Pages Compatible Implementation Version 3.1.</p>
<hr>
<h2><a name="install_setup_run">Installing, Setting Up, and Running the
Jakarta EE Server Pages TCK</a></h2>
<p>Refer to the <cite>Jakarta EE Server Pages TCK 3.1 User's Guide</cite> (<a

href="./html-usersguide/title.html" title="Jakarta EE Server Pages TCK 3.1 User's Guide (HTML)">HTML</a>,
<a href="./pdf-usersguide/Jakarta-Server-Pages-TCK-Users-Guide.pdf" title="Jakarta EE Server Pages TCK 3.1 User's Guide (PDF)">PDF</a>)
for complete instructions on installing, setting up, and running the
Jakarta EE Server Pages TCK.</p>
<p>The online version of the JT Harness version 5.0 documentation is
available <a href="https://wiki.openjdk.java.net/display/CodeTools/Documentation">here</a>.</p>
<hr>
<p><cite><small>Copyright © 2013, 2021 Oracle and/or its affiliates. All
rights reserved.</small></cite></p>
</body>
</html>
Loading
Loading