Drop syntax config and remove unsed xwiki-core-rendering-xwiki dependency

celements-component/pom.xml

@@ -74,16 +74,6 @@
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-core-shared-tests</artifactId>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- This dependency introduces a cycle:
             ->{celements-common-test, celements-xwiki-core, celements-component}

celements-xwiki-core/pom.xml

@@ -82,6 +82,12 @@
       <version>7.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.celements</groupId>
+      <artifactId>celements-xwiki-xml</artifactId>
+      <version>7.0-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-servlet</artifactId>
@@ -155,12 +161,6 @@
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
     </dependency>
-    <dependency>
-      <!-- needs to be removed in favor of sl4j -->
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-    </dependency>
 
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
@@ -201,10 +201,6 @@
     </dependency>
 
     <!-- Other XWiki modules -->
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-xml</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-core-script</artifactId>
@@ -213,10 +209,6 @@
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-core-bridge</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-rendering-xwiki</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-core-cache-api</artifactId>
@@ -243,20 +235,6 @@
       <artifactId>xwiki-core-captcha</artifactId>
     </dependency>
 
-    <!-- XWiki syntax parsers -->
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-rendering-syntax-wikimodel</artifactId>
-      <!-- Only needed at runtime since it's a component implementation -->
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-core-rendering-syntax-xwiki10</artifactId>
-      <!-- Only needed at runtime since it's a component implementation -->
-      <scope>runtime</scope>
-    </dependency>
-
     <!-- The JRCS JARS are are in our repo till we get them published on the central repository.
          JRCS home page: http://www.suigeneris.org/kb/display/jrcs/JRCS+Home -->
     <dependency>

celements-xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java

@@ -261,11 +261,6 @@ public class XWiki implements EventListener {
    */
   private static File tempDir = null;
 
-  /**
-   * List of configured syntax ids.
-   */
-  private List<String> configuredSyntaxes;
-
   /**
    * Used to convert a proper Document Reference to string (standard form).
    */
@@ -405,10 +400,6 @@ protected void initXWiki() throws XWikiException {
     this.isReadOnly = ("yes".equalsIgnoreCase(ro) || "true".equalsIgnoreCase(ro)
         || "1".equalsIgnoreCase(ro));
 
-    // Save the configured syntaxes
-    String syntaxes = Param("xwiki.rendering.syntaxes", "xwiki/1.0");
-    this.configuredSyntaxes = Arrays.asList(StringUtils.split(syntaxes, " ,"));
-
     Utils.getComponent(ObservationManager.class).addListener(this);
 
     LOGGER.debug("XWiki init done");
@@ -5472,17 +5463,20 @@ private void replaceAttachmentInPlace(XWikiDocument doc, XWikiAttachment attachm
   /**
    * @return the ids of configured syntaxes for this wiki (eg "xwiki/1.0", "xwiki/2.0",
    *         "mediawiki/1.0", etc)
+   * @deprecated since 7.0 only syntax10 support in the future
    */
+  @Deprecated(since = "7.0.", forRemoval = true)
   public List<String> getConfiguredSyntaxes() {
-    return this.configuredSyntaxes;
+    return List.of(Syntax.XWIKI_1_0.toIdString());
   }
 
   /**
    * @return the syntax id of the syntax to use when creating new documents.
+   * @deprecated since 7.0 only syntax10 support in the future
    */
+  @Deprecated(since = "7.0.", forRemoval = true)
   public String getDefaultDocumentSyntax() {
-    // TODO: Fix this method to return a Syntax object instead of a String
-    return Utils.getComponent(CoreConfiguration.class).getDefaultDocumentSyntax().toIdString();
+    return Syntax.XWIKI_1_0.toIdString();
   }
 
   /**

celements-xwiki-core/src/main/java/com/xpn/xwiki/api/XWiki.java

@@ -2724,7 +2724,9 @@ public CriteriaService getCriteriaService() {
   /**
    * @return the ids of configured syntaxes for this wiki (eg "xwiki/1.0", "xwiki/2.0",
    *         "mediawiki/1.0", etc)
+   * @deprecated since 7.0 only syntax10 support in the future
    */
+  @Deprecated(since = "7.0.", forRemoval = true)
   public List<String> getConfiguredSyntaxes() {
     return this.xwiki.getConfiguredSyntaxes();
   }