This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-13168-parent-66 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-post.git
commit 6082c2296887852cbd9145e3d153f480565cb0f5 Author: Stefan Seifert <[email protected]> AuthorDate: Mon Apr 13 16:10:14 2026 +0200 SLING-13168 Update to Parent 66 and update/cleanup dependencies and testing dependencies get rid out outdated junit-addons --- .sling-module.json | 2 +- pom.xml | 16 +++------------- .../org/apache/sling/servlets/post/HtmlResponse.java | 6 +++--- .../apache/sling/servlets/post/JakartaHtmlResponse.java | 6 +++--- .../sling/servlets/post/impl/RequestPropertyTest.java | 10 +++++++--- 5 files changed, 17 insertions(+), 23 deletions(-) diff --git a/.sling-module.json b/.sling-module.json index cfad4d2..3298adb 100644 --- a/.sling-module.json +++ b/.sling-module.json @@ -1,5 +1,5 @@ { "jenkins": { - "jdks": [17, 21] + "jdks": [17, 21, 25] } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index b9a2371..cefeba7 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling-bundle-parent</artifactId> - <version>62</version> + <version>66</version> <relativePath /> </parent> @@ -102,7 +102,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>2.0.17</version> <scope>provided</scope> </dependency> <dependency> @@ -150,14 +149,13 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId> - <!-- older version not runnable with Java 14+--> - <version>4.0.0-1.62.0</version> + <version>4.1.0-1.86.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId> - <version>3.5.4</version> + <version>3.6.0</version> <scope>test</scope> </dependency> <dependency> @@ -165,16 +163,9 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>junit-addons</groupId> - <artifactId>junit-addons</artifactId> - <version>1.4</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.3.1</version> <scope>test</scope> </dependency> <dependency> @@ -217,7 +208,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.6.0</version> <executions> <execution> <goals> diff --git a/src/main/java/org/apache/sling/servlets/post/HtmlResponse.java b/src/main/java/org/apache/sling/servlets/post/HtmlResponse.java index 31652d4..b7600d3 100644 --- a/src/main/java/org/apache/sling/servlets/post/HtmlResponse.java +++ b/src/main/java/org/apache/sling/servlets/post/HtmlResponse.java @@ -139,7 +139,7 @@ public class HtmlResponse extends AbstractPostResponse { while ((read = in.read()) >= 0) { char c = (char) read; switch (state) { - // initial + // initial case 0: if (c == '$') { state = 1; @@ -147,7 +147,7 @@ public class HtmlResponse extends AbstractPostResponse { out.write(c); } break; - // $ read + // $ read case 1: if (c == '{') { state = 2; @@ -157,7 +157,7 @@ public class HtmlResponse extends AbstractPostResponse { out.write(c); } break; - // { read + // { read case 2: if (c == '}') { state = 0; diff --git a/src/main/java/org/apache/sling/servlets/post/JakartaHtmlResponse.java b/src/main/java/org/apache/sling/servlets/post/JakartaHtmlResponse.java index b08a872..fba2454 100644 --- a/src/main/java/org/apache/sling/servlets/post/JakartaHtmlResponse.java +++ b/src/main/java/org/apache/sling/servlets/post/JakartaHtmlResponse.java @@ -137,7 +137,7 @@ public class JakartaHtmlResponse extends AbstractJakartaPostResponse { while ((read = in.read()) >= 0) { char c = (char) read; switch (state) { - // initial + // initial case 0: if (c == '$') { state = 1; @@ -145,7 +145,7 @@ public class JakartaHtmlResponse extends AbstractJakartaPostResponse { out.write(c); } break; - // $ read + // $ read case 1: if (c == '{') { state = 2; @@ -155,7 +155,7 @@ public class JakartaHtmlResponse extends AbstractJakartaPostResponse { out.write(c); } break; - // { read + // { read case 2: if (c == '}') { state = 0; diff --git a/src/test/java/org/apache/sling/servlets/post/impl/RequestPropertyTest.java b/src/test/java/org/apache/sling/servlets/post/impl/RequestPropertyTest.java index 0063a74..522670e 100644 --- a/src/test/java/org/apache/sling/servlets/post/impl/RequestPropertyTest.java +++ b/src/test/java/org/apache/sling/servlets/post/impl/RequestPropertyTest.java @@ -18,13 +18,13 @@ */ package org.apache.sling.servlets.post.impl; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.Vector; -import junitx.util.PrivateAccessor; import org.apache.sling.api.SlingJakartaHttpServletRequest; import org.apache.sling.api.request.RequestParameter; import org.apache.sling.api.request.RequestParameterMap; @@ -281,8 +281,12 @@ public class RequestPropertyTest { final JakartaHtmlResponse response = new JakartaHtmlResponse(); response.setPath("/test/path"); - Map<String, RequestProperty> props = (Map<String, RequestProperty>) PrivateAccessor.invoke( - new ModifyOperation(), "collectContent", COLLECT_CLASSES, new Object[] {request, response}); + ModifyOperation modifyOperation = new ModifyOperation(); + Method collectContentMethod = + modifyOperation.getClass().getSuperclass().getDeclaredMethod("collectContent", COLLECT_CLASSES); + collectContentMethod.setAccessible(true); + Map<String, RequestProperty> props = (Map<String, RequestProperty>) + collectContentMethod.invoke(modifyOperation, new Object[] {request, response}); return props; } }
