This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-crypto.git
commit 0ee3d33f131fcd656a37652a962b295db521a78c Author: Oliver Lietz <[email protected]> AuthorDate: Sun Mar 22 10:28:06 2026 +0100 SLING-12451 Make Encrypt plugin compatible with Http Whiteboard-based Web Console move dependency versions to POM --- pom.xml | 25 ++++++++++++++++++++++ .../EncryptWebConsolePluginHttpWhiteboardIT.java | 8 +++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b4bf7a8..68c921a 100644 --- a/pom.xml +++ b/pom.xml @@ -356,6 +356,31 @@ <version>2.7.0</version> <scope>test</scope> </dependency> + <!-- New Jetty and Webconsole --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.jetty</artifactId> + <version>5.1.32</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.servlet-api</artifactId> + <version>6.1.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.webconsole</artifactId> + <version>5.0.18</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.owasp.encoder</groupId> + <artifactId>encoder</artifactId> + <version>1.4.0</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/src/test/java/org/apache/sling/commons/crypto/it/tests/EncryptWebConsolePluginHttpWhiteboardIT.java b/src/test/java/org/apache/sling/commons/crypto/it/tests/EncryptWebConsolePluginHttpWhiteboardIT.java index c99cae1..67add13 100644 --- a/src/test/java/org/apache/sling/commons/crypto/it/tests/EncryptWebConsolePluginHttpWhiteboardIT.java +++ b/src/test/java/org/apache/sling/commons/crypto/it/tests/EncryptWebConsolePluginHttpWhiteboardIT.java @@ -32,12 +32,12 @@ public class EncryptWebConsolePluginHttpWhiteboardIT extends EncryptWebConsolePl @Configuration public Option[] configuration() { - SlingOptions.versionResolver.setVersion("org.apache.felix", "org.apache.felix.http.jetty", "5.1.26"); - SlingOptions.versionResolver.setVersion("org.apache.felix", "org.apache.felix.http.servlet-api", "3.0.0"); - SlingOptions.versionResolver.setVersion("org.apache.felix", "org.apache.felix.webconsole", "5.0.8"); + SlingOptions.versionResolver.setVersionFromProject("org.apache.felix", "org.apache.felix.http.jetty"); + SlingOptions.versionResolver.setVersionFromProject("org.apache.felix", "org.apache.felix.http.servlet-api"); + SlingOptions.versionResolver.setVersionFromProject("org.apache.felix", "org.apache.felix.webconsole"); return combine( super.configuration(), - mavenBundle().groupId("org.owasp.encoder").artifactId("encoder").version("1.3.1") + mavenBundle().groupId("org.owasp.encoder").artifactId("encoder").versionAsInProject() ); }
