Skip to content

Commit 10adb52

Browse files
committed
Next version is now planned to be 6.0 rather than 5.1
1 parent 54c8edb commit 10adb52

File tree

9 files changed

+38
-35
lines changed

9 files changed

+38
-35
lines changed

api/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
4+
Copyright (c) 1997, 2021 Oracle and/or its affiliates and others.
55
All rights reserved.
66
77
This program and the accompanying materials are made available under the
@@ -30,7 +30,7 @@
3030

3131
<groupId>jakarta.servlet</groupId>
3232
<artifactId>jakarta.servlet-api</artifactId>
33-
<version>5.1.0-SNAPSHOT</version>
33+
<version>6.0.0-SNAPSHOT</version>
3434

3535
<name>Jakarta Servlet</name>
3636
<url>https://projects.eclipse.org/projects/ee4j.servlet</url>
@@ -215,13 +215,13 @@
215215
<supportedProjectType>jar</supportedProjectType>
216216
</supportedProjectTypes>
217217
<instructions>
218-
<Bundle-Version>5.1.0</Bundle-Version>
218+
<Bundle-Version>6.0.0</Bundle-Version>
219219
<Bundle-SymbolicName>jakarta.servlet-api</Bundle-SymbolicName>
220220
<Bundle-Description>
221-
Jakarta Servlet 5.1
221+
Jakarta Servlet 6.0
222222
</Bundle-Description>
223223
<Extension-Name>jakarta.servlet</Extension-Name>
224-
<Specification-Version>5.1</Specification-Version>
224+
<Specification-Version>6.0</Specification-Version>
225225
<Specification-Vendor>Eclipse Foundation</Specification-Vendor>
226226
<Implementation-Version>${project.version}</Implementation-Version>
227227
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>

api/src/main/java/jakarta/servlet/http/Cookie.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ public boolean isHttpOnly() {
463463
* @throws NumberFormatException if the cookie is a known field with a numerical value (eg Max-Age), but the value is
464464
* not able to be parsed.
465465
*
466-
* @since Servlet 5.1
466+
* @since Servlet 6.0
467467
*/
468468
public void setAttribute(String name, String value) {
469469
if (name == null || name.isEmpty()) {
@@ -501,11 +501,11 @@ private void putAttribute(String name, String value) {
501501
* except for <code>version</code>. E.g. when <code>cookie.setAttribute("domain", domain)</code> is invoked, then
502502
* <code>cookie.getDomain()</code> should return exactly that value, and vice versa.
503503
*
504-
* @param name the name of the cookie attribute to set the value for, case insensitive
504+
* @param name the name of the cookie attribute to get the value of, case insensitive
505505
*
506506
* @return the value of the cookie attribute associated with the given name
507507
*
508-
* @since Servlet 5.1
508+
* @since Servlet 6.0
509509
*/
510510
public String getAttribute(String name) {
511511
return attributes == null ? null : attributes.get(name);
@@ -518,7 +518,7 @@ public String getAttribute(String name) {
518518
* @return an unmodifiable mapping of all cookie attributes set via <code>setAttribute(String, String)</code> as well as
519519
* any predefined setter method, except for <code>version</code>
520520
*
521-
* @since Servlet 5.1
521+
* @since Servlet 6.0
522522
*/
523523
public Map<String, String> getAttributes() {
524524
return attributes == null ? Collections.emptyMap() : Collections.unmodifiableMap(attributes);

api/src/main/resources/jakarta/servlet/resources/web-app_5_1.xsd renamed to api/src/main/resources/jakarta/servlet/resources/web-app_6_0.xsd

+7-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
66
elementFormDefault="qualified"
77
attributeFormDefault="unqualified"
8-
version="5.1">
8+
version="6.0">
99
<xsd:annotation>
1010
<xsd:documentation>
1111

12-
Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
12+
Copyright (c) 2009, 2021 Oracle and/or its affiliates and others.
13+
All rights reserved.
1314

1415
This program and the accompanying materials are made available under the
1516
terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,7 +30,7 @@
2930
<xsd:annotation>
3031
<xsd:documentation>
3132
<![CDATA[
32-
This is the XML Schema for the Servlet 5.1 deployment descriptor.
33+
This is the XML Schema for the Servlet 6.0 deployment descriptor.
3334
The deployment descriptor must be named "WEB-INF/web.xml" in the
3435
web application's war file. All Servlet deployment descriptors
3536
must indicate the web application schema by using the Jakarta EE
@@ -43,15 +44,15 @@
4344
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
4445
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4546
xsi:schemaLocation="..."
46-
version="5.1">
47+
version="6.0">
4748
...
4849
</web-app>
4950
5051
The instance documents may indicate the published version of
5152
the schema using the xsi:schemaLocation attribute for Jakarta EE
5253
namespace with the following location:
5354
54-
https://jakarta.ee/xml/ns/jakartaee/web-app_5_1.xsd
55+
https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd
5556
5657
]]>
5758
</xsd:documentation>
@@ -75,7 +76,7 @@
7576
</xsd:documentation>
7677
</xsd:annotation>
7778

78-
<xsd:include schemaLocation="web-common_5_1.xsd"/>
79+
<xsd:include schemaLocation="web-common_6_0.xsd"/>
7980

8081

8182
<!-- **************************************************** -->

api/src/main/resources/jakarta/servlet/resources/web-common_5_1.xsd renamed to api/src/main/resources/jakarta/servlet/resources/web-common_6_0.xsd

+7-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
66
elementFormDefault="qualified"
77
attributeFormDefault="unqualified"
8-
version="5.1">
8+
version="6.0">
99
<xsd:annotation>
1010
<xsd:documentation>
1111

12-
Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
12+
Copyright (c) 2009, 2021 Oracle and/or its affiliates and others.
13+
All rights reserved.
1314

1415
This program and the accompanying materials are made available under the
1516
terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,7 +30,7 @@
2930
<xsd:annotation>
3031
<xsd:documentation>
3132
<![CDATA[
32-
This is the common XML Schema for the Servlet 5.1 deployment descriptor.
33+
This is the common XML Schema for the Servlet 6.0 deployment descriptor.
3334
This file is in turn used by web.xml and web-fragment.xml
3435
web application's war file. All Servlet deployment descriptors
3536
must indicate the web common schema by using the Jakarta EE
@@ -43,15 +44,15 @@
4344
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
4445
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4546
xsi:schemaLocation="..."
46-
version="5.1">
47+
version="6.0">
4748
...
4849
</web-app>
4950
5051
The instance documents may indicate the published version of
5152
the schema using the xsi:schemaLocation attribute for Jakarta EE
5253
namespace with the following location:
5354
54-
https://jakarta.ee/xml/ns/jakartaee/web-common_5_1.xsd
55+
https://jakarta.ee/xml/ns/jakartaee/web-common_6_0.xsd
5556
5657
]]>
5758
</xsd:documentation>
@@ -1181,7 +1182,7 @@
11811182
</xsd:documentation>
11821183
</xsd:annotation>
11831184
<xsd:restriction base="xsd:token">
1184-
<xsd:enumeration value="5.1"/>
1185+
<xsd:enumeration value="6.0"/>
11851186
</xsd:restriction>
11861187
</xsd:simpleType>
11871188

api/src/main/resources/jakarta/servlet/resources/web-fragment_5_1.xsd renamed to api/src/main/resources/jakarta/servlet/resources/web-fragment_6_0.xsd

+7-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
66
elementFormDefault="qualified"
77
attributeFormDefault="unqualified"
8-
version="5.1">
8+
version="6.0">
99
<xsd:annotation>
1010
<xsd:documentation>
1111

12-
Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
12+
Copyright (c) 2009, 2021 Oracle and/or its affiliates and others.
13+
All rights reserved.
1314

1415
This program and the accompanying materials are made available under the
1516
terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,7 +30,7 @@
2930
<xsd:annotation>
3031
<xsd:documentation>
3132
<![CDATA[
32-
This is the XML Schema for the Servlet 5.1 deployment descriptor.
33+
This is the XML Schema for the Servlet 6.0 deployment descriptor.
3334
The deployment descriptor must be named "META-INF/web-fragment.xml"
3435
in the web fragment's jar file. All Servlet deployment descriptors
3536
must indicate the web application schema by using the Jakarta EE
@@ -43,15 +44,15 @@
4344
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"
4445
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4546
xsi:schemaLocation="..."
46-
version="5.1">
47+
version="6.0">
4748
...
4849
</web-fragment>
4950
5051
The instance documents may indicate the published version of
5152
the schema using the xsi:schemaLocation attribute for Jakarta EE
5253
namespace with the following location:
5354
54-
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_1.xsd
55+
https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd
5556
5657
]]>
5758
</xsd:documentation>
@@ -75,7 +76,7 @@
7576
</xsd:documentation>
7677
</xsd:annotation>
7778

78-
<xsd:include schemaLocation="web-common_5_1.xsd"/>
79+
<xsd:include schemaLocation="web-common_6_0.xsd"/>
7980

8081

8182
<!-- **************************************************** -->

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -28,7 +28,7 @@
2828

2929
<groupId>jakarta.servlet</groupId>
3030
<artifactId>servlet-parent</artifactId>
31-
<version>5.1.0-SNAPSHOT</version>
31+
<version>6.0.0-SNAPSHOT</version>
3232
<packaging>pom</packaging>
3333

3434
<name>Jakarta Servlet Parent</name>

spec/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2019, 2020 Contributors to the Eclipse Foundation.
4+
Copyright (c) 2019, 2021 Contributors to the Eclipse Foundation.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>jakarta.servlet</groupId>
2424
<artifactId>servlet-parent</artifactId>
25-
<version>5.1.0-SNAPSHOT</version>
25+
<version>6.0.0-SNAPSHOT</version>
2626
</parent>
2727

2828
<artifactId>servlet-spec</artifactId>

spec/src/main/asciidoc/license-efsl.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The notice is:
5757
"Copyright © 2018, 2020 Eclipse Foundation. This software or document
5858
includes material copied from or derived from
5959
Jakarta ® Servlet
60-
\https://jakarta.ee/specifications/servlet/5.1/"
60+
\https://jakarta.ee/specifications/servlet/6.0/"
6161

6262
==== Disclaimers
6363

spec/src/main/asciidoc/servlet-spec-body.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
:xrefstyle: full
2-
:spec-version: 5.1
3-
:spec-version-underscore: 5_1
2+
:spec-version: 6.0
3+
:spec-version-underscore: 6_0
44

55
:sectnums!:
66
== Jakarta Servlet Specification, Version {spec-version}
77

8-
Copyright (c) 2020 Contributors to the Eclipse Foundation.
8+
Copyright (c) 2021 Contributors to the Eclipse Foundation.
99

1010
Eclipse is a registered trademark of the Eclipse Foundation. Jakarta
1111
is a trademark of the Eclipse Foundation. Oracle and Java are

0 commit comments

Comments
 (0)