From 6898aaf56a92c0140c7025a1f067bdc9487e4080 Mon Sep 17 00:00:00 2001
From: Vinay Vishal <vinay.vishal@oracle.com>
Date: Thu, 2 Aug 2018 10:17:26 +0530
Subject: [PATCH 1/4] Integrate jsp-api v2.3.3

---
 impl/pom.xml | 43 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/impl/pom.xml b/impl/pom.xml
index 3b6db13..69fa28a 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -130,7 +130,7 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin> 
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -158,7 +158,9 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId> 
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.0</version>
                 <configuration>
                     <archive>
                         <manifestFile>
@@ -180,7 +182,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version> 2.1 </version>
+                <version>2.1</version>
                 <configuration>
                     <includePom>true</includePom>
                 </configuration>
@@ -196,6 +198,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.1</version>
                 <executions>
                   <execution>
                     <id>attach-javadocs</id>
@@ -226,13 +229,35 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration> 
-                    <mavenExecutorId>forked-path</mavenExecutorId>
-                    <useReleaseProfile>false</useReleaseProfile> 
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-gpg-plugin</artifactId>
+                 <version>1.6</version>
+                 <executions>
+                     <execution>
+                         <id>sign-artifacts</id>
+                         <phase>verify</phase>
+                         <goals>
+                             <goal>sign</goal>
+                         </goals>
+                     </execution>
+                 </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>                           
+                <artifactId>maven-release-plugin</artifactId>                         
+                 <version>2.5.2</version>
+                <configuration>                                                       
+                    <mavenExecutorId>forked-path</mavenExecutorId>                
+                    <useReleaseProfile>false</useReleaseProfile>                  
                     <arguments>${release.arguments}</arguments>
-                </configuration> 
+                </configuration>                                                      
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.scm</groupId>
+                        <artifactId>maven-scm-provider-gitexe</artifactId>
+                        <version>1.9.4</version>
+                    </dependency>
+                </dependencies>
             </plugin>                    
         </plugins>
         <resources>
@@ -299,7 +324,7 @@
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>javax.servlet.jsp-api</artifactId>
-            <version>2.3.2-b01</version>
+            <version>2.3.3</version>
         </dependency>
 
 <!--

From ce0d5f237cb67ea6648ae1fa1ddcc2c2ae44ba21 Mon Sep 17 00:00:00 2001
From: Vinay Vishal <vinay.vishal@oracle.com>
Date: Thu, 2 Aug 2018 10:18:56 +0530
Subject: [PATCH 2/4] [maven-release-plugin] prepare release
 javax.servlet.jsp-2.3.4

---
 impl/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/impl/pom.xml b/impl/pom.xml
index 69fa28a..d507923 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -50,7 +50,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.glassfish.web</groupId>
     <artifactId>javax.servlet.jsp</artifactId>
-    <version>2.3.4-SNAPSHOT</version>
+    <version>2.3.4</version>
     <packaging>jar</packaging>
     <name>JSP implementation</name>
 
@@ -103,7 +103,7 @@
       <connection>scm:git:https://github.com/javaee/javaee-jsp-api.git</connection>
       <developerConnection>scm:git:ssh://git@github.com/javaee/javaee-jsp-api.git</developerConnection>
       <url>https://github.com/javaee/javaee-jsp-api</url>
-      <tag>HEAD</tag>
+      <tag>javax.servlet.jsp-2.3.4</tag>
     </scm>
 
     <build>

From 8d11ac0b846f7c074f7d7b2e6f107b83e964e809 Mon Sep 17 00:00:00 2001
From: Vinay Vishal <vinay.vishal@oracle.com>
Date: Thu, 2 Aug 2018 10:19:12 +0530
Subject: [PATCH 3/4] [maven-release-plugin] prepare for next development
 iteration

---
 impl/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/impl/pom.xml b/impl/pom.xml
index d507923..dbed715 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -50,7 +50,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.glassfish.web</groupId>
     <artifactId>javax.servlet.jsp</artifactId>
-    <version>2.3.4</version>
+    <version>2.3.5-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>JSP implementation</name>
 
@@ -103,7 +103,7 @@
       <connection>scm:git:https://github.com/javaee/javaee-jsp-api.git</connection>
       <developerConnection>scm:git:ssh://git@github.com/javaee/javaee-jsp-api.git</developerConnection>
       <url>https://github.com/javaee/javaee-jsp-api</url>
-      <tag>javax.servlet.jsp-2.3.4</tag>
+      <tag>HEAD</tag>
     </scm>
 
     <build>

From 1692d5bfd02f5e15fd213de25b7333d7056569b6 Mon Sep 17 00:00:00 2001
From: Vinay Vishal <vinay.vishal@oracle.com>
Date: Fri, 17 Aug 2018 13:34:43 +0530
Subject: [PATCH 4/4] Update as part of shutdown/migration process

---
 CONTRIBUTING.md | 29 +----------------------------
 README.md       |  3 +++
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7630913..cdfe614 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,30 +1,3 @@
----
+#### :warning:This project is now part of the EE4J initiative. This repository has been archived as all activities are now happening in the [corresponding Eclipse repository](https://github.com/eclipse-ee4j/jsp-api). See [here](https://www.eclipse.org/ee4j/status.php) for the overall EE4J transition status.
 
 ---
-
-# Source Code Submissions 
-We welcome your contributions and look forward to collaborating with you. We can only accept source code repository 
-submissions from users who have signed and returned the Oracle 
-Contributor Agreement. You will find details and the agreement to sign at this OTN web page: 
-[Oracle Contributor Agreement](http://www.oracle.com/technetwork/community/oca-486395.html). 
-
-# Other Contributions
-For all project Submissions other than source code repository contributions, the following also applies: Oracle does 
-not claim ownership of Your Submissions. However, in order to fulfill 
-the purposes of this project, You must give Oracle and all Users 
-the right to post, access, discuss, use, publish, disseminate, and refine 
-Your Submissions. 
-
-In legalese: *You hereby grant to Oracle and all 
-Users a royalty-free, perpetual, irrevocable, worldwide, non-exclusive, 
-and fully sub-licensable right and license, under Your intellectual 
-property rights, to reproduce, modify, adapt, publish, translate, create 
-derivative works from, distribute, perform, display, and use Your 
-Submissions (in whole or part) and to incorporate or implement them in 
-other works in any form, media, or technology now known or later 
-developed, all subject to the obligation to retain any copyright notices 
-included in Your Submissions. All Users, Oracle, and their 
-sublicensees are responsible for any modifications they make to the 
-Submissions of others.*
-
-Copyright &copy; 2017 Oracle and/or its affiliates. All rights reserved.
diff --git a/README.md b/README.md
index dbc2954..fe77f85 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+#### :warning:This project is now part of the EE4J initiative. This repository has been archived as all activities are now happening in the [corresponding Eclipse repository](https://github.com/eclipse-ee4j/jsp-api). See [here](https://www.eclipse.org/ee4j/status.php) for the overall EE4J transition status.
+ 
+---
 # Prerequisites
 
 Oracle JDK 1.7