Moved eld-doc task into x4o-driver

nx01-popcorn/pom.xml

@@ -10,7 +10,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>love.distributedrebirth.nx01</groupId>
-			<artifactId>nx01-x4o-eld-doc</artifactId>
+			<artifactId>nx01-x4o-driver</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.commonmark</groupId>

nx01-x4o-driver/src/main/resources/META-INF/x4o-drivers.xml

@@ -28,6 +28,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://language.x4o.org/xml/ns/drivers http://language.x4o.org/xml/ns/drivers-1.0.xsd"
 	>
+	<languageTask className="org.x4o.xml.eld.doc.EldDocLanguageTask"/>
 	<languageTask className="org.x4o.xml.eld.xsd.EldXsdLanguageTask"/>
 	<languageTask className="org.x4o.xml.lang.task.X4OStaticLanguageTask"/>
 	<driver language="eld" className="org.x4o.xml.eld.EldDriver"/>

nx01-x4o-eld-doc/pom.xml

@@ -1,27 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>love.distributedrebirth.nx01</groupId>
-		<artifactId>nx01</artifactId>
-		<version>〇一。壬寅。一〄-SNAPSHOT</version>
-	</parent>
-	<artifactId>nx01-x4o-eld-doc</artifactId>
-	<dependencies>
-		<dependency>
-			<groupId>love.distributedrebirth.nx01</groupId>
-			<artifactId>nx01-x4o-driver</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>love.distributedrebirth.nx01</groupId>
-			<artifactId>nx01-x4o-driver</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>

nx01-x4o-eld-doc/src/main/resources/META-INF/x4o-drivers.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2004-2014, Willem Cazander
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without modification, are permitted provided
-    that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the
-      following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
-      the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-    THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-    OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--->
-<drivers version="1.0"
-	xmlns="http://language.x4o.org/xml/ns/drivers"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://language.x4o.org/xml/ns/drivers http://language.x4o.org/xml/ns/drivers-1.0.xsd"
-	>
-	<languageTask className="org.x4o.xml.eld.doc.EldDocLanguageTask"/>
-</drivers>

nx01-x4o-tool-ant-plugin/pom.xml

@@ -10,7 +10,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>love.distributedrebirth.nx01</groupId>
-			<artifactId>nx01-x4o-eld-doc</artifactId>
+			<artifactId>nx01-x4o-driver</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>love.distributedrebirth.nx01</groupId>

nx01-x4o-tool-maven-plugin/pom.xml

@@ -13,10 +13,6 @@
 			<groupId>love.distributedrebirth.nx01</groupId>
 			<artifactId>nx01-x4o-driver</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>love.distributedrebirth.nx01</groupId>
-			<artifactId>nx01-x4o-eld-doc</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>love.distributedrebirth.nx01</groupId>
 			<artifactId>nx01-x4o-driver</artifactId>

pom.xml

@@ -48,13 +48,12 @@
 		<module>nx01-warp-fault</module>
 		<module>nx01-warp-manifestor</module>
 		<module>nx01-x4o-driver</module>
-		<module>nx01-x4o-eld-doc</module>
+		<module>nx01-x4o-fc18</module>
 		<module>nx01-x4o-meta</module>
 		<module>nx01-x4o-o2o</module>
 		<module>nx01-x4o-tool-ant-plugin</module>
 		<module>nx01-x4o-tool-maven-plugin</module>
 		<module>nx01-zerofungus-server</module>
-		<module>nx01-x4o-fc18</module>
 	</modules>
 	<dependencyManagement>
 		<dependencies>
@@ -385,11 +384,6 @@
 				<version>${project.version}</version>
 				<type>test-jar</type>
 			</dependency>
-			<dependency>
-				<groupId>love.distributedrebirth.nx01</groupId>
-				<artifactId>nx01-x4o-eld-doc</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>love.distributedrebirth.nx01</groupId>
 				<artifactId>nx01-x4o-fc18</artifactId>