Merge remote-tracking branch 'upstream/master' into jakarta-update

# Conflicts: # src/main/java/org/jruby/rack/servlet/ResponseCapture.java # src/spec/java/org/jruby/rack/fake/FakePageContext.java # src/spec/java/org/jruby/rack/mock/RackLoggingMockServletContext.java
jruby · bhagyashriSawkar · Oct 24, 2024 · Oct 24, 2024 · Oct 24, 2024 · Feb 19, 2025
commit b3f2bf40dd7ae0baad1cdd14a18d07655dcf353e
diff --git a/src/spec/java/org/jruby/rack/fake/FakePageContext.java b/src/spec/java/org/jruby/rack/fake/FakePageContext.java
@@ -160,12 +160,14 @@ public void include(String arg0, boolean arg1) throws ServletException, IOExcept
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override @Deprecated
+    @Override
+    @Deprecated // Deprecated in API parent
     public ExpressionEvaluator getExpressionEvaluator() {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override @Deprecated
+    @Override
+    @Deprecated // Deprecated in API parent
     public VariableResolver getVariableResolver() {
         throw new UnsupportedOperationException("Not supported yet.");
     }