From a9992cdb6748008a3ee796f058d2142263a0f13e Mon Sep 17 00:00:00 2001
From: Marc Sladek <marc@sladek.dev>
Date: Fri, 10 Jul 2026 17:15:26 +0200
Subject: [PATCH 1/2] Replace UriBuilder jakarta JAX-RS with Spring variant

---
 pom.xml                                       |  5 ----
 .../com/celements/web/service/UrlService.java |  7 ------
 .../web/service/XWikiUrlService.java          | 15 ------------
 .../web/service/XWikiUrlServiceTest.java      | 24 -------------------
 4 files changed, 51 deletions(-)

diff --git a/pom.xml b/pom.xml
index 131249d6c..63cc0ea71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,11 +132,6 @@
       <artifactId>javax.ws.rs-api</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>jakarta.ws.rs</groupId>
-      <artifactId>jakarta.ws.rs-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-common</artifactId>
diff --git a/src/main/java/com/celements/web/service/UrlService.java b/src/main/java/com/celements/web/service/UrlService.java
index 942a4bc66..595b4c249 100644
--- a/src/main/java/com/celements/web/service/UrlService.java
+++ b/src/main/java/com/celements/web/service/UrlService.java
@@ -21,7 +21,6 @@
 
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
-import javax.ws.rs.core.UriBuilder;
 
 import org.xwiki.component.annotation.ComponentRole;
 import org.xwiki.model.reference.EntityReference;
@@ -53,10 +52,4 @@ public String getURL(@NotNull EntityReference ref, @Nullable String action,
   public String getExternalURL(@NotNull EntityReference ref, @Nullable String action,
       @Nullable String queryString);
 
-  @NotNull
-  UriBuilder createURIBuilder(@NotNull EntityReference ref);
-
-  @NotNull
-  UriBuilder createURIBuilder(@NotNull EntityReference ref, @Nullable String action);
-
 }
diff --git a/src/main/java/com/celements/web/service/XWikiUrlService.java b/src/main/java/com/celements/web/service/XWikiUrlService.java
index ae0142e55..765bf6956 100644
--- a/src/main/java/com/celements/web/service/XWikiUrlService.java
+++ b/src/main/java/com/celements/web/service/XWikiUrlService.java
@@ -67,21 +67,6 @@ public String getExternalURL(EntityReference ref, String action, String queryStr
     return createURLObject(ref, action, queryString).toExternalForm();
   }
 
-  @Override
-  public UriBuilder createURIBuilder(EntityReference ref) {
-    return createURIBuilder(ref, null);
-  }
-
-  @Override
-  public UriBuilder createURIBuilder(EntityReference ref, String action) {
-    checkArgument(ref != null, "reference may not be null");
-    try {
-      return UriBuilder.fromUri(createURLObject(ref, action, null).toURI());
-    } catch (URISyntaxException exc) {
-      throw new IllegalArgumentException("illegal reference provided: " + ref, exc);
-    }
-  }
-
   private URL createURLObject(EntityReference ref, String action, String queryString) {
     URL url;
     String wikiName = extractName(ref, EntityType.WIKI);
diff --git a/src/test/java/com/celements/web/service/XWikiUrlServiceTest.java b/src/test/java/com/celements/web/service/XWikiUrlServiceTest.java
index 1ac809bf3..da0de60eb 100644
--- a/src/test/java/com/celements/web/service/XWikiUrlServiceTest.java
+++ b/src/test/java/com/celements/web/service/XWikiUrlServiceTest.java
@@ -166,30 +166,6 @@ protected void execute() throws IllegalArgumentException {
     verifyDefault();
   }
 
-  @Test
-  public void test_createURIBuilder() throws Exception {
-    String url = "http://wiki.celements.com/space/page";
-    expect(urlFactoryMock.createURL("space", "page", "view", null, null, "wiki",
-        getContext())).andReturn(new URL(url));
-
-    replayDefault();
-    assertEquals(url, service.createURIBuilder(docRef).build().toString());
-    verifyDefault();
-  }
-
-  @Test
-  public void test_createURIBuilder_null() throws Exception {
-    replayDefault();
-    new ExceptionAsserter<IllegalArgumentException>(IllegalArgumentException.class) {
-
-      @Override
-      protected void execute() throws IllegalArgumentException {
-        service.createURIBuilder(null);
-      }
-    }.evaluate();
-    verifyDefault();
-  }
-
   @Test
   public void test_createURLObject_notEmptyForContentWebHome() throws Exception {
     EntityReference docRefContentWebHome = new DocumentReference(getContext().getDatabase(),

From 695c5c0a24798698630c0588da6256e8d8038df9 Mon Sep 17 00:00:00 2001
From: Marc Sladek <marc@sladek.dev>
Date: Sun, 12 Jul 2026 13:36:07 +0200
Subject: [PATCH 2/2] remove WebUtilsService xcontext clone

---
 pom.xml                                                      | 5 -----
 src/main/java/com/celements/web/service/WebUtilsService.java | 5 +----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 63cc0ea71..0a10c7219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,11 +181,6 @@
       <artifactId>celements-shared-tests</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-shared-tests</artifactId>
-      <scope>test</scope>
-    </dependency>
     <!-- JTidy Has been picked up at https://github.com/jtidy/jtidy and immediately was reabandoned.
       However their release from Dec 2019 has at least some HTML5 support -->
     <dependency>
diff --git a/src/main/java/com/celements/web/service/WebUtilsService.java b/src/main/java/com/celements/web/service/WebUtilsService.java
index af7c451c3..f3c83900d 100644
--- a/src/main/java/com/celements/web/service/WebUtilsService.java
+++ b/src/main/java/com/celements/web/service/WebUtilsService.java
@@ -357,10 +357,7 @@ public XWikiMessageTool getMessageTool(String adminLanguage) {
         if (bundle == null) {
           bundle = ResourceBundle.getBundle("ApplicationResources");
         }
-        XWikiContext adminContext = (XWikiContext) getContext().clone();
-        adminContext.putAll(getContext());
-        adminContext.setLanguage(adminLanguage);
-        return new XWikiMessageTool(bundle, adminContext);
+        return new XWikiMessageTool(bundle, getContext(), adminLanguage);
       }
     } else {
       return null;