diff --git a/README.md b/README.md index 2984b575..e206620e 100644 --- a/README.md +++ b/README.md @@ -48,10 +48,8 @@ Requirements; * 8GB of free memory * Setup a DAT Hyperdrive tool [drives](https://github.com/holepunchto/drives) * Use an AdoptOpenJDK(11++) to run the demo -* TODO: install local copy of bassboon-jppre -* Run "mvn -P lib-install initialize" once to copy local lib to local m2 repro. +* install local copy of nx01 maven artifacts -Run "mvn -P x4o-tasks compile" once to generate all xml xsd and eld docs.(into target/x4o-*) ### Project Launch Release diff --git a/gdxapp4d-chain-boot-ship-engine/pom.xml b/gdxapp4d-chain-boot-ship-engine/pom.xml index 1289cd7e..e7def480 100644 --- a/gdxapp4d-chain-boot-ship-engine/pom.xml +++ b/gdxapp4d-chain-boot-ship-engine/pom.xml @@ -24,7 +24,8 @@ - + + diff --git a/gdxapp4d-chain-boot-warp-sea/pom.xml b/gdxapp4d-chain-boot-warp-sea/pom.xml index 1cf4ca39..fba8705e 100644 --- a/gdxapp4d-chain-boot-warp-sea/pom.xml +++ b/gdxapp4d-chain-boot-warp-sea/pom.xml @@ -24,7 +24,8 @@ - + + diff --git a/gdxapp4d-chain-default-apps/pom.xml b/gdxapp4d-chain-default-apps/pom.xml index 85adc42a..3ad5ea3b 100644 --- a/gdxapp4d-chain-default-apps/pom.xml +++ b/gdxapp4d-chain-default-apps/pom.xml @@ -70,7 +70,8 @@ - + + diff --git a/gdxapp4d-chain-default-music/pom.xml b/gdxapp4d-chain-default-music/pom.xml index 240105c9..e8c8a055 100644 --- a/gdxapp4d-chain-default-music/pom.xml +++ b/gdxapp4d-chain-default-music/pom.xml @@ -21,10 +21,11 @@ - + s - + + diff --git a/gdxapp4d-chain-dep-osgi-lib/pom.xml b/gdxapp4d-chain-dep-osgi-lib/pom.xml index 9b675b4c..2870c2d0 100644 --- a/gdxapp4d-chain-dep-osgi-lib/pom.xml +++ b/gdxapp4d-chain-dep-osgi-lib/pom.xml @@ -61,7 +61,8 @@ - + + diff --git a/gdxapp4d-chain-dep-osgi-scr/pom.xml b/gdxapp4d-chain-dep-osgi-scr/pom.xml index 9ac01d96..dda1df09 100644 --- a/gdxapp4d-chain-dep-osgi-scr/pom.xml +++ b/gdxapp4d-chain-dep-osgi-scr/pom.xml @@ -24,7 +24,8 @@ - + + diff --git a/gdxapp4d-chain-font-unicode4d/pom.xml b/gdxapp4d-chain-font-unicode4d/pom.xml index c16640a2..128447fa 100644 --- a/gdxapp4d-chain-font-unicode4d/pom.xml +++ b/gdxapp4d-chain-font-unicode4d/pom.xml @@ -24,7 +24,8 @@ - + + diff --git a/gdxapp4d-chain-mod-unitxc/pom.xml b/gdxapp4d-chain-mod-unitxc/pom.xml index 11e62440..b9308419 100644 --- a/gdxapp4d-chain-mod-unitxc/pom.xml +++ b/gdxapp4d-chain-mod-unitxc/pom.xml @@ -35,7 +35,8 @@ - + + diff --git a/gdxapp4d-chain-mod-vrgem4/pom.xml b/gdxapp4d-chain-mod-vrgem4/pom.xml index 73c34c0c..5e9f5d21 100644 --- a/gdxapp4d-chain-mod-vrgem4/pom.xml +++ b/gdxapp4d-chain-mod-vrgem4/pom.xml @@ -35,7 +35,8 @@ - + + diff --git a/gdxapp4d-chain-mod-vrsys5/pom.xml b/gdxapp4d-chain-mod-vrsys5/pom.xml index 0ef4619d..492526c0 100644 --- a/gdxapp4d-chain-mod-vrsys5/pom.xml +++ b/gdxapp4d-chain-mod-vrsys5/pom.xml @@ -35,7 +35,8 @@ - + + diff --git a/gdxapp4d-lib-basicwd/pom.xml b/gdxapp4d-lib-basicwd/pom.xml index 2add5259..6aca7832 100644 --- a/gdxapp4d-lib-basicwd/pom.xml +++ b/gdxapp4d-lib-basicwd/pom.xml @@ -9,17 +9,12 @@ GDXApp⁴ᴰ-Lib-기초적인ʷᴰ - love.distributedrebirth.bassboon - bassboon-jppre - ${bassboon-jppre.version} + love.distributedrebirth.nx01 + nx01-jpp-base - org.x4o - x4o-driver - - - org.apache.tomcat - jasper-el + love.distributedrebirth.nx01 + nx01-x4o-driver \ No newline at end of file diff --git a/gdxapp4d-lib-imxmi/pom.xml b/gdxapp4d-lib-imxmi/pom.xml index 014acf5d..bb05a5aa 100644 --- a/gdxapp4d-lib-imxmi/pom.xml +++ b/gdxapp4d-lib-imxmi/pom.xml @@ -9,9 +9,8 @@ GDXApp⁴ᴰ-Lib-ImXmI - love.distributedrebirth.bassboon - bassboon-jppre - ${bassboon-jppre.version} + love.distributedrebirth.nx01 + nx01-jpp-base io.github.spair diff --git a/gdxapp4d-lib-unicodezd/pom.xml b/gdxapp4d-lib-unicodezd/pom.xml index 1eb1d4c0..059890d1 100644 --- a/gdxapp4d-lib-unicodezd/pom.xml +++ b/gdxapp4d-lib-unicodezd/pom.xml @@ -9,17 +9,12 @@ GDXApp⁴ᴰ-Lib-Unicodeᶻᴰ - love.distributedrebirth.bassboon - bassboon-jppre - ${bassboon-jppre.version} + love.distributedrebirth.nx01 + nx01-jpp-base - org.x4o - x4o-driver - - - org.apache.tomcat - jasper-el + love.distributedrebirth.nx01 + nx01-x4o-driver io.github.spair diff --git a/gdxapp4d-lib-warpme/pom.xml b/gdxapp4d-lib-warpme/pom.xml index 0d246eee..d343c030 100644 --- a/gdxapp4d-lib-warpme/pom.xml +++ b/gdxapp4d-lib-warpme/pom.xml @@ -9,17 +9,12 @@ GDXApp⁴ᴰ-Lib-Warpᵐᵉ - love.distributedrebirth.bassboon - bassboon-jppre - ${bassboon-jppre.version} + love.distributedrebirth.nx01 + nx01-jpp-base - org.x4o - x4o-driver - - - org.apache.tomcat - jasper-el + love.distributedrebirth.nx01 + nx01-x4o-driver diff --git a/gdxapp4d-lib-x4o/pom.xml b/gdxapp4d-lib-x4o/pom.xml deleted file mode 100644 index b32496ad..00000000 --- a/gdxapp4d-lib-x4o/pom.xml +++ /dev/null @@ -1,304 +0,0 @@ - - 4.0.0 - - love.distributedrebirth.gdxapp4d - gdxapp4d - 0.0.1-SNAPSHOT - - gdxapp4d-lib-x4o - GDXApp⁴ᴰ-Lib-X4O - pom - - - lib-install - - - - org.apache.maven.plugins - maven-install-plugin - - - deploy-local-x4o-driver - initialize - - install-file - - - org.x4o - x4o-driver - ${x4o.version} - jar - ${project.basedir}/../local-lib/x4o-driver-${x4o.version}.jar - - - - deploy-local-x4o-eld-doc - initialize - - install-file - - - org.x4o - x4o-eld-doc - ${x4o.version} - jar - ${project.basedir}/../local-lib/x4o-eld-doc-${x4o.version}.jar - - - - deploy-local-x4o-html - initialize - - install-file - - - org.x4o - x4o-html - ${x4o.version} - jar - ${project.basedir}/../local-lib/x4o-html-${x4o.version}.jar - - - - deploy-local-x4o-meta - initialize - - install-file - - - org.x4o - x4o-meta - ${x4o.version} - jar - ${project.basedir}/../local-lib/x4o-meta-${x4o.version}.jar - - - - deploy-local-x4o-tool-ant-plugin - initialize - - install-file - - - org.x4o.tool - x4o-tool-ant-plugin - ${x4o.version} - jar - ${project.basedir}/../local-lib/x4o-tool-ant-plugin-${x4o.version}.jar - - - - deploy-local-x4o-tool-maven-plugin - initialize - - install-file - - - org.x4o.tool - x4o-tool-maven-plugin - ${x4o.version} - jar - ${project.basedir}/../local-lib/x4o-tool-maven-plugin-${x4o.version}.jar - - - - deploy-local-x4o-driver-sources - initialize - - install-file - - - org.x4o - x4o-driver - ${x4o.version} - jar - sources - ${project.basedir}/../local-lib/x4o-driver-${x4o.version}-sources.jar - - - - deploy-local-x4o-eld-doc-sources - initialize - - install-file - - - org.x4o - x4o-eld-doc - ${x4o.version} - jar - sources - ${project.basedir}/../local-lib/x4o-eld-doc-${x4o.version}-sources.jar - - - - deploy-local-x4o-html-sources - initialize - - install-file - - - org.x4o - x4o-html - ${x4o.version} - jar - sources - ${project.basedir}/../local-lib/x4o-html-${x4o.version}-sources.jar - - - - deploy-local-x4o-meta-sources - initialize - - install-file - - - org.x4o - x4o-meta - ${x4o.version} - jar - sources - ${project.basedir}/../local-lib/x4o-meta-${x4o.version}-sources.jar - - - - deploy-local-x4o-tool-ant-plugin-sources - initialize - - install-file - - - org.x4o.tool - x4o-tool-ant-plugin - ${x4o.version} - jar - sources - ${project.basedir}/../local-lib/x4o-tool-ant-plugin-${x4o.version}-sources.jar - - - - deploy-local-x4o-tool-maven-plugin-sources - initialize - - install-file - - - org.x4o.tool - x4o-tool-maven-plugin - ${x4o.version} - jar - sources - ${project.basedir}/../local-lib/x4o-tool-maven-plugin-${x4o.version}-sources.jar - - - - - - - - - x4o-tasks - - - - maven-antrun-plugin - - - compile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - - love.distributedrebirth.gdxapp4d - gdxapp4d-lib-warpme - ${project.version} - - - love.distributedrebirth.gdxapp4d - gdxapp4d-lib-unicodezd - ${project.version} - - - org.apache.tomcat - jasper-el - ${jasper-el.version} - - - org.x4o - x4o-driver - ${x4o.version} - - - org.x4o - x4o-eld-doc - ${x4o.version} - - - org.x4o - x4o-html - ${x4o.version} - - - org.x4o.tool - x4o-tool-ant-plugin - ${x4o.version} - - - - - - - - \ No newline at end of file diff --git a/gdxapp4d-tos4/pom.xml b/gdxapp4d-tos4/pom.xml index fbc2d8d5..f8af77d6 100644 --- a/gdxapp4d-tos4/pom.xml +++ b/gdxapp4d-tos4/pom.xml @@ -54,12 +54,8 @@ natives-desktop - org.x4o - x4o-eld-doc - - - org.x4o - x4o-html + love.distributedrebirth.nx01 + nx01-x4o-eld-doc org.eobjects.metamodel diff --git a/pom.xml b/pom.xml index cf4b390b..a591a0d5 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,6 @@ gdxapp4d-chain-mod-unitxc gdxapp4d-chain-mod-vrgem4 gdxapp4d-chain-mod-vrsys5 - gdxapp4d-lib-x4o gdxapp4d-app-mmdoc @@ -42,10 +41,9 @@ 1.10.0 1.86.0 1.0.0 - 6.0.20 - 0.8.7-SNAPSHOT3 - 0.1.0-SNAPSHOT 1.7.36 + 〇一。壬寅。一〄-SNAPSHOT + 6.0.53 org.osgi.framework, org.osgi.service.packageadmin, @@ -108,6 +106,15 @@ imgui.gl3, imgui.type, net.spookygames.gdx.nativefilechooser, + org.x4o.o2o, + org.x4o.o2o.io, + org.x4o.o2o.io.sax3, + org.x4o.o2o.io.sax3.xdbx, + org.x4o.o2o.io.sax4, + org.x4o.o2o.io.tlv, + org.x4o.o2o.io.octal, + org.x4o.o2o.io.octo, + org.x4o.o2o.io.octo.conv, org.x4o.xml, org.x4o.xml.conv, org.x4o.xml.conv.text, @@ -117,8 +124,6 @@ org.x4o.xml.eld.xsd, org.x4o.xml.element, org.x4o.xml.io, - org.x4o.xml.io.sax, - org.x4o.xml.io.sax.ext, org.x4o.xml.lang, org.x4o.xml.lang.phase, org.x4o.xml.lang.task, @@ -140,13 +145,14 @@ ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒼᒻᣔᙆᙆ.ᣖᑊᣗᣔᐪᓫ, ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᔿᓑᔿᔿᔋᐝᣚ, ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ, + ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᑊᔿᓫ, ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ, ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᐧᣞᣛ, ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᒄᓫᣕᐪᣔᒻ, ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᒻᑊᣕᕐᓑᣔ, ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ, - ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᔾᓑᣕᒼᐪᑊᐤᣕᔆ, - ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᔾᓑᣕᒼᐪᑊᐤᣕᔆ.ᐧᣞᣛ, + ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᔿᓫᐪᑋᐤᒄᐤᓑᔿᔆ, + ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᔿᓫᐪᑋᐤᒄᐤᓑᔿᔆ.ᐧᣞᣛ, ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣔᣕᣕᐤᐪᣔᐪᑊᐤᣕ, ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣔᣕᣕᐤᐪᣔᐪᑊᐤᣕ.ᐧᣞᣛ, ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ, @@ -162,7 +168,6 @@ ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᔿᣔᐪᣗᑊᕁ, ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᣔᒃᣔᒼᓑᔆ, ᒢᐩᐩ.ᒼᐤᒻᒻᓫᒼᐪᑊᐤᣕᔆ, - ᒢᐩᐩ.ᓫᣕᐪᓫᣗ.ᒡᒢᣔᣗᣖ, ᒢᐩᐩ.ᓫᣕᐪᓫᣗ.ᣖᑊᓫ, ᒢᐩᐩ.ᓫᣕᐪᓫᣗ.ᣖᑊᓫ.ᐪᣔᔆᐪᓫ, ᒢᐩᐩ.ᓫᣕᐪᓫᣗ.ᣗᑊᒼᓫ, @@ -216,8 +221,6 @@ org.apache.commons.lang3.tuple - org.x4o.html, - org.x4o.html.spec, org.x4o.xml.eld.doc, org.x4o.xml.eld.doc.api, org.x4o.xml.eld.doc.api.dom, @@ -316,26 +319,6 @@ logback-classic 1.2.10 - - org.x4o - x4o-driver - ${x4o.version} - - - org.x4o - x4o-eld-doc - ${x4o.version} - - - org.x4o - x4o-html - ${x4o.version} - - - org.apache.tomcat - jasper-el - ${jasper-el.version} - io.github.spair imgui-java-binding @@ -432,6 +415,46 @@ mariadb-java-client 3.0.8 + + love.distributedrebirth.nx01 + nx01-jpp-base + ${nx01.version} + + + love.distributedrebirth.nx01 + nx01-warp-core + ${nx01.version} + + + love.distributedrebirth.nx01 + nx01-warp-fault + ${nx01.version} + + + love.distributedrebirth.nx01 + nx01-warp-manifestor + ${nx01.version} + + + love.distributedrebirth.nx01 + nx01-x4o-driver + ${nx01.version} + + + love.distributedrebirth.nx01 + nx01-x4o-eld-doc + ${nx01.version} + + + love.distributedrebirth.nx01 + nx01-x4o-meta + ${nx01.version} + + + love.distributedrebirth.nx01 + nx01-x4o-o2o + ${nx01.version} +