Merge 6.1.0 release into master (#654)

* Prepare release jakarta.servlet:servlet-parent:6.1.0 * Prepare next development cycle for 6.1.1-SNAPSHOT * Update lingering 6.1.0 references (#655) Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee> --------- Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee> Co-authored-by: Eclipse Servlet Bot <servlet-bot@eclipse.org>
jakartaee · Jun 16, 2024 · 8130fc7 · 8130fc7
1 parent bb680b8
commit 8130fc7
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>jakarta.servlet</groupId>
     <artifactId>jakarta.servlet-api</artifactId>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
 
     <name>Jakarta Servlet</name>
     <url>https://projects.eclipse.org/projects/ee4j.servlet</url>
@@ -219,7 +219,7 @@
                         <supportedProjectType>jar</supportedProjectType>
                     </supportedProjectTypes>
                     <instructions>
-                        <Bundle-Version>6.1.0</Bundle-Version>
+                        <Bundle-Version>6.1.1</Bundle-Version>
                         <Bundle-SymbolicName>jakarta.servlet-api</Bundle-SymbolicName>
                         <Bundle-Description>
                             Jakarta Servlet 6.1

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>jakarta.servlet</groupId>
     <artifactId>servlet-parent</artifactId>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Jakarta Servlet Parent</name>

diff --git a/spec/pom.xml b/spec/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>jakarta.servlet</groupId>
         <artifactId>servlet-parent</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>servlet-spec</artifactId>

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>jakarta.tck</groupId>
     <artifactId>servlet-tck</artifactId>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Jakarta Servlet TCK</name>

diff --git a/tck/tck-dist/pom.xml b/tck/tck-dist/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>servlet-tck</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>servlet-tck-dist</artifactId>

diff --git a/tck/tck-docs/userguide/pom.xml b/tck/tck-docs/userguide/pom.xml
@@ -28,7 +28,7 @@
     <groupId>jakarta.tck</groupId>
     <artifactId>servlet-tck-docs</artifactId>
     <packaging>pom</packaging>
-    <version>6.1.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Servlet for Jakarta EE, Release 6.1</name>
 
     <properties>

diff --git a/tck/tck-runtime/pom.xml b/tck/tck-runtime/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>servlet-tck</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>servlet-tck-runtime</artifactId>
@@ -34,7 +34,7 @@
 
     <properties>
         <shrinkwrap-resolver.version>3.3.0</shrinkwrap-resolver.version>
-        <servlet.api.version>6.1.0-SNAPSHOT</servlet.api.version>
+        <servlet.api.version>6.1.1-SNAPSHOT</servlet.api.version>
     </properties>
 
     <dependencies>

diff --git a/tck/tck-util/pom.xml b/tck/tck-util/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>servlet-tck</artifactId>
-        <version>6.1.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>servlet-tck-util</artifactId>