Merge branch 'master' into dependabot/maven/org.jruby-jruby-complete-…

…9.4.0.0
jakartaee · Nov 7, 2024 · 4c5934e · 4c5934e
2 parents 6a57693 + c6354d1
commit 4c5934e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -2,9 +2,21 @@ version: 2
 updates:
   - package-ecosystem: "maven"
     directory: "/"
+    target-branch: "master"
     schedule:
       interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
+    target-branch: "master"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "maven"
+    directory: "/"
+    target-branch: "6.1.x"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "6.1.x"
     schedule:
       interval: "weekly"
diff --git a/api/pom.xml b/api/pom.xml
@@ -93,13 +93,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.11.0</version>
+            <version>5.11.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.11.0</version>
+            <version>5.11.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -177,7 +177,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.5.1</version>
             </plugin>
 
             <!-- Checks copyright / license headers -->        

diff --git a/api/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java b/api/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
@@ -284,7 +284,7 @@ public void login(String username, String password) throws ServletException {
     }
 
     /**
-     * The default behavior of this method is to call login on the wrapped request object.
+     * The default behavior of this method is to call logout on the wrapped request object.
      *
      * @since Servlet 3.0
      */

diff --git a/spec/pom.xml b/spec/pom.xml
@@ -35,7 +35,7 @@
         <site.output.dir>${project.build.directory}/staging</site.output.dir>
         <maven.site.skip>true</maven.site.skip>
         <asciidoctorj.version>3.0.0</asciidoctorj.version>
-        <asciidoctorj.pdf.version>2.3.18</asciidoctorj.pdf.version>
+        <asciidoctorj.pdf.version>2.3.19</asciidoctorj.pdf.version>
         <jruby.version>9.4.0.0</jruby.version>
         <!-- status: DRAFT, BETA, etc., or blank for final -->
         <status>DRAFT</status>

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -104,7 +104,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.11.0</version>
+                <version>5.11.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/...ain/java/servlet/tck/pluggability/api/jakarta_servlet/registration/RegistrationTests.java b/...ain/java/servlet/tck/pluggability/api/jakarta_servlet/registration/RegistrationTests.java
@@ -21,6 +21,7 @@
 
 import servlet.tck.api.jakarta_servlet.registration.TestListener;
 import servlet.tck.api.jakarta_servlet.registration.TestServlet;
+import servlet.tck.api.jakarta_servlet.servletcontext30.AddFilterString;
 import servlet.tck.api.jakarta_servlet.servletcontext30.AddServletString;
 import servlet.tck.api.jakarta_servlet.servletcontext30.AddServletClass;
 import servlet.tck.api.jakarta_servlet.servletcontext30.AddServletNotFound;
@@ -56,7 +57,7 @@ public void setupServletName() throws Exception {
   public static WebArchive getTestArchive() throws Exception {
     JavaArchive javaArchive = ShrinkWrap.create(JavaArchive.class, "fragment-1.jar")
             .addClasses(TestServlet1.class, RequestListener1.class, AddServletString.class, AddServletClass.class,
-                    AddFilterClass.class, CreateServlet.class, CreateFilter.class, AddServletNotFound.class,
+                    AddFilterString.class, AddFilterClass.class, CreateServlet.class, CreateFilter.class, AddServletNotFound.class,
                     AddFilterNotFound.class, BadServlet.class, BadFilter.class, BadListener.class)
             .addAsResource(RegistrationTests.class.getResource("servlet_plu_registration_web-fragment.xml"),
                     "META-INF/web-fragment.xml");