diff --git a/ide/xml/nbproject/project.xml b/ide/xml/nbproject/project.xml index 21b48684930e..20827d7368da 100644 --- a/ide/xml/nbproject/project.xml +++ b/ide/xml/nbproject/project.xml @@ -350,4 +350,4 @@ - \ No newline at end of file + diff --git a/platform/libs.batik.read/external/batik-1.18-license.txt b/platform/libs.batik.read/external/batik-1.17-license.txt similarity index 96% rename from platform/libs.batik.read/external/batik-1.18-license.txt rename to platform/libs.batik.read/external/batik-1.17-license.txt index 71d32d8d44b6..c616675191d0 100644 --- a/platform/libs.batik.read/external/batik-1.18-license.txt +++ b/platform/libs.batik.read/external/batik-1.17-license.txt @@ -1,9 +1,9 @@ Name: Apache Batik -Version: 1.18 +Version: 1.17 Description: Batik is a toolkit for applications that want to use images in the Scalable Vector Graphics (SVG) format for various purposes, such as display, generation or manipulation. License: Apache-2.0 Origin: https://xmlgraphics.apache.org/batik/ -Files: batik-anim-1.18.jar, batik-awt-util-1.18.jar, batik-bridge-1.18.jar, batik-codec-1.18.jar, batik-constants-1.18.jar, batik-css-1.18.jar, batik-dom-1.18.jar, batik-ext-1.18.jar, batik-gui-util-1.18.jar, batik-gvt-1.18.jar, batik-i18n-1.18.jar, batik-parser-1.18.jar, batik-script-1.18.jar, batik-svg-dom-1.18.jar, batik-swing-1.18.jar, batik-util-1.18.jar, batik-xml-1.18.jar +Files: batik-anim-1.17.jar, batik-awt-util-1.17.jar, batik-bridge-1.17.jar, batik-constants-1.17.jar, batik-css-1.17.jar, batik-dom-1.17.jar, batik-ext-1.17.jar, batik-gvt-1.17.jar, batik-i18n-1.17.jar, batik-parser-1.17.jar, batik-script-1.17.jar, batik-svg-dom-1.17.jar, batik-util-1.17.jar, batik-xml-1.17.jar Apache License Version 2.0, January 2004 diff --git a/platform/libs.batik.read/external/batik-1.18-notice.txt b/platform/libs.batik.read/external/batik-1.17-notice.txt similarity index 100% rename from platform/libs.batik.read/external/batik-1.18-notice.txt rename to platform/libs.batik.read/external/batik-1.17-notice.txt diff --git a/platform/libs.batik.read/external/binaries-list b/platform/libs.batik.read/external/binaries-list index b981ea3f0799..603b0a2024b1 100644 --- a/platform/libs.batik.read/external/binaries-list +++ b/platform/libs.batik.read/external/binaries-list @@ -15,24 +15,21 @@ # specific language governing permissions and limitations # under the License. -FB3BE1A0C47BFB4C7A03E24527349B42AF0F3067 org.apache.xmlgraphics:batik-anim:1.18 -5797344C42A27F9EC6608F5994ACB11737C86DE2 org.apache.xmlgraphics:batik-awt-util:1.18 -AD14BF6D21013C8B165581511C8B2FBAAFF32C1A org.apache.xmlgraphics:batik-bridge:1.18 -387C36A5B1203199C976328590969542DD1FBA30 org.apache.xmlgraphics:batik-codec:1.18 -377A0E5AEA2A44295C472C0960F4FA9F09412A77 org.apache.xmlgraphics:batik-constants:1.18 -639787C5503D058420EDDC663F06EA8E05CC712D org.apache.xmlgraphics:batik-css:1.18 -7A6DCA47BB9E93C40B7BCB3D615624DB00C73ABC org.apache.xmlgraphics:batik-dom:1.18 -B4966CA56F24F89276E5AEF06D3138E778314F7A org.apache.xmlgraphics:batik-ext:1.18 -158FFD3D7B2DD8F6260706DC8014D479BB63FEF3 org.apache.xmlgraphics:batik-gui-util:1.18 -ECA7FE784C9272ED75C9FD72AC5B5E7DA0681877 org.apache.xmlgraphics:batik-gvt:1.18 -816B3F791B95CC0A0CEC616028A869ECC790DD4D org.apache.xmlgraphics:batik-i18n:1.18 -F931747352A96203BCA03A19124E1004AD5C54FD org.apache.xmlgraphics:batik-parser:1.18 -34479B161E0BCE23D5E44403C5BDA738C08EBF80 org.apache.xmlgraphics:batik-script:1.18 -950D8ADA7403373D2FA24C71166D6764306F23CA org.apache.xmlgraphics:batik-svg-dom:1.18 -C70A24147AECCE502AF4235D713799CCF2272914 org.apache.xmlgraphics:batik-swing:1.18 -1B5126413569B45FA5E35EAE936E1ACD4ABCD5DD org.apache.xmlgraphics:batik-util:1.18 -36DEA570B200621E19150C8FDF21A9A426EF0D22 org.apache.xmlgraphics:batik-xml:1.18 +89E5D61A4328D6755DD7903FB5E7F0B265FF8FBE org.apache.xmlgraphics:batik-anim:1.17 +0E3F71C6F07DA863228B64A59BF059C4611C3952 org.apache.xmlgraphics:batik-awt-util:1.17 +D8246A26D8E0503FC30822FED2A8595B3659AF90 org.apache.xmlgraphics:batik-bridge:1.17 +22BF8B4C207DC46859DB0269853186D8DFC8CB9A org.apache.xmlgraphics:batik-constants:1.17 +D5FF4E0463AF8A0EA5AB8D782C5418BAB2F45C4D org.apache.xmlgraphics:batik-css:1.17 +EFCB39F1007187565C264A5F1D12EBCF67EFB761 org.apache.xmlgraphics:batik-dom:1.17 +FD2E4166A14F8BBE099162AD88CFE64BE09D35A2 org.apache.xmlgraphics:batik-ext:1.17 +33F70788DE9F7D31D69DB22C0AFAF304424FF799 org.apache.xmlgraphics:batik-gvt:1.17 +39B233A71430FFA9D0282D47789A58FA8BF4F861 org.apache.xmlgraphics:batik-i18n:1.17 +DA9D3057BE108E6AC8799CC8EFED1E2B490BA37C org.apache.xmlgraphics:batik-parser:1.17 +958BAD8BAA3A77A73152281418256B608801232D org.apache.xmlgraphics:batik-script:1.17 +54A25B9B691BCC302C0DD36D80F56E81A9EBED91 org.apache.xmlgraphics:batik-svg-dom:1.17 +83EF2A8B449444A1D57E91E938522899317A8672 org.apache.xmlgraphics:batik-util:1.17 +15A0B4BA6260F3430632E4B1DAD95383196107A8 org.apache.xmlgraphics:batik-xml:1.17 3789D9FADA2D3D458C4BA2DE349D48780F381EE3 xml-apis:xml-apis:1.4.01 41A8B86B358E87F3F13CF46069721719105AFF66 xml-apis:xml-apis-ext:1.3.04 -EE7FCE93D437D489A323ADDD1F63F0587B5C4A97 org.apache.xmlgraphics:xmlgraphics-commons:2.10 +DE2D1BD8D40474BBE876BB269410C750489F08E5 org.apache.xmlgraphics:xmlgraphics-commons:2.9 diff --git a/platform/libs.batik.read/external/xmlgraphics-commons-2.10-license.txt b/platform/libs.batik.read/external/xmlgraphics-commons-2.9-license.txt similarity index 99% rename from platform/libs.batik.read/external/xmlgraphics-commons-2.10-license.txt rename to platform/libs.batik.read/external/xmlgraphics-commons-2.9-license.txt index dd608a70fc39..2c052821add8 100644 --- a/platform/libs.batik.read/external/xmlgraphics-commons-2.10-license.txt +++ b/platform/libs.batik.read/external/xmlgraphics-commons-2.9-license.txt @@ -1,9 +1,9 @@ Name: Apache XML Graphics Commons -Version: 2.10 +Version: 2.9 Description: Apache XML Graphics Commons is a library that consists of several reusable components used by Apache Batik and Apache FOP. License: Apache-2.0 Origin: https://xmlgraphics.apache.org/commons/ -Files: xmlgraphics-commons-2.10.jar +Files: xmlgraphics-commons-2.9.jar Apache License Version 2.0, January 2004 diff --git a/platform/libs.batik.read/external/xmlgraphics-commons-2.10-notice.txt b/platform/libs.batik.read/external/xmlgraphics-commons-2.9-notice.txt similarity index 100% rename from platform/libs.batik.read/external/xmlgraphics-commons-2.10-notice.txt rename to platform/libs.batik.read/external/xmlgraphics-commons-2.9-notice.txt diff --git a/platform/libs.batik.read/nbproject/project.properties b/platform/libs.batik.read/nbproject/project.properties index 8d3e66d4ce94..54c0471eb4c8 100644 --- a/platform/libs.batik.read/nbproject/project.properties +++ b/platform/libs.batik.read/nbproject/project.properties @@ -15,46 +15,40 @@ # specific language governing permissions and limitations # under the License. -file.reference.batik-anim-1.18.jar=external/batik-anim-1.18.jar -file.reference.batik-awt-util-1.18.jar=external/batik-awt-util-1.18.jar -file.reference.batik-bridge-1.18.jar=external/batik-bridge-1.18.jar -file.reference.batik-codec-1.18.jar=external/batik-codec-1.18.jar -file.reference.batik-constants-1.18.jar=external/batik-constants-1.18.jar -file.reference.batik-css-1.18.jar=external/batik-css-1.18.jar -file.reference.batik-dom-1.18.jar=external/batik-dom-1.18.jar -file.reference.batik-ext-1.18.jar=external/batik-ext-1.18.jar -file.reference.batik-gui-util-1.18.jar=external/batik-gui-util-1.18.jar -file.reference.batik-gvt-1.18.jar=external/batik-gvt-1.18.jar -file.reference.batik-i18n-1.18.jar=external/batik-i18n-1.18.jar -file.reference.batik-parser-1.18.jar=external/batik-parser-1.18.jar -file.reference.batik-script-1.18.jar=external/batik-script-1.18.jar -file.reference.batik-svg-dom-1.18.jar=external/batik-svg-dom-1.18.jar -file.reference.batik-swing-1.18.jar=external/batik-swing-1.18.jar -file.reference.batik-util-1.18.jar=external/batik-util-1.18.jar -file.reference.batik-xml-1.18.jar=external/batik-xml-1.18.jar +file.reference.batik-anim-1.17.jar=external/batik-anim-1.17.jar +file.reference.batik-awt-util-1.17.jar=external/batik-awt-util-1.17.jar +file.reference.batik-bridge-1.17.jar=external/batik-bridge-1.17.jar +file.reference.batik-constants-1.17.jar=external/batik-constants-1.17.jar +file.reference.batik-css-1.17.jar=external/batik-css-1.17.jar +file.reference.batik-dom-1.17.jar=external/batik-dom-1.17.jar +file.reference.batik-ext-1.17.jar=external/batik-ext-1.17.jar +file.reference.batik-gvt-1.17.jar=external/batik-gvt-1.17.jar +file.reference.batik-i18n-1.17.jar=external/batik-i18n-1.17.jar +file.reference.batik-parser-1.17.jar=external/batik-parser-1.17.jar +file.reference.batik-script-1.17.jar=external/batik-script-1.17.jar +file.reference.batik-svg-dom-1.17.jar=external/batik-svg-dom-1.17.jar +file.reference.batik-util-1.17.jar=external/batik-util-1.17.jar +file.reference.batik-xml-1.17.jar=external/batik-xml-1.17.jar file.reference.xml-apis-1.4.01.jar=external/xml-apis-1.4.01.jar file.reference.xml-apis-ext-1.3.04.jar=external/xml-apis-ext-1.3.04.jar -file.reference.xmlgraphics-commons-2.10.jar=external/xmlgraphics-commons-2.10.jar -release.external/batik-anim-1.18.jar=modules/ext/batik-anim-1.18.jar -release.external/batik-awt-util-1.18.jar=modules/ext/batik-awt-util-1.18.jar -release.external/batik-bridge-1.18.jar=modules/ext/batik-bridge-1.18.jar -release.external/batik-codec-1.18.jar=modules/ext/batik-codec-1.18.jar -release.external/batik-constants-1.18.jar=modules/ext/batik-constants-1.18.jar -release.external/batik-css-1.18.jar=modules/ext/batik-css-1.18.jar -release.external/batik-dom-1.18.jar=modules/ext/batik-dom-1.18.jar -release.external/batik-ext-1.18.jar=modules/ext/batik-ext-1.18.jar -release.external/batik-gui-util-1.18.jar=modules/ext/batik-gui-util-1.18.jar -release.external/batik-gvt-1.18.jar=modules/ext/batik-gvt-1.18.jar -release.external/batik-i18n-1.18.jar=modules/ext/batik-i18n-1.18.jar -release.external/batik-parser-1.18.jar=modules/ext/batik-parser-1.18.jar -release.external/batik-script-1.18.jar=modules/ext/batik-script-1.18.jar -release.external/batik-svg-dom-1.18.jar=modules/ext/batik-svg-dom-1.18.jar -release.external/batik-swing-1.18.jar=modules/ext/batik-swing-1.18.jar -release.external/batik-util-1.18.jar=modules/ext/batik-util-1.18.jar -release.external/batik-xml-1.18.jar=modules/ext/batik-xml-1.18.jar +file.reference.xmlgraphics-commons-2.9.jar=external/xmlgraphics-commons-2.9.jar +release.external/batik-anim-1.17.jar=modules/ext/batik-anim-1.17.jar +release.external/batik-awt-util-1.17.jar=modules/ext/batik-awt-util-1.17.jar +release.external/batik-bridge-1.17.jar=modules/ext/batik-bridge-1.17.jar +release.external/batik-constants-1.17.jar=modules/ext/batik-constants-1.17.jar +release.external/batik-css-1.17.jar=modules/ext/batik-css-1.17.jar +release.external/batik-dom-1.17.jar=modules/ext/batik-dom-1.17.jar +release.external/batik-ext-1.17.jar=modules/ext/batik-ext-1.17.jar +release.external/batik-gvt-1.17.jar=modules/ext/batik-gvt-1.17.jar +release.external/batik-i18n-1.17.jar=modules/ext/batik-i18n-1.17.jar +release.external/batik-parser-1.17.jar=modules/ext/batik-parser-1.17.jar +release.external/batik-script-1.17.jar=modules/ext/batik-script-1.17.jar +release.external/batik-svg-dom-1.17.jar=modules/ext/batik-svg-dom-1.17.jar +release.external/batik-util-1.17.jar=modules/ext/batik-util-1.17.jar +release.external/batik-xml-1.17.jar=modules/ext/batik-xml-1.17.jar release.external/xml-apis-1.4.01.jar=modules/ext/xml-apis-1.4.01.jar release.external/xml-apis-ext-1.3.04.jar=modules/ext/xml-apis-ext-1.3.04.jar -release.external/xmlgraphics-commons-2.10.jar=modules/ext/xmlgraphics-commons-2.10.jar +release.external/xmlgraphics-commons-2.9.jar=modules/ext/xmlgraphics-commons-2.9.jar is.autoload=true javac.source=1.8 diff --git a/platform/libs.batik.read/nbproject/project.xml b/platform/libs.batik.read/nbproject/project.xml index e4b8031b7eda..ae6fd8d88120 100644 --- a/platform/libs.batik.read/nbproject/project.xml +++ b/platform/libs.batik.read/nbproject/project.xml @@ -73,9 +73,6 @@ org.apache.batik.ext.awt.g2d org.apache.batik.ext.awt.geom org.apache.batik.ext.awt.image - org.apache.batik.ext.awt.image.codec.imageio - org.apache.batik.ext.awt.image.codec.png - org.apache.batik.ext.awt.image.codec.util org.apache.batik.ext.awt.image.renderable org.apache.batik.ext.awt.image.rendered org.apache.batik.ext.awt.image.spi @@ -92,13 +89,7 @@ org.apache.batik.script org.apache.batik.script.jpython org.apache.batik.script.rhino - org.apache.batik.swing - org.apache.batik.swing.gvt - org.apache.batik.swing.svg org.apache.batik.util - org.apache.batik.util.gui - org.apache.batik.util.gui.resource - org.apache.batik.util.gui.xmleditor org.apache.batik.util.io org.apache.batik.util.resources org.apache.batik.w3c.dom @@ -144,60 +135,60 @@ org.w3c.dom.svg - ext/batik-constants-1.18.jar - external/batik-constants-1.18.jar + ext/batik-constants-1.17.jar + external/batik-constants-1.17.jar - ext/batik-util-1.18.jar - external/batik-util-1.18.jar + ext/batik-util-1.17.jar + external/batik-util-1.17.jar - ext/batik-svg-dom-1.18.jar - external/batik-svg-dom-1.18.jar + ext/batik-svg-dom-1.17.jar + external/batik-svg-dom-1.17.jar - ext/batik-xml-1.18.jar - external/batik-xml-1.18.jar + ext/batik-xml-1.17.jar + external/batik-xml-1.17.jar - ext/batik-anim-1.18.jar - external/batik-anim-1.18.jar + ext/batik-anim-1.17.jar + external/batik-anim-1.17.jar - ext/batik-gvt-1.18.jar - external/batik-gvt-1.18.jar + ext/batik-gvt-1.17.jar + external/batik-gvt-1.17.jar - ext/batik-dom-1.18.jar - external/batik-dom-1.18.jar + ext/batik-dom-1.17.jar + external/batik-dom-1.17.jar - ext/batik-bridge-1.18.jar - external/batik-bridge-1.18.jar + ext/batik-bridge-1.17.jar + external/batik-bridge-1.17.jar - ext/batik-css-1.18.jar - external/batik-css-1.18.jar + ext/batik-css-1.17.jar + external/batik-css-1.17.jar - ext/batik-i18n-1.18.jar - external/batik-i18n-1.18.jar + ext/batik-i18n-1.17.jar + external/batik-i18n-1.17.jar - ext/batik-ext-1.18.jar - external/batik-ext-1.18.jar + ext/batik-ext-1.17.jar + external/batik-ext-1.17.jar - ext/batik-script-1.18.jar - external/batik-script-1.18.jar + ext/batik-script-1.17.jar + external/batik-script-1.17.jar - ext/xmlgraphics-commons-2.10.jar - external/xmlgraphics-commons-2.10.jar + ext/xmlgraphics-commons-2.9.jar + external/xmlgraphics-commons-2.9.jar - ext/batik-parser-1.18.jar - external/batik-parser-1.18.jar + ext/batik-parser-1.17.jar + external/batik-parser-1.17.jar ext/xml-apis-1.4.01.jar @@ -208,20 +199,8 @@ external/xml-apis-ext-1.3.04.jar - ext/batik-awt-util-1.18.jar - external/batik-awt-util-1.18.jar - - - ext/batik-swing-1.18.jar - external/batik-swing-1.18.jar - - - ext/batik-gui-util-1.18.jar - external/batik-gui-util-1.18.jar - - - ext/batik-codec-1.18.jar - external/batik-codec-1.18.jar + ext/batik-awt-util-1.17.jar + external/batik-awt-util-1.17.jar