Replace the xml-apis-ext dependency with separate API modules, closes #…

…15
css4j · May 1, 2021 · 856f700 · 856f700
1 parent abd6f0a
commit 856f700
Show file tree

Hide file tree

Showing 199 changed files with 4,337 additions and 185 deletions.
diff --git a/echosvg-all/build.gradle b/echosvg-all/build.gradle
@@ -1,6 +1,5 @@
 plugins {
 	id 'echosvg.java-conventions'
-	id 'de.jjohannes.extra-java-module-info'
 }
 
 dependencies {
@@ -13,12 +12,7 @@ dependencies {
 	api project(':echosvg-svgpp')
 	api project(':echosvg-ttf2svg')
 	api project(':echosvg-svgrasterizer')
-	api "xml-apis:xml-apis-ext:${xmlApisExtVersion}"
-}
-
-extraJavaModuleInfo {
-	failOnMissingModuleInfo.set(false)
-	automaticModule("xml-apis-ext-${xmlApisExtVersion}.jar", 'xml.apis.ext')
+	api project(':svgom-api')
 }
 
 description = 'io.sf.carte:echosvg-all'

diff --git a/echosvg-all/src/main/java/module-info.java b/echosvg-all/src/main/java/module-info.java
@@ -36,5 +36,5 @@
 	requires transitive io.sf.carte.echosvg.util.gui;
 	requires transitive io.sf.carte.echosvg.xml;
 	requires transitive io.sf.carte.echosvg.apps.slideshow;
-	requires xml.apis.ext;
+	requires transitive org.w3c.dom.svg;
 }
diff --git a/echosvg-anim/build.gradle b/echosvg-anim/build.gradle
@@ -1,18 +1,11 @@
 plugins {
 	id 'echosvg.java-conventions'
-	id 'de.jjohannes.extra-java-module-info'
 }
 
 dependencies {
 	api project(':echosvg-dom')
 	api project(':echosvg-parser')
 	api project(':echosvg-svg-dom')
-	api "xml-apis:xml-apis-ext:${xmlApisExtVersion}"
-}
-
-extraJavaModuleInfo {
-	failOnMissingModuleInfo.set(false)
-	automaticModule("xml-apis-ext-${xmlApisExtVersion}.jar", 'xml.apis.ext')
 }
 
 description = 'io.sf.carte:echosvg-anim'

diff --git a/echosvg-anim/src/main/java/module-info.java b/echosvg-anim/src/main/java/module-info.java
@@ -19,15 +19,13 @@
 	exports io.sf.carte.echosvg.anim;
 	exports io.sf.carte.echosvg.anim.timing;
 
-	requires io.sf.carte.echosvg.awt;
-	requires io.sf.carte.echosvg.css;
+	requires transitive io.sf.carte.echosvg.awt;
 	requires io.sf.carte.echosvg.external;
-	requires io.sf.carte.echosvg.parser;
+	requires io.sf.carte.echosvg.i18n;
+	requires io.sf.carte.echosvg.constants;
 	requires transitive io.sf.carte.echosvg.dom.svg;
 	requires io.sf.carte.css4j;
-	requires io.sf.carte.echosvg.dom;
 	requires java.desktop;
 	requires java.xml;
 	requires jdk.xml.dom;
-	requires xml.apis.ext;
 }
diff --git a/echosvg-awt-util/src/main/java/module-info.java b/echosvg-awt-util/src/main/java/module-info.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 module io.sf.carte.echosvg.awt {
-    exports io.sf.carte.echosvg.ext.awt.image.renderable;
-    exports io.sf.carte.echosvg.ext.awt;
-    exports io.sf.carte.echosvg.ext.swing;
-    exports io.sf.carte.echosvg.ext.awt.image.spi;
-    exports io.sf.carte.echosvg.ext.awt.image.rendered;
-    exports io.sf.carte.echosvg.ext.awt.image;
-    exports io.sf.carte.echosvg.ext.awt.geom;
-    exports io.sf.carte.echosvg.ext.awt.color;
-    exports io.sf.carte.echosvg.ext.awt.font;
-    exports io.sf.carte.echosvg.ext.awt.g2d;
+	exports io.sf.carte.echosvg.ext.awt.image.renderable;
+	exports io.sf.carte.echosvg.ext.awt;
+	exports io.sf.carte.echosvg.ext.swing;
+	exports io.sf.carte.echosvg.ext.awt.image.spi;
+	exports io.sf.carte.echosvg.ext.awt.image.rendered;
+	exports io.sf.carte.echosvg.ext.awt.image;
+	exports io.sf.carte.echosvg.ext.awt.geom;
+	exports io.sf.carte.echosvg.ext.awt.color;
+	exports io.sf.carte.echosvg.ext.awt.font;
+	exports io.sf.carte.echosvg.ext.awt.g2d;
 
-    requires io.sf.carte.echosvg.util;
-    requires transitive java.desktop;
-    requires xmlgraphics.commons;
+	requires transitive io.sf.carte.echosvg.util;
+	requires xmlgraphics.commons;
+	requires io.sf.carte.echosvg.i18n;
 }
diff --git a/echosvg-bridge/build.gradle b/echosvg-bridge/build.gradle
@@ -12,14 +12,13 @@ dependencies {
 		exclude group: 'xml-apis', module: 'xml-apis'
 	}
 	api "org.apache.xmlgraphics:xmlgraphics-commons:${xmlgraphicsCommonsVersion}"
-	api "xml-apis:xml-apis-ext:${xmlApisExtVersion}"
+	api project(':svgom-api')
 	implementation "org.mozilla:rhino:${rhinoVersion}"
 }
 
 extraJavaModuleInfo {
 	failOnMissingModuleInfo.set(false)
 	automaticModule("xalan-${xalanVersion}.jar", 'xalan')
-	automaticModule("xml-apis-ext-${xmlApisExtVersion}.jar", 'xml.apis.ext')
 	automaticModule("xmlgraphics-commons-${xmlgraphicsCommonsVersion}.jar", 'xmlgraphics.commons')
 	automaticModule("rhino-${rhinoVersion}.jar", 'org.mozilla.rhino')
 }

diff --git a/echosvg-bridge/src/main/java/module-info.java b/echosvg-bridge/src/main/java/module-info.java
@@ -17,19 +17,14 @@
 	exports io.sf.carte.echosvg.bridge;
 	exports io.sf.carte.echosvg.bridge.svg12;
 
-	requires io.sf.carte.echosvg.awt;
 	requires io.sf.carte.echosvg.external;
-	requires io.sf.carte.echosvg.gvt;
-	requires io.sf.carte.echosvg.script;
-	requires io.sf.carte.echosvg.dom.svg;
-	requires io.sf.carte.css4j;
-	requires io.sf.carte.echosvg.anim;
-	requires io.sf.carte.echosvg.parser;
-	requires java.desktop;
-	requires java.xml;
-	requires jdk.xml.dom;
+	requires transitive io.sf.carte.echosvg.gvt;
+	requires transitive io.sf.carte.echosvg.script;
+	requires transitive io.sf.carte.echosvg.anim;
+	requires transitive io.sf.carte.echosvg.parser;
+	requires io.sf.carte.echosvg.constants;
+	requires io.sf.carte.echosvg.i18n;
 	requires org.mozilla.rhino;
 	requires xalan;
-	requires xml.apis.ext;
 	requires xmlgraphics.commons;
 }
diff --git a/echosvg-css/build.gradle b/echosvg-css/build.gradle
@@ -5,14 +5,13 @@ plugins {
 
 dependencies {
 	api project(':echosvg-util')
+	api project(':svgom-api')
 	api "org.apache.xmlgraphics:xmlgraphics-commons:${xmlgraphicsCommonsVersion}"
-	api "xml-apis:xml-apis-ext:${xmlApisExtVersion}"
 	api "io.sf.carte:css4j:${css4jVersion}"
 }
 
 extraJavaModuleInfo {
 	failOnMissingModuleInfo.set(false)
-	automaticModule("xml-apis-ext-${xmlApisExtVersion}.jar", 'xml.apis.ext')
 	automaticModule("xmlgraphics-commons-${xmlgraphicsCommonsVersion}.jar", 'xmlgraphics.commons')
 }
 

diff --git a/echosvg-css/src/main/java/module-info.java b/echosvg-css/src/main/java/module-info.java
@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 module io.sf.carte.echosvg.css {
-    exports io.sf.carte.echosvg.css.engine;
-    exports io.sf.carte.echosvg.css.engine.value.css2;
-    exports io.sf.carte.echosvg.css.engine.value.svg;
-    exports io.sf.carte.echosvg.css.dom;
-    exports io.sf.carte.echosvg.css.engine.value;
-    exports io.sf.carte.echosvg.css.engine.value.svg12;
+	exports io.sf.carte.echosvg.css.engine;
+	exports io.sf.carte.echosvg.css.engine.value.css2;
+	exports io.sf.carte.echosvg.css.engine.value.svg;
+	exports io.sf.carte.echosvg.css.dom;
+	exports io.sf.carte.echosvg.css.engine.value;
+	exports io.sf.carte.echosvg.css.engine.value.svg12;
 
-    requires transitive io.sf.carte.echosvg.util;
-    requires io.sf.carte.css4j;
-    requires io.sf.carte.util;
-    requires java.desktop;
-    requires java.xml;
-    requires jdk.xml.dom;
-    requires xml.apis.ext;
-    requires xmlgraphics.commons;
+	requires transitive io.sf.carte.echosvg.util;
+	requires io.sf.carte.echosvg.i18n;
+	requires transitive io.sf.carte.css4j;
+	requires io.sf.carte.util;
+	requires java.desktop;
+	requires java.xml;
+	requires jdk.xml.dom;
+	requires transitive org.w3c.dom.svg;
+	requires xmlgraphics.commons;
 }
diff --git a/echosvg-dom/build.gradle b/echosvg-dom/build.gradle
@@ -11,12 +11,10 @@ dependencies {
 		exclude group: 'xml-apis', module: 'xml-apis'
 	}
 	api "org.apache.xmlgraphics:xmlgraphics-commons:${xmlgraphicsCommonsVersion}"
-	api "xml-apis:xml-apis-ext:${xmlApisExtVersion}"
 }
 
 extraJavaModuleInfo {
 	failOnMissingModuleInfo.set(false)
-	automaticModule("xml-apis-ext-${xmlApisExtVersion}.jar", 'xml.apis.ext')
 	automaticModule("xmlgraphics-commons-${xmlgraphicsCommonsVersion}.jar", 'xmlgraphics.commons')
 	automaticModule("xalan-${xalanVersion}.jar", 'xalan')
 }

diff --git a/echosvg-dom/src/main/java/module-info.java b/echosvg-dom/src/main/java/module-info.java
@@ -24,9 +24,8 @@
 	requires transitive io.sf.carte.echosvg.css;
 	requires io.sf.carte.echosvg.external;
 	requires transitive io.sf.carte.echosvg.xml;
-	requires io.sf.carte.css4j;
+	requires io.sf.carte.echosvg.i18n;
 	requires transitive java.xml;
 	requires transitive jdk.xml.dom;
-	requires xml.apis.ext;
 	requires xalan;
 }
diff --git a/echosvg-ext/src/main/java/module-info.java b/echosvg-ext/src/main/java/module-info.java
@@ -17,5 +17,5 @@
     exports io.sf.carte.echosvg.w3c.dom;
     exports io.sf.carte.echosvg.w3c.dom.events;
 
-    requires java.xml;
+    requires transitive java.xml;
 }
diff --git a/echosvg-extension/build.gradle b/echosvg-extension/build.gradle
@@ -1,17 +1,11 @@
 plugins {
 	id 'echosvg.java-conventions'
-	id 'de.jjohannes.extra-java-module-info'
 }
 
 dependencies {
 	api project(':echosvg-awt-util')
 	api project(':echosvg-bridge')
-	api "xml-apis:xml-apis-ext:${xmlApisExtVersion}"
-}
-
-extraJavaModuleInfo {
-	failOnMissingModuleInfo.set(false)
-	automaticModule("xml-apis-ext-${xmlApisExtVersion}.jar", 'xml.apis.ext')
+	api project(':svgom-api')
 }
 
 description = 'io.sf.carte:echosvg-extension'

diff --git a/echosvg-extension/src/main/java/module-info.java b/echosvg-extension/src/main/java/module-info.java
@@ -14,18 +14,17 @@
  * limitations under the License.
  */
 module io.sf.carte.echosvg.extension {
-    exports io.sf.carte.echosvg.extension;
-    exports io.sf.carte.echosvg.extension.svg;
+	exports io.sf.carte.echosvg.extension;
+	exports io.sf.carte.echosvg.extension.svg;
 
-    requires io.sf.carte.echosvg.awt;
-    requires io.sf.carte.echosvg.bridge;
-    requires io.sf.carte.echosvg.css;
-    requires io.sf.carte.echosvg.gvt;
-    requires io.sf.carte.echosvg.parser;
-    requires io.sf.carte.echosvg.dom;
-    requires io.sf.carte.echosvg.anim;
-    requires java.desktop;
-    requires java.xml;
-    requires jdk.xml.dom;
-    requires xml.apis.ext;
+	requires io.sf.carte.echosvg.bridge;
+	requires io.sf.carte.echosvg.gvt;
+	requires io.sf.carte.echosvg.parser;
+	requires transitive io.sf.carte.echosvg.dom;
+	requires io.sf.carte.echosvg.anim;
+	requires io.sf.carte.echosvg.constants;
+	requires java.desktop;
+
+	requires jdk.xml.dom;
+	requires transitive org.w3c.dom.svg;
 }
diff --git a/echosvg-gui-util/src/main/java/module-info.java b/echosvg-gui-util/src/main/java/module-info.java
@@ -20,5 +20,5 @@
 
     requires io.sf.carte.echosvg.util;
     requires io.sf.carte.echosvg.xml;
-    requires java.desktop;
+    requires transitive java.desktop;
 }
diff --git a/echosvg-parser/build.gradle b/echosvg-parser/build.gradle
@@ -6,13 +6,12 @@ plugins {
 dependencies {
 	api project(':echosvg-awt-util')
 	api project(':echosvg-xml')
-	api "xml-apis:xml-apis-ext:${xmlApisExtVersion}"
+	api project(':svgom-api')
 	api "org.apache.xmlgraphics:xmlgraphics-commons:${xmlgraphicsCommonsVersion}"
 }
 
 extraJavaModuleInfo {
 	failOnMissingModuleInfo.set(false)
-	automaticModule("xml-apis-ext-${xmlApisExtVersion}.jar", 'xml.apis.ext')
 	automaticModule("xmlgraphics-commons-${xmlgraphicsCommonsVersion}.jar", 'xmlgraphics.commons')
 }
 

diff --git a/echosvg-parser/src/main/java/module-info.java b/echosvg-parser/src/main/java/module-info.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 module io.sf.carte.echosvg.parser {
-    exports io.sf.carte.echosvg.parser;
+	exports io.sf.carte.echosvg.parser;
 
-    requires io.sf.carte.echosvg.awt;
-    requires io.sf.carte.echosvg.xml;
-    requires java.xml;
-    requires xml.apis.ext;
+	requires io.sf.carte.echosvg.awt;
+	requires io.sf.carte.echosvg.xml;
+	requires io.sf.carte.echosvg.i18n;
+	requires transitive org.w3c.dom.svg;
+	requires transitive java.desktop;
 }
diff --git a/echosvg-script/build.gradle b/echosvg-script/build.gradle
@@ -11,7 +11,6 @@ dependencies {
 extraJavaModuleInfo {
 	failOnMissingModuleInfo.set(false)
 	automaticModule("rhino-${rhinoVersion}.jar", 'org.mozilla.rhino')
-	automaticModule("xml-apis-ext-${xmlApisExtVersion}.jar", 'xml.apis.ext')
 }
 
 description = 'io.sf.carte:echosvg-script'

diff --git a/echosvg-script/src/main/java/module-info.java b/echosvg-script/src/main/java/module-info.java
@@ -17,9 +17,8 @@
 	exports io.sf.carte.echosvg.script.rhino;
 	exports io.sf.carte.echosvg.script;
 
-	requires io.sf.carte.echosvg.util;
 	requires io.sf.carte.echosvg.anim;
-	requires java.xml;
+	requires io.sf.carte.echosvg.i18n;
+	requires transitive java.xml;
 	requires org.mozilla.rhino;
-	requires xml.apis.ext;
 }
diff --git a/echosvg-slideshow/build.gradle b/echosvg-slideshow/build.gradle
@@ -1,17 +1,11 @@
 plugins {
 	id 'echosvg.java-conventions'
-	id 'de.jjohannes.extra-java-module-info'
 }
 
 dependencies {
 	api project(':echosvg-bridge')
 	api project(':echosvg-gvt')
-	api "xml-apis:xml-apis-ext:${xmlApisExtVersion}"
-}
-
-extraJavaModuleInfo {
-	failOnMissingModuleInfo.set(false)
-	automaticModule("xml-apis-ext-${xmlApisExtVersion}.jar", 'xml.apis.ext')
+	api project(':svgom-api')
 }
 
 description = 'io.sf.carte:echosvg-slideshow'

diff --git a/echosvg-slideshow/src/main/java/module-info.java b/echosvg-slideshow/src/main/java/module-info.java
@@ -18,5 +18,5 @@
 
 	requires io.sf.carte.echosvg.bridge;
 	requires io.sf.carte.echosvg.gvt;
-	requires xml.apis.ext;
+	requires transitive org.w3c.dom.svg;
 }
diff --git a/echosvg-svg-dom/build.gradle b/echosvg-svg-dom/build.gradle
@@ -1,18 +1,12 @@
 plugins {
 	id 'echosvg.java-conventions'
-	id 'de.jjohannes.extra-java-module-info'
 }
 
 dependencies {
 	api project(':echosvg-awt-util')
 	api project(':echosvg-dom')
 	api project(':echosvg-parser')
-	api "xml-apis:xml-apis-ext:${xmlApisExtVersion}"
-}
-
-extraJavaModuleInfo {
-	failOnMissingModuleInfo.set(false)
-	automaticModule("xml-apis-ext-${xmlApisExtVersion}.jar", 'xml.apis.ext')
+	api project(':svgom-api')
 }
 
 description = 'io.sf.carte:echosvg-svg-dom'

diff --git a/echosvg-svg-dom/src/main/java/module-info.java b/echosvg-svg-dom/src/main/java/module-info.java
@@ -14,15 +14,11 @@
  * limitations under the License.
  */
 module io.sf.carte.echosvg.dom.svg {
-    exports io.sf.carte.echosvg.dom.svg12;
-    exports io.sf.carte.echosvg.dom.svg;
+	exports io.sf.carte.echosvg.dom.svg12;
+	exports io.sf.carte.echosvg.dom.svg;
 
-    requires io.sf.carte.echosvg.awt;
-    requires transitive io.sf.carte.echosvg.css;
-    requires io.sf.carte.echosvg.parser;
-    requires transitive io.sf.carte.echosvg.dom;
-    requires java.desktop;
-    requires java.xml;
-    requires jdk.xml.dom;
-    requires xml.apis.ext;
+	requires io.sf.carte.echosvg.awt;
+	requires transitive io.sf.carte.echosvg.css;
+	requires transitive io.sf.carte.echosvg.parser;
+	requires transitive io.sf.carte.echosvg.dom;
 }