celements · fpichler · Mar 3, 2026 · Feb 4, 2026 · Feb 5, 2026 · Feb 8, 2026
diff --git a/celements-xwiki-core/pom.xml b/celements-xwiki-core/pom.xml
@@ -76,6 +76,12 @@
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.celements</groupId>
+      <artifactId>celements-xwiki-rendering-api</artifactId>
+      <version>7.0-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-servlet</artifactId>
@@ -197,15 +203,15 @@
     <!-- Other XWiki modules -->
     <dependency>
       <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-script</artifactId>
+      <artifactId>xwiki-core-xml</artifactId>
     </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-bridge</artifactId>
+      <artifactId>xwiki-core-script</artifactId>
     </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-rendering-api</artifactId>
+      <artifactId>xwiki-core-bridge</artifactId>
     </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/content/parsers/DocumentParser.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/content/parsers/DocumentParser.java
@@ -28,7 +28,6 @@
 
 /**
  * Parse document source content as typed by the user.
- *
  * <p>
  * Note: This is a very basic parser which currently only parses wiki links. It should probably
  * not be developed further. Instead we should migrate to a proper parser such as

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/content/parsers/LinkParser.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/content/parsers/LinkParser.java
@@ -88,7 +88,6 @@ public Link parse(String contentToParse) throws ContentParserException {
 
   /**
    * Find out the alias part of the full link.
-   *
    * <p>
    * Note: As it's possible to specify a target we need a way to differentiate the following
    * 2 links:
@@ -131,7 +130,6 @@ protected void parseAlias(StringBuffer content, Link link) {
 
   /**
    * Find out the target part of the full link.
-   *
    * <p>
    * Note: The target element must start with an underscore ("_"). See
    * {@link #parseAlias(StringBuffer, Link)} for more details as to why.

diff --git a/...-xwiki-core/src/main/java/com/xpn/xwiki/content/parsers/RenamePageReplaceLinkHandler.java b/...-xwiki-core/src/main/java/com/xpn/xwiki/content/parsers/RenamePageReplaceLinkHandler.java
@@ -30,7 +30,6 @@ public class RenamePageReplaceLinkHandler implements ReplaceLinkHandler {
 
   /**
    * {@inheritDoc}
-   *
    * <p>
    * Two links are equal if they point to the same document and within the same location
    * in that document.
@@ -74,7 +73,6 @@ public boolean compare(Link linkToLookFor, Link linkToReplace) {
 
   /**
    * {@inheritDoc}
-   *
    * <p>
    * Keep the query string, alias and target in the link to replace if they are not
    * specified in the new link.

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java
@@ -56,7 +56,8 @@ public boolean hasEqualsObjectsFromClass(XWikiDocument newdoc, XWikiDocument old
     }
     for (int i = 0; i < vobj1.size(); i++) {
       if (((vobj1.get(i) != null) || (vobj2.get(i) != null))) {
-        if ((vobj1.get(i) == null) || (vobj2.get(i) == null) || !vobj1.get(i).equals(vobj2.get(i))) {
+        if ((vobj1.get(i) == null) || (vobj2.get(i) == null)
+            || !vobj1.get(i).equals(vobj2.get(i))) {
           return false;
         }
       }

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/objects/BaseStringProperty.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/objects/BaseStringProperty.java
@@ -23,7 +23,6 @@
 
 /**
  * Base string XProperty which all types of string XProperties extend.
- *
  * $Id$
  */
 public class BaseStringProperty extends BaseProperty {

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/objects/ElementComparator.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/objects/ElementComparator.java
@@ -27,7 +27,6 @@
 
 /**
  * Compare and sort instances of ElementInterface by name.
- *
  */
 public class ElementComparator implements Comparator {
 

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/fileupload/FileUploadPlugin.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/fileupload/FileUploadPlugin.java
@@ -110,7 +110,6 @@ public class FileUploadPlugin extends XWikiDefaultPlugin implements XWikiPluginI
    *          the plugin classname (used in logs for example)
    * @param context
    *          the XWiki Context
-   *
    * @see XWikiDefaultPlugin#XWikiDefaultPlugin(String,String,com.xpn.xwiki.XWikiContext)
    */
   public FileUploadPlugin(String name, String className, XWikiContext context) {

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/fileupload/FileUploadPluginApi.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/fileupload/FileUploadPluginApi.java
@@ -31,7 +31,6 @@
 /**
  * Plugin that offers access to uploaded files. The uploaded files are automatically parsed and
  * preserved as a list of {@link org.apache.commons.fileupload.FileItem}s.
- *
  * This is the wrapper accessible from in-document scripts.
  *
  * @version $Id$

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/ldap/XWikiLDAPConnection.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/ldap/XWikiLDAPConnection.java
@@ -394,7 +394,6 @@ protected void ldapToXWikiAttribute(List<XWikiLDAPSearchAttribute> searchAttribu
 
   /**
    * Fully escape DN value (the part after the =).
-   *
    * <p>
    * For example, for the dn value "Acme, Inc", the escapeLDAPDNValue method
    * returns "Acme\, Inc".

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/packaging/DocumentInfoAPI.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/packaging/DocumentInfoAPI.java
@@ -58,7 +58,6 @@ public String getFullName() {
 
   /**
    * @return the language of the described document
-   *
    * @since 2.2M1
    */
   public String getLanguage() {

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/packaging/PackageAPI.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/packaging/PackageAPI.java
@@ -217,12 +217,10 @@ public String export() throws IOException, XWikiException {
    *
    * @param data
    *          the file to create the package from, as a byte array.
-   *
    * @return true if the package creation succeeded, false otherwise. If the package creation
    *         failed,
    *         the error message is placed in the velocity context under the <code>import_error</code>
    *         key,
-   *
    * @since 2.2M1
    */
   public boolean importPackageFromByteArray(byte data[]) {
@@ -288,7 +286,6 @@ public String toXml() {
 
   /**
    * @return a representation of this package under the JSON format
-   *
    * @since 2.2M1
    */
   public JSONObject toJSON() {

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerPlugin.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerPlugin.java
@@ -71,7 +71,6 @@ public class ZipExplorerPlugin extends XWikiDefaultPlugin {
    *          the plugin classname (used in logs for example)
    * @param context
    *          the XWiki Context
-   *
    * @see XWikiDefaultPlugin#XWikiDefaultPlugin(String,String,com.xpn.xwiki.XWikiContext)
    */
   public ZipExplorerPlugin(String name, String className, XWikiContext context) {

diff --git a/...ments-xwiki-core/src/main/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerPluginAPI.java b/...ments-xwiki-core/src/main/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerPluginAPI.java
@@ -107,7 +107,6 @@ public List<String> getFileList(Document document, String attachmentName) {
    *   { id = &quot;Directory/&quot;, value = &quot;Directory&quot;, parent = &quot;&quot;}
    *   { id = &quot;Directory/File.txt&quot;, value = &quot;File.txt&quot;, parent = &quot;Directory/&quot;}
    *   { id = &quot;File2.txt&quot;, value = &quot;File2.txt&quot;, parent = &quot;&quot;}
-   *
    * </pre>
    *
    * @param document

diff --git a/celements-xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java b/celements-xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
@@ -101,7 +101,6 @@ public synchronized void initHibernate() throws HibernateException {
    *
    * @param context
    * @return
-   *
    * @deprecated since 6.0 instead use {@link #getSession()}
    */
   @Deprecated
@@ -126,7 +125,6 @@ public Session getSession() {
    *
    * @param session
    * @param context
-   *
    * @deprecated since 6.0 instead use {@link #setSession(Session)}
    */
   @Deprecated
@@ -152,7 +150,6 @@ public void setSession(Session session) {
    *
    * @param context
    * @return
-   *
    * @deprecated since 6.0 instead use {@link #getTransaction()}
    */
   @Deprecated
@@ -172,7 +169,6 @@ public Transaction getTransaction() {
    *
    * @param transaction
    * @param context
-   *
    * @deprecated since 6.0 instead use {@link #setTransaction(Transaction)}
    */
   @Deprecated
@@ -196,7 +192,6 @@ public void setTransaction(Transaction transaction) {
    *
    * @param context
    * @throws HibernateException
-   *
    * @deprecated since 6.0 instead use {@link #updateSchema(String)}
    */
   @Deprecated
@@ -220,7 +215,6 @@ public void updateSchema(WikiReference wikiRef) throws HibernateException {
    * @param force
    *          defines wether or not to force the update despite the xwiki.cfg settings
    * @throws HibernateException
-   *
    * @deprecated since 6.0 instead use {@link #updateSchema(String, boolean)}
    */
   @Deprecated
@@ -268,7 +262,6 @@ public synchronized void updateSchema(WikiReference wikiRef, boolean force)
    * @param context
    *          the XWiki context.
    * @return the database/schema name.
-   *
    * @deprecated since 6.0 instead use {@link #getSchemaFromWikiName(String)}
    */
   @Deprecated
@@ -312,7 +305,6 @@ public String getSchemaFromWikiName(WikiReference wikiRef) {
    *          the XWiki context.
    * @return the database/schema name.
    * @since XWiki Core 1.1.2, XWiki Core 1.2M2
-   *
    * @deprecated since 6.0 instead use {@link #getSchemaFromWikiName(String)}
    */
   @Deprecated
@@ -329,7 +321,6 @@ protected String getSchemaFromWikiName(XWikiContext context) {
    * @param context
    * @return
    * @throws HibernateException
-   *
    * @deprecated since 6.0 instead use {@link #getSchemaUpdateScript(Configuration, String)}
    */
   @Deprecated
@@ -420,7 +411,6 @@ private void updateSchema(String[] createSQL, WikiReference wikiRef) {
    *
    * @param context
    * @throws HibernateException
-   *
    * @deprecated since 6.0 instead use {@link #checkHibernate(String)}
    */
   @Deprecated
@@ -432,7 +422,6 @@ public void checkHibernate(XWikiContext context) throws HibernateException {
    * Initializes hibernate and calls updateSchema if necessary
    *
    * @throws HibernateException
-   *
    * @deprecated noop, bootstrap ensures hibernate is initialized
    */
   @Deprecated(since = "6.5")
@@ -447,7 +436,6 @@ public void checkHibernate() throws HibernateException {
    * @param context
    *          the XWiki context.
    * @return true if multi-wiki, false otherwise.
-   *
    * @deprecated since 6.0 instead use xwikiCfg.isVirtualMode()
    */
   @Deprecated
@@ -461,7 +449,6 @@ protected boolean isVirtual(XWikiContext context) {
    * @param session
    * @param context
    * @throws XWikiException
-   *
    * @deprecated since 6.0 instead use {@link #setDatabase(Session, String)}
    */
   @Deprecated
@@ -522,7 +509,6 @@ private String getCurrentSchema(Connection connection) {
    * @param context
    *          the XWiki context to get database engine identifier
    * @return the escaped version
-   *
    * @deprecated since 6.0 instead use {@link #escapeSchema(String)}
    */
   @Deprecated
@@ -546,7 +532,6 @@ protected String escapeSchema(String schema) {
 
   /**
    * Begins a transaction for the current database
-   *
    */
   public boolean beginTransaction() throws HibernateException, XWikiException {
     try {
@@ -564,7 +549,6 @@ public boolean beginTransaction() throws HibernateException, XWikiException {
    * @param context
    * @return
    * @throws XWikiException
-   *
    * @Deprecated since 6.0 instead use {@link #beginTransaction(String)}
    */
   @Deprecated
@@ -577,7 +561,6 @@ public boolean beginTransaction(XWikiContext context) throws XWikiException {
    *
    * @throws HibernateException
    * @throws XWikiException
-   *
    */
   public boolean beginTransaction(@Nullable WikiReference wikiRef)
       throws HibernateException, WikiMissingException, XWikiException {
@@ -591,7 +574,6 @@ public boolean beginTransaction(@Nullable WikiReference wikiRef)
    * @param context
    * @return
    * @throws XWikiException
-   *
    * @Deprecated since 6.0 instead use {@link #beginTransaction(String)}
    */
   @Deprecated
@@ -608,7 +590,6 @@ public boolean beginTransaction(boolean withTransaction, XWikiContext context)
    * @param context
    * @return
    * @throws XWikiException
-   *
    * @Deprecated since 6.0 instead use {@link #beginTransaction(SessionFactory, String)}
    */
   @Deprecated
@@ -625,7 +606,6 @@ public boolean beginTransaction(SessionFactory sfactory, boolean withTransaction
    * @return
    * @throws HibernateException
    * @throws XWikiException
-   *
    * @Deprecated since 6.0 instead use {@link #beginTransaction(SessionFactory, String)}
    */
   @Deprecated
@@ -645,7 +625,6 @@ public boolean beginTransaction(SessionFactory sfactory, XWikiContext context)
    *
    * @throws HibernateException
    * @throws XWikiException
-   *
    */
   public boolean beginTransaction(
       @Nullable SessionFactory sfactory,
@@ -676,7 +655,6 @@ public boolean beginTransaction(
    * @param context
    * @param commit
    *          should we commit or not
-   *
    * @Deprecated since 6.0 instead use {@link #endTransaction(boolean)}
    */
   @Deprecated
@@ -691,7 +669,6 @@ public void endTransaction(XWikiContext context, boolean commit, boolean withTra
    * @param commit
    *          should we commit or not
    * @throws HibernateException
-   *
    * @Deprecated since 6.0 instead use {@link #endTransaction(boolean)}
    */
   @Deprecated
@@ -852,7 +829,6 @@ public interface HibernateCallback<T> {
    *          - callback to execute
    * @throws XWikiException
    *           if any error
-   *
    * @Deprecated since 6.0 instead use {@link #execute(String, boolean, boolean, HibernateCallback)}
    */
   @Deprecated
@@ -919,7 +895,6 @@ public <T> T execute(WikiReference wikiRef, boolean bTransaction, boolean doComm
    *           if any error
    * @see #execute(XWikiContext, boolean, boolean,
    *      com.xpn.xwiki.store.XWikiHibernateBaseStore.HibernateCallback)
-   *
    * @Deprecated since 6.0 instead use {@link #executeRead(String, boolean, HibernateCallback)}
    */
   @Deprecated
@@ -959,7 +934,6 @@ public <T> T executeRead(WikiReference wikiRef, boolean bTransaction, HibernateC
    *           if any error
    * @see #execute(XWikiContext, boolean, boolean,
    *      com.xpn.xwiki.store.XWikiHibernateBaseStore.HibernateCallback)
-   *
    * @Deprecated since 6.0 instead use {@link #executeWrite(String, boolean, HibernateCallback)}
    */
   @Deprecated
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,6 @@ @@
     /**
      * Parse document source content as typed by the user.
-     *
      * <p>
      * Note: This is a very basic parser which currently only parses wiki links. It should probably
      * not be developed further. Instead we should migrate to a proper parser such as
@@ Expand Down @@