Skip to content

Commit

Permalink
Increment version to 4.0
Browse files Browse the repository at this point in the history
The expectation is that some deprecated API elements will be removed in
the next release requiring a major version bump.
  • Loading branch information
markt-asf committed May 18, 2022
1 parent 5d66a05 commit 2c8e9c1
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 55 deletions.
4 changes: 2 additions & 2 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Jakarta Server Pages API</name>
Expand Down Expand Up @@ -76,7 +76,7 @@

<properties>
<!-- Make sure the two versions are in sync with the maven version -->
<spec.version>3.1</spec.version>
<spec.version>4.0</spec.version>
<bundle.version>${project.version}</bundle.version>
<extensionName>jakarta.servlet.jsp</extensionName>
<bundle.symbolicName>jakarta.servlet.jsp-api</bundle.symbolicName>
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/javadoc/doc-files/EFSL.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>

<p>The notice is:</p>

<p>&quot;Copyright &copy; 2018, 2020 Eclipse Foundation. This software or
<p>&quot;Copyright &copy; 2018, 2022 Eclipse Foundation. This software or
document includes material copied from or derived from
Jakarta ® Server Pages
https://jakarta.ee/specifications/pages/3.1/&quot;</p>
https://jakarta.ee/specifications/pages/4.0/&quot;</p>

<h2>Disclaimers</h2>

Expand Down
4 changes: 2 additions & 2 deletions api/src/main/javadoc/jakarta/servlet/jsp/package.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -22,7 +22,7 @@
<head>
</head>
<body bgcolor="white">
Classes and interfaces for the Core JSP 3.1 API.
Classes and interfaces for the Core JSP 4.0 API.

<p>
References in this document to JSP refer to the Jakarta Server Pages
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
Copyright (c) 1997, 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 @@

<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jsp-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Jakarta Server Pages API</name>
Expand Down
4 changes: 2 additions & 2 deletions spec/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2020 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
Expand All @@ -28,7 +28,7 @@

<groupId>jakarta.servlet.jsp</groupId>
<artifactId>server-pages-spec</artifactId>
<version>3.1-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Jakarta Server Pages Specification</name>
Expand Down
Loading

0 comments on commit 2c8e9c1

Please sign in to comment.