Update versions to 6.0 / 6.0.0 for next development cycle

jakartaee · May 11, 2022 · e6852eb · e6852eb
1 parent 16fba2f
commit e6852eb
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>jakarta.el</groupId>
     <artifactId>jakarta.el-api</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Jakarta Expression Language API</name>
@@ -78,7 +78,7 @@
 
     <properties>
         <!-- Make sure the two versions are in sync with the maven version -->
-        <spec.version>5.0</spec.version>
+        <spec.version>6.0</spec.version>
         <bundle.version>${project.version}</bundle.version>
         <extensionName>jakarta.el</extensionName>
         <bundle.symbolicName>jakarta.el-api</bundle.symbolicName>

diff --git a/api/src/main/java/jakarta/el/package.html b/api/src/main/java/jakarta/el/package.html
@@ -1,6 +1,7 @@
 <!--
 
-    Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2022 Oracle and/or its affiliates and others.
+    All rights reserved.
     Copyright 2004 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +24,7 @@
 </head>
 
 <body bgcolor="white">
-Provides the API for <strong>Jakarta Expression Language 5.0</strong>
+Provides the API for <strong>Jakarta Expression Language 6.0</strong>
 
 <p>Jakarta Expression Language is a simple language originally designed to
 satisfy the specific needs of web application developers. It has evolved
@@ -222,7 +223,7 @@ <h3><a name="Variables">Jakarta Expression Language Variables</a></h3>
 </p>
 
 <h3><a name="Standalone">Jakarta Expression Language in Stand-alone environment</a></h3>
-<p>Jakarta Expression Language 5.0 includes APIs for using Jakarta Expression Language in a stand-alone environment.</p>
+<p>Jakarta Expression Language 6.0 includes APIs for using Jakarta Expression Language in a stand-alone environment.</p>
 <p>{@link jakarta.el.ELProcessor} provides simple APIs for the direct
 evaluations of expressions. It also makes it easy to define functions,
 set variables, and define beans locally.</p>

diff --git a/api/src/main/javadoc/doc-files/EFSL.html b/api/src/main/javadoc/doc-files/EFSL.html
@@ -44,7 +44,7 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>
 <p>&quot;Copyright &copy; 2018, 2022 Eclipse Foundation. This software or
   document includes material copied from or derived from
   Jakarta ® Expression Language
-  https://jakarta.ee/specifications/expression-language/5.0/&quot;</p>
+  https://jakarta.ee/specifications/expression-language/6.0/&quot;</p>
 
 <h2>Disclaimers</h2>
 

diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2021  Contributors to the Eclipse Foundation
+    Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation.
     All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -29,7 +29,7 @@
 
     <groupId>jakarta.el</groupId>
     <artifactId>el-parent</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Jakarta Expression Language</name>

diff --git a/spec/pom.xml b/spec/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2021 Contributors to the Eclipse Foundation.
+    Copyright (c) 2019, 2022 Contributors to the Eclipse Foundation.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -28,7 +28,7 @@
 
     <groupId>jakarta.el</groupId>
     <artifactId>expression-language-spec</artifactId>
-    <version>5.0-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Jakarta Expression Language Specification</name>

diff --git a/spec/src/main/asciidoc/ELSpec.adoc b/spec/src/main/asciidoc/ELSpec.adoc
@@ -1,6 +1,6 @@
 :xrefstyle: full
 :sectnums!:
-== Jakarta Expression Language, Version 5.0
+== Jakarta Expression Language, Version 6.0
 
 Copyright (c) 2013, 2022 Oracle and/or its affiliates and others.
 All rights reserved.
@@ -17,7 +17,7 @@ Comments to: el-dev@eclipse.org
 == Preface
 
 This is the Expression Language specification
-version 5.0, developed by the Jakarta Expression Language Team under the Eclipse
+version 6.0, developed by the Jakarta Expression Language Team under the Eclipse
 Foundation Specification Process.
 
 === Historical Note

diff --git a/spec/src/main/asciidoc/license-efsl.adoc b/spec/src/main/asciidoc/license-efsl.adoc
@@ -55,7 +55,7 @@ The notice is:
 "Copyright © 2018, 2022 Eclipse Foundation. This software or document
 includes material copied from or derived from
 Jakarta ® Expression Language
-https://jakarta.ee/specifications/expression-language/5.0/[https://jakarta.ee/specifications/expression-language/5.0/]"
+https://jakarta.ee/specifications/expression-language/6.0/[https://jakarta.ee/specifications/expression-language/6.0/]"
 
 ==== Disclaimers