Skip to content

Commit

Permalink
First pass at version updates for EL 5.0 TCK
Browse files Browse the repository at this point in the history
  • Loading branch information
@markt-asf
markt-asf committed Feb 23, 2022
1 parent ecb9cc6 commit a18b758
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion install/el/other/testsuite.jtt
View file
@@ -1,3 +1,3 @@
classpath=$TS_HOME/lib/tsharness.jar
testsuite=com.sun.ts.lib.harness.TS
name=Expression Language TCK/4.0
name=Expression Language TCK/5.0
4 changes: 2 additions & 2 deletions internal/docs/el/ELJavadocAssertions.xml
View file
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE javadoc SYSTEM "https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/dtd/javadoc_assertions.dtd">
<!--
Copyright (c) 2018, 2021 Oracle and/or its affiliates and others.
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
Expand All @@ -25,7 +25,7 @@
<technology>EL</technology>
<id>EL</id>
<name>Expression Language</name>
<version>4.0</version>
<version>5.0</version>
<assertions>
<!-- ********************************************************************************** -->
<!-- ********************************************************************************** -->
Expand Down
4 changes: 2 additions & 2 deletions internal/docs/el/ELSpecAssertions.xml
View file
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE spec SYSTEM "https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/dtd/spec_assertions.dtd">
<!--
Copyright (c) 2018, 2021 Oracle and/or its affiliates and others.
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
Expand All @@ -27,7 +27,7 @@
<technology>EL</technology>
<id>EL</id>
<name>Expression Language</name>
<version>4.0</version>
<version>5.0</version>
<location-names>
<chapters>
<chapter id="1" name="Language Syntax and Semantics">
Expand Down
4 changes: 2 additions & 2 deletions internal/docs/el/ELTCD.txt
View file
@@ -1,5 +1,5 @@
TCK Coverage Document for JSR-341:
Expression Language 4.0 Specification
Expression Language 5.0 Specification

TCK Components:
---------------
Expand Down Expand Up @@ -29,7 +29,7 @@ Terminology of Metrics
Coverage
--------
- Total assertions from the
Expression Language 4.0 Specification, and Javadoc:
Expression Language 5.0 Specification, and Javadoc:

212 specification assertions
+ 344 API assertions
Expand Down
16 changes: 8 additions & 8 deletions internal/docs/el/ReleaseNotes.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<!--
Copyright (c) 2018, 2020 Oracle and/or its affiliates and others.
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
Expand All @@ -20,7 +20,7 @@
-->

<title>Expression Language TCK, Version 4.0 Release Notes, September 2020</title>
<title>Expression Language TCK, Version 5.0 Release Notes, March 2022</title>
<style type="text/css">
<!--
body { background-color: #ffffdd; color: #000000}
Expand All @@ -42,16 +42,16 @@
</head>
<body>
<div align="center">
<h1>Expression Language Technology Compatibility Kit, Version 4.0<br>
<span class="emphasize">Release Notes, September 2020</span></h1>
<h1>Expression Language Technology Compatibility Kit, Version 5.0<br>
<span class="emphasize">Release Notes, March 2022</span></h1>
</div>
<hr size="3">

<h2>About Expression Language Technology</h2>

<hr>
<h2><a name="kit_contents">Technology Compatibility Kit (TCK) Contents</a></h2>
<p>The Jakarta Expression Language specification, Version 4.0 Technology Compatibility Kit (TCK) includes the following items:</p>
<p>The Jakarta Expression Language specification, Version 5.0 Technology Compatibility Kit (TCK) includes the following items:</p>

<hr>
<h2>Platform Notes</h2>
Expand All @@ -62,17 +62,17 @@ <h2>Platform Notes</h2>
<hr>
<h2><a name="install_setup_run">Installing, Setting Up, and Running the EL TCK</a></h2>

<p>Refer to the <cite>Jakarta Expression Language TCK 4.0 User's Guide</cite>, available in the EL TCK 4.0 documentation bundle, for complete instructions on installing, setting up, and running the Expression Language TCK.
<p>Refer to the <cite>Jakarta Expression Language TCK 5.0 User's Guide</cite>, available in the EL TCK 5.0 documentation bundle, for complete instructions on installing, setting up, and running the Expression Language TCK.
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>
<h2>Attributions</h2>
<p>The EL TCK 4.0 includes software developed by the Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org/</a>), the dom4j Project (<a href="http://www.dom4j.org/">http://www.dom4j.org/</a>), and the JDOM<small><sup>TM</sup></small> Project (<a href="http://www.jdom.org/">http://www.jdom.org/</a>). The Apache Ant Contrib project is located at <a href="http://ant-contrib.sourceforge.net/ ">http://ant-contrib.sourceforge.net/</a>.</p>
<p>The EL TCK 5.0 includes software developed by the Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org/</a>), the dom4j Project (<a href="http://www.dom4j.org/">http://www.dom4j.org/</a>), and the JDOM<small><sup>TM</sup></small> Project (<a href="http://www.jdom.org/">http://www.jdom.org/</a>). The Apache Ant Contrib project is located at <a href="http://ant-contrib.sourceforge.net/ ">http://ant-contrib.sourceforge.net/</a>.</p>

<hr>
<p><small>
<address>
Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 2022 Oracle and/or its affiliates and others. All rights reserved.
</address>
</small></p>
</body>
Expand Down
14 changes: 7 additions & 7 deletions internal/docs/el/index.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<!--
Copyright (c) 2018, 2020 Oracle and/or its affiliates and others.
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
Expand All @@ -20,7 +20,7 @@
-->

<title>Welcome to the Jakarta Expression Language TCK, Version 4.0</title>
<title>Welcome to the Jakarta Expression Language TCK, Version 5.0</title>

<style type="text/css">
<!--
Expand All @@ -38,20 +38,20 @@
</head>
<body bgcolor="#ffffdd" text="#000000" link="#0000ff" vlink="#840084" alink="#0000ff">
<div align="Center">
<h1>Welcome to the Jakarta Expression Language TCK, Version 4.0<br>
<h1>Welcome to the Jakarta Expression Language TCK, Version 5.0<br>
<span class="emphasize">Your Starting Point</span></h1>
</div>
<hr>
<h2>Guide to Expression Language TCK 4.0 Documentation</h2>
<h2>Guide to Expression Language TCK 5.0 Documentation</h2>

<p>The Expression Language TCK 4.0 documentation includes the following:</p>
<p>The Expression Language TCK 5.0 documentation includes the following:</p>

<ul>
<li>
<p>The <cite><a href="ReleaseNotes.html">Expression Language TCK Release Notes</a></cite> provide last-minute information about the EL TCK, Version 4.0. The Release Notes are located in the TCK product bundle.</p>
</li>
<li>
<p>The <cite>Jakarta Expression Language 4.0 Technology Compatibility Kit User's Guide</cite> provides the information you need to install, configure, and run the TCK. The User's Guide also contains the rules you need to pass for certification.</p>
<p>The <cite>Jakarta Expression Language 5.0 Technology Compatibility Kit User's Guide</cite> provides the information you need to install, configure, and run the TCK. The User's Guide also contains the rules you need to pass for certification.</p>
</li>
<li>
<p>The <a href="assertions/ELJavadocAssertions.html">Javadoc Assertion List</a> lists all the javadoc test assertions for the Expression Language TCK.</p>
Expand All @@ -67,7 +67,7 @@ <h2>JT Harness Documentation</h2>
<hr>
<p><small>
<address>
Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2007, 2022 Oracle and/or its affiliates and others. All rights reserved.
</address>
</small></p>
</body>
Expand Down
4 changes: 2 additions & 2 deletions internal/docs/jakartaee/JavaEESpecAssertions.xml
View file
@@ -1,7 +1,7 @@
<!DOCTYPE spec SYSTEM "https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/dtd/spec_assertions.dtd">
<!--
Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2022 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
Expand Down Expand Up @@ -266,7 +266,7 @@
<section id = "3" name = "Enterprise JavaBeans (EJB) 3.2 Requirements"/>
<section id = "4" name = "Servlet 4.0 Requirements"/>
<section id = "5" name = "Java Server Pages (JSP) 2.3 Requirements"/>
<section id = "6" name = "Expression Language (EL) 3.0 Requirements"/>
<section id = "6" name = "Expression Language (EL) 5.0 Requirements"/>
<section id = "7" name = "Java Message Service (JMS) 2.0 Requirements"/>
<section id = "8" name = "Java Transaction API (JTA) 1.2 Requirements"/>
<section id = "9" name = "JavaMail 1.6 Requirements"/>
Expand Down
4 changes: 2 additions & 2 deletions user_guides/el/pom.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2021 Oracle and/or its affiliates and others.
Copyright (c) 2017, 2022 Oracle and/or its affiliates and others.
All rights reserved.
This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -29,7 +29,7 @@
<artifactId>tck_el</artifactId>
<packaging>pom</packaging>
<version>4.0.1</version>
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Expression Language for Jakarta EE, Release 4.0</name>
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Expression Language for Jakarta EE, Release 5.0</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion user_guides/el/src/main/jbake/assets/_config.yml
View file
@@ -1,7 +1,7 @@
remote_theme: jakartaee/jekyll-theme-jakarta-ee

title: [tck_uml_v3_0]
description: [Oracle Technology Compatibility Kit User's Guide for Expression Language 4.0 for Technology Licensees, Release 4.0]
description: [Oracle Technology Compatibility Kit User's Guide for Expression Language 5.0 for Technology Licensees, Release 5.0]

# sidebar links url
links:
Expand Down
16 changes: 8 additions & 8 deletions user_guides/el/src/main/jbake/content/attributes.conf
View file
@@ -1,12 +1,12 @@
:TechnologyFullName: Jakarta Expression Language
:TechnologyShortName: Expression Language
:LegacyAcronym: EL
:TechnologyVersion: 4.0
:ReleaseDate: May 2021
:CopyrightDates: 2017, 2021
:TechnologyRI: Eclipse GlassFish 6.1
:TechnologyVersion: 5.0
:ReleaseDate: March 2022
:CopyrightDates: 2017, 2022
:TechnologyRI: Eclipse GlassFish 7.0
:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.glassfish
:SpecificationURL: https://jakarta.ee/specifications/expression-language/4.0/
:SpecificationURL: https://jakarta.ee/specifications/expression-language/5.0/
:TCKInquiryList: mailto:jakartaee-tck-dev@eclipse.org[jakartaee-tck-dev@eclipse.org]
:SpecificationInquiryList: mailto:el-dev@eclipse.org[el-dev@eclipse.org]
:techID: ExpressionLanguage
Expand All @@ -22,13 +22,13 @@
// for the technology. Used in config.inc.
:TechnologyHomeEnv: EL_HOME
// Java SE version required.
:SEversion: 8 (1.8) or 11
:SEversion: 11
:AntVersion: 1.10.0+
:JakartaEEVersion: 9.1
:JakartaEEVersion: 10
:JavaTestVersion: 5.0
:jteFileName: <TS_HOME>/bin/ts.jte
:jtxFileName: <TS_HOME>/bin/ts.jtx
:TCKPackageName: jakarta-expression-language-tck-4.0.1.zip
:TCKPackageName: jakarta-expression-language-tck-5.0.0.zip
// Directory names used in examples in using.adoc.
:sigTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/signaturetest/el
:singleTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/el/api/client
Expand Down
4 changes: 2 additions & 2 deletions user_guides/jakartaee/src/main/jbake/content/intro.adoc
View file
Expand Up @@ -153,7 +153,7 @@ following required and optional Jakarta EE 9.1 technologies:
* Jakarta Enterprise Beans 4.0 +
* Jakarta Servlet 5.0
* Jakarta Server Pages 3.0
* Jakarta Expression Language 4.0
* Jakarta Expression Language 5.0
* Jakarta Messaging 3.0
* Jakarta Transactions 2.0
* Jakarta Mail 2.0
Expand Down Expand Up @@ -196,7 +196,7 @@ the following required Jakarta EE 9.1 Web Profile technologies:

* Jakarta Servlet 5.0
* Jakarta Server Pages 3.0
* Jakarta Expression Language 4.0
* Jakarta Expression Language 5.0
* Jakarta Standard Tag Library 2.0
* Jakarta Faces 3.0
* Jakarta RESTful Web Services 3.0
Expand Down

0 comments on commit a18b758

Please sign in to comment.