Hello community, here is the log from the commit of package xmlgraphics-batik for openSUSE:Factory checked in at 2019-02-04 21:22:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlgraphics-batik (Old) and /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-batik" Mon Feb 4 21:22:22 2019 rev:19 rq:667381 version:1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/xmlgraphics-batik/xmlgraphics-batik.changes 2018-12-07 14:31:52.975332941 +0100 +++ /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new.28833/xmlgraphics-batik.changes 2019-02-04 21:22:36.963636686 +0100 @@ -1,0 +2,38 @@ +Sun Jan 20 20:35:14 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade to version 1.10 + * BATIK-906: Should never use Error to report runtime errors + * BATIK-1123: Missing import of ImportInfo class + * BATIK-1125: Rasterizer fails with base64 embedded png + * BATIK-1140: Show line numbers on exception + * BATIK-1142: Remove e.printStackTrace for BridgeException in + SVGAbstractTranscoder + * BATIK-1157: Wrong value for default JPEG quality in + documentation + * BATIK-1170: Incorrect ColorConvertOp alpha handling breaks + masking + * BATIK-1196: Run batik tests from junit + * BATIK-1197: Make jython and rhino optional + * BATIK-1198: TIFF transcoder looks for invalid class name for its + WriteAdapter + * BATIK-1200: ImagingOpException: Unable to transform src image + * BATIK-1204: Remove hashtable + * BATIK-1212: Show real error on URL failure + * BATIK-1216: Compile error on Java 10 + * BATIK-1222: Only call DOMImplementation in deserialization +- Split the css-jar into a separate package +- Install maven pom files. +- Added patches: + * 0001-Fix-imageio-codec-lookup.patch + + PNG transcoder looks for invalid class name for its + WriteAdapter + * xmlgraphics-batik-nolinksinjavadoc.patch + + Fix javadoc generation by not loading URL links. +- Modified patch: + * xmlgraphics-batik-manifests.patch + + Add Bundle-SymbolicName and Bundle-Version manifest entries + + Add targets for jar files produced by maven build and not + produced by the ant one. Produce them when target jars is + called. + +------------------------------------------------------------------- Old: ---- batik-src-1.9.tar.gz New: ---- 0001-Fix-imageio-codec-lookup.patch batik-src-1.10.tar.gz xmlgraphics-batik-nolinksinjavadoc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlgraphics-batik.spec ++++++ --- /var/tmp/diff_new_pack.JilgBR/_old 2019-02-04 21:22:37.839636474 +0100 +++ /var/tmp/diff_new_pack.JilgBR/_new 2019-02-04 21:22:37.843636473 +0100 @@ -1,7 +1,7 @@ # # spec file for package xmlgraphics-batik # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -18,13 +18,13 @@ Name: xmlgraphics-batik -Version: 1.9 +Version: 1.10 Release: 0 Summary: Scalable Vector Graphics for Java License: Apache-2.0 Group: Productivity/Graphics/Vector Editors -Url: http://xml.apache.org/batik/ -Source: http://www.eu.apache.org/dist/xmlgraphics/batik/source/batik-src-%{version}.tar.gz +URL: http://xml.apache.org/batik/ +Source: http://archive.apache.org/dist/xmlgraphics/batik/source/batik-src-%{version}.tar.gz Source1: %{name}.squiggle.script Source2: %{name}.svgpp.script Source3: %{name}.ttf2svg.script @@ -32,21 +32,24 @@ Source5: %{name}.slideshow.script Source6: %{name}-squiggle.desktop Source7: %{name}.rasterizer.policy +Patch0: %{name}-nolinksinjavadoc.patch Patch1: %{name}-manifests.patch Patch2: %{name}-policy.patch Patch3: %{name}-securitymanager.patch +Patch4: 0001-Fix-imageio-codec-lookup.patch BuildRequires: ant -# Needed for maven conversions BuildRequires: fdupes BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: jython BuildRequires: rhino >= 1.6 -BuildRequires: unzip -BuildRequires: xerces-j2 +BuildRequires: xalan-j2 BuildRequires: xml-commons-apis >= 1.3.03 -Requires: rhino >= 1.6 -Requires: xml-commons-apis >= 1.3.03 +BuildRequires: xmlgraphics-commons +Requires: %{name}-css = %{version}-%{release} +Requires: mvn(org.apache.xmlgraphics:xmlgraphics-commons) +Requires: mvn(xalan:xalan) +Requires: mvn(xml-apis:xml-apis) +Requires: mvn(xml-apis:xml-apis-ext) Obsoletes: batik < %{version}-%{release} Provides: batik = %{version}-%{release} BuildArch: noarch @@ -56,11 +59,21 @@ to use images in the Scalable Vector Graphics (SVG) format for various purposes, such as viewing, generation or manipulation. +%package css +Summary: Batik CSS engine +Group: Productivity/Graphics/Vector Editors +Requires: %{name} = %{version}-%{release} +Requires: mvn(xml-apis:xml-apis-ext) +Obsoletes: batik-css < %{version}-%{release} +Provides: batik-css = %{version}-%{release} + +%description css +CSS component of the Apache Batik SVG manipulation and rendering library. + %package squiggle Summary: Batik SVG browser Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version}-%{release} -Requires: xerces-j2 >= 2.3 Obsoletes: batik-squiggle < %{version}-%{release} Provides: batik-squiggle = %{version}-%{release} @@ -72,7 +85,6 @@ Summary: Batik SVG pretty printer Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version}-%{release} -Requires: xerces-j2 >= 2.3 Obsoletes: batik-svgpp < %{version}-%{release} Provides: batik-svgpp = %{version}-%{release} @@ -98,7 +110,6 @@ Summary: Batik SVG rasterizer Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version}-%{release} -Requires: xerces-j2 >= 2.3 Obsoletes: batik-rasterizer < %{version}-%{release} Provides: batik-rasterizer = %{version}-%{release} @@ -113,13 +124,21 @@ Summary: Batik SVG slideshow Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version}-%{release} -Requires: xerces-j2 >= 2.3 Obsoletes: batik-slideshow < %{version}-%{release} Provides: batik-slideshow = %{version}-%{release} %description slideshow Batik SVG slideshow. +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML +Obsoletes: batik-javadoc < %{version}-%{release} +Provides: batik-javadoc = %{version}-%{release} + +%description javadoc +Javadoc for %{name}. + %package demo Summary: Demo for %{name} Group: Productivity/Graphics/Vector Editors @@ -132,14 +151,53 @@ %prep %setup -q -n batik-%{version} + +find -name '*.class' -delete +find -name '*.jar' -delete + +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 + +cp -p %{SOURCE1} batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy +cp -p %{SOURCE1} batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy +rm -rf batik-script/src/main/java/org/apache/batik/script/jacl + +# It's an uberjar, it shouldn't have requires +%pom_xpath_inject pom:dependency '<optional>true</optional>' batik-all + +# eclipse expects xmlgraphics to be optional +%pom_xpath_inject 'pom:dependency[pom:artifactId="xmlgraphics-commons"]' '<optional>true</optional>' batik-css + +%pom_remove_dep :batik-i18n batik-util + +for pom in `find -mindepth 2 -name pom.xml -not -path ./batik-all/pom.xml`; do + %pom_add_plugin org.apache.felix:maven-bundle-plugin $pom " + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>org.apache.batik.$(sed 's:./batik-::;s:/pom.xml::' <<< $pom)</Bundle-SymbolicName> + </instructions> + </configuration> + " + %pom_xpath_inject pom:project '<packaging>bundle</packaging>' $pom +done + +# for eclipse +%pom_xpath_set pom:Bundle-SymbolicName org.apache.batik.util.gui batik-gui-util + +%pom_disable_module batik-test-old + +build-jar-repository -s lib js xml-apis xml-commons-apis-ext xalan-j2 xmlgraphics-commons jython %build export CLASSPATH= export OPT_JAR_LIST=: -ant all-jar jars +ant \ + -Dant.build.javac.source=6 -Dant.build.javac.target=6 \ + all-jar jars javadoc %install @@ -174,6 +232,45 @@ popd done +#pom +mkdir -p %{buildroot}%{_mavenpomdir}/%{name} + +cp -p pom.xml %{buildroot}%{_mavenpomdir}/%{name}/parent.pom +%add_maven_depmap %{name}/parent.pom + +cp -p batik-all/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-all.pom +%add_maven_depmap %{name}-all.pom %{name}-all-%{version}.jar + +for i in anim awt-util bridge codec constants dom ext extension gvt i18n parser script svg-dom svgbrowser svggen svgrasterizer swing transcoder util gui-util xml; +do + cp -p batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + %add_maven_depmap %{name}/${i}.pom %{name}/${i}-%{version}.jar +done + +cp -p batik-css/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/css.pom +%add_maven_depmap %{name}/css.pom %{name}/css-%{version}.jar -f css + +cp -p batik-svgpp/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/svgpp.pom +%add_maven_depmap %{name}/svgpp.pom %{name}/svgpp-%{version}.jar -f svgpp + +cp -p batik-ttf2svg/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/ttf2svg.pom +%add_maven_depmap %{name}/ttf2svg.pom %{name}/ttf2svg-%{version}.jar -f ttf2svg + +cp -p batik-slideshow/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/slideshow.pom +%add_maven_depmap %{name}/slideshow.pom %{name}/slideshow-%{version}.jar -f slideshow + +for i in squiggle squiggle-ext; +do + cp -p batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + %add_maven_depmap %{name}/${i}.pom %{name}/${i}-%{version}.jar -f squiggle +done + +for i in rasterizer rasterizer-ext; +do + cp -p batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + %add_maven_depmap %{name}/${i}.pom %{name}/${i}-%{version}.jar -f rasterizer +done + # scripts mkdir -p %{buildroot}%{_bindir} cp -p %{SOURCE1} %{buildroot}%{_bindir}/%{name}-squiggle @@ -184,7 +281,7 @@ # demo mkdir -p %{buildroot}%{_datadir}/%{name} -cp -pr contrib samples test-resources test-sources \ +cp -pr contrib samples test-resources \ %{buildroot}%{_datadir}/%{name} %fdupes -s %{buildroot}%{_datadir}/%{name} ln -s %{name} %{buildroot}%{_datadir}/batik @@ -193,9 +290,15 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name} cp -p %{SOURCE7} %{buildroot}%{_sysconfdir}/%{name}/rasterizer.policy +# javadoc +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr batik-%{version}/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} + %files %defattr(0644,root,root,0755) -%doc KEYS LICENSE MAINTAIN NOTICE README +%license LICENSE NOTICE +%doc KEYS MAINTAIN README %dir %{_javadir}/%{name} %{_javadir}/%{name}-all-%{version}.jar %{_javadir}/%{name}-all.jar @@ -209,8 +312,8 @@ %{_javadir}/%{name}/bridge.jar %{_javadir}/%{name}/codec-%{version}.jar %{_javadir}/%{name}/codec.jar -%{_javadir}/%{name}/css-%{version}.jar -%{_javadir}/%{name}/css.jar +%{_javadir}/%{name}/constants-%{version}.jar +%{_javadir}/%{name}/constants.jar %{_javadir}/%{name}/dom-%{version}.jar %{_javadir}/%{name}/dom.jar %{_javadir}/%{name}/ext-%{version}.jar @@ -221,14 +324,20 @@ %{_javadir}/%{name}/gui-util.jar %{_javadir}/%{name}/gvt-%{version}.jar %{_javadir}/%{name}/gvt.jar +%{_javadir}/%{name}/i18n-%{version}.jar +%{_javadir}/%{name}/i18n.jar %{_javadir}/%{name}/parser-%{version}.jar %{_javadir}/%{name}/parser.jar %{_javadir}/%{name}/script-%{version}.jar %{_javadir}/%{name}/script.jar %{_javadir}/%{name}/svg-dom-%{version}.jar %{_javadir}/%{name}/svg-dom.jar +%{_javadir}/%{name}/svgbrowser-%{version}.jar +%{_javadir}/%{name}/svgbrowser.jar %{_javadir}/%{name}/svggen-%{version}.jar %{_javadir}/%{name}/svggen.jar +%{_javadir}/%{name}/svgrasterizer-%{version}.jar +%{_javadir}/%{name}/svgrasterizer.jar %{_javadir}/%{name}/swing-%{version}.jar %{_javadir}/%{name}/swing.jar %{_javadir}/%{name}/transcoder-%{version}.jar @@ -237,8 +346,48 @@ %{_javadir}/%{name}/util.jar %{_javadir}/%{name}/xml-%{version}.jar %{_javadir}/%{name}/xml.jar +%dir %{_mavenpomdir}/%{name} +%{_mavenpomdir}/%{name}-all.pom +%{_mavenpomdir}/%{name}/anim.pom +%{_mavenpomdir}/%{name}/awt-util.pom +%{_mavenpomdir}/%{name}/bridge.pom +%{_mavenpomdir}/%{name}/codec.pom +%{_mavenpomdir}/%{name}/constants.pom +%{_mavenpomdir}/%{name}/dom.pom +%{_mavenpomdir}/%{name}/ext.pom +%{_mavenpomdir}/%{name}/extension.pom +%{_mavenpomdir}/%{name}/gui-util.pom +%{_mavenpomdir}/%{name}/gvt.pom +%{_mavenpomdir}/%{name}/i18n.pom +%{_mavenpomdir}/%{name}/parent.pom +%{_mavenpomdir}/%{name}/parser.pom +%{_mavenpomdir}/%{name}/script.pom +%{_mavenpomdir}/%{name}/svg-dom.pom +%{_mavenpomdir}/%{name}/svgbrowser.pom +%{_mavenpomdir}/%{name}/svggen.pom +%{_mavenpomdir}/%{name}/svgrasterizer.pom +%{_mavenpomdir}/%{name}/swing.pom +%{_mavenpomdir}/%{name}/transcoder.pom +%{_mavenpomdir}/%{name}/util.pom +%{_mavenpomdir}/%{name}/xml.pom +%if %{defined _maven_repository} +%config(noreplace) %{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml +%endif %dir %{_sysconfdir}/%{name} +%files css +%defattr(0644,root,root,0755) +%{_javadir}/%{name}/css-%{version}.jar +%{_javadir}/%{name}/css.jar +%{_mavenpomdir}/%{name}/css.pom +%if %{defined _maven_repository} +%config(noreplace) %{_mavendepmapfragdir}/%{name}-css +%else +%{_datadir}/maven-metadata/%{name}-css.xml +%endif + %files squiggle %defattr(0644,root,root,0755) %{_javadir}/%{name}/squiggle-%{version}.jar @@ -249,6 +398,13 @@ %{_javadir}/batik-squiggle.jar %{_javadir}/batik-squiggle-ext-%{version}.jar %{_javadir}/batik-squiggle-ext.jar +%{_mavenpomdir}/%{name}/squiggle.pom +%{_mavenpomdir}/%{name}/squiggle-ext.pom +%if %{defined _maven_repository} +%config(noreplace) %{_mavendepmapfragdir}/%{name}-squiggle +%else +%{_datadir}/maven-metadata/%{name}-squiggle.xml +%endif %attr(0755,root,root) %{_bindir}/%{name}-squiggle %files svgpp @@ -257,6 +413,12 @@ %{_javadir}/%{name}/svgpp.jar %{_javadir}/batik-svgpp-%{version}.jar %{_javadir}/batik-svgpp.jar +%{_mavenpomdir}/%{name}/svgpp.pom +%if %{defined _maven_repository} +%config(noreplace) %{_mavendepmapfragdir}/%{name}-svgpp +%else +%{_datadir}/maven-metadata/%{name}-svgpp.xml +%endif %attr(0755,root,root) %{_bindir}/%{name}-svgpp %files ttf2svg @@ -265,6 +427,12 @@ %{_javadir}/%{name}/ttf2svg.jar %{_javadir}/batik-ttf2svg-%{version}.jar %{_javadir}/batik-ttf2svg.jar +%{_mavenpomdir}/%{name}/ttf2svg.pom +%if %{defined _maven_repository} +%config(noreplace) %{_mavendepmapfragdir}/%{name}-ttf2svg +%else +%{_datadir}/maven-metadata/%{name}-ttf2svg.xml +%endif %attr(0755,root,root) %{_bindir}/%{name}-ttf2svg %files rasterizer @@ -277,6 +445,13 @@ %{_javadir}/batik-rasterizer.jar %{_javadir}/batik-rasterizer-ext-%{version}.jar %{_javadir}/batik-rasterizer-ext.jar +%{_mavenpomdir}/%{name}/rasterizer.pom +%{_mavenpomdir}/%{name}/rasterizer-ext.pom +%if %{defined _maven_repository} +%config(noreplace) %{_mavendepmapfragdir}/%{name}-rasterizer +%else +%{_datadir}/maven-metadata/%{name}-rasterizer.xml +%endif %attr(0755,root,root) %{_bindir}/%{name}-rasterizer %config(noreplace) %{_sysconfdir}/%{name}/rasterizer.policy @@ -286,6 +461,12 @@ %{_javadir}/%{name}/slideshow.jar %{_javadir}/batik-slideshow-%{version}.jar %{_javadir}/batik-slideshow.jar +%{_mavenpomdir}/%{name}/slideshow.pom +%if %{defined _maven_repository} +%config(noreplace) %{_mavendepmapfragdir}/%{name}-slideshow +%else +%{_datadir}/maven-metadata/%{name}-slideshow.xml +%endif %attr(0755,root,root) %{_bindir}/%{name}-slideshow %files demo @@ -297,4 +478,8 @@ %attr(0755,root,root) %{_datadir}/%{name}/contrib/rasterizertask/build.sh %attr(0755,root,root) %{_datadir}/%{name}/contrib/charts/convert.sh +%files javadoc +%license LICENSE NOTICE +%{_javadocdir}/%{name} + %changelog ++++++ 0001-Fix-imageio-codec-lookup.patch ++++++ >From 02e469f660450b37300984ad7ac258dfa0111baa Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Fri, 27 Nov 2015 15:35:57 +0100 Subject: [PATCH] Fix imageio codec lookup --- .../java/org/apache/batik/transcoder/image/PNGTranscoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java index c25804e..7ea8c26 100644 --- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java +++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java @@ -116,7 +116,7 @@ public class PNGTranscoder extends ImageTranscoder { "org.apache.batik.ext.awt.image.codec.png.PNGTranscoderInternalCodecWriteAdapter"); if (adapter == null) { adapter = getWriteAdapter( - "org.apache.batik.transcoder.image.PNGTranscoderImageIOWriteAdapter"); + "org.apache.batik.ext.awt.image.codec.imageio.PNGTranscoderImageIOWriteAdapter"); } if (adapter == null) { throw new TranscoderException( -- 2.17.0 ++++++ batik-src-1.9.tar.gz -> batik-src-1.10.tar.gz ++++++ /work/SRC/openSUSE:Factory/xmlgraphics-batik/batik-src-1.9.tar.gz /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new.28833/batik-src-1.10.tar.gz differ: char 13, line 1 ++++++ xmlgraphics-batik-manifests.patch ++++++ --- /var/tmp/diff_new_pack.JilgBR/_old 2019-02-04 21:22:37.887636462 +0100 +++ /var/tmp/diff_new_pack.JilgBR/_new 2019-02-04 21:22:37.887636462 +0100 @@ -1,8 +1,296 @@ -Index: batik-1.9/build.xml -=================================================================== ---- batik-1.9.orig/build.xml -+++ batik-1.9/build.xml -@@ -1729,14 +1729,6 @@ JAVA=/usr/bin/java +--- batik-1.10/build.xml 2018-05-11 14:00:20.000000000 +0200 ++++ batik-1.10/build.xml 2019-01-20 22:11:35.609531785 +0100 +@@ -1016,9 +1016,11 @@ + awt-util-jar, + gui-util-jar, + dom-jar, ++ constants-jar, + css-jar, + svg-dom-jar, + gvt-jar, ++ i18n-jar, + parser-jar, + script-jar, + transcoder-jar, +@@ -1029,8 +1031,10 @@ + extension-jar, + xml-jar, + root-jar, ++ svgbrowser-jar, + svg-pp-jar, + svggen-jar, ++ svgrasterizer-jar, + svg-slideshow-jar, + squiggle-jar, + squiggle-ext-jar, +@@ -1298,12 +1302,15 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.ext"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${lib}"> + <include name="LICENSE.dom-*.txt"/> + </metainf> + <fileset dir="${dest}"> + <include name="org/w3c/**"/> ++ <include name="${package-prefix}/w3c/**"/> + </fileset> + </jar> + </target> +@@ -1316,6 +1323,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.util"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1341,6 +1350,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.awt-util"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1365,6 +1376,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.codec"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1393,6 +1406,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.svggen"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1404,6 +1419,47 @@ + </jar> + </target> + ++ <target name="svgbrowser-jar" depends="init, compile, prepare-build"> ++ <jar jarfile="${build}/lib/${project}-svgbrowser-${completeVersion}.jar"> ++ <manifest> ++ <attribute name="Implementation-Title" value="Batik SVG Browser Application Library"/> ++ <attribute name="Implementation-Version" value="${completeVersion}"/> ++ <attribute name="Implementation-Vendor" value="${vendor}"/> ++ <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.svgbrowser"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> ++ </manifest> ++ <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> ++ <fileset dir="${dest}"> ++ <include name="${package-prefix}/apps/svgbrowser/**/*.class"/> ++ </fileset> ++ <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/"> ++ <include name="${package-prefix}/apps/svgbrowser/resources/*"/> ++ <include name="META-INF/services/org.apache.batik.apps.svgbrowser.SquiggleInputHandler"/> ++ </fileset> ++ </jar> ++ </target> ++ ++ <target name="svgrasterizer-jar" depends="init, compile, prepare-build"> ++ <jar jarfile="${build}/lib/${project}-svgrasterizer-${completeVersion}.jar"> ++ <manifest> ++ <attribute name="Implementation-Title" value="Batik SVG Rasterizer Library"/> ++ <attribute name="Implementation-Version" value="${completeVersion}"/> ++ <attribute name="Implementation-Vendor" value="${vendor}"/> ++ <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.svgrasterizer"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> ++ </manifest> ++ <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> ++ <fileset dir="${dest}"> ++ <include name="${package-prefix}/apps/rasterizer/**/*.class"/> ++ </fileset> ++ <fileset dir="batik-svgrasterizer/src/main/resources" excludes="**/.svn/"> ++ <include name="${package-prefix}/apps/rasterizer/resources/*"/> ++ </fileset> ++ </jar> ++ </target> ++ + <!-- SVGGraphics2D (dependencies: util, awt-util) --> + <target name="svggen-full-jar" depends="init, compile, prepare-build"> + <jar jarfile="${build}/lib/${project}-svggenfull-${completeVersion}.jar"> +@@ -1436,6 +1492,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.util.gui"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1456,6 +1514,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.dom"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1484,6 +1544,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.css"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1517,6 +1579,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.svg-dom"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1539,6 +1603,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.gvt"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1550,6 +1616,25 @@ + </jar> + </target> + ++ <target name="i18n-jar" depends="init, compile, prepare-build"> ++ <jar jarfile="${build}/lib/${project}-i18n-${completeVersion}.jar"> ++ <manifest> ++ <attribute name="Implementation-Title" value="Batik i18n library"/> ++ <attribute name="Implementation-Version" value="${completeVersion}"/> ++ <attribute name="Implementation-Vendor" value="${vendor}"/> ++ <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.i18n"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> ++ </manifest> ++ <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> ++ <fileset dir="${dest}"> ++ <include name="${package-prefix}/i18n/**/*.class"/> ++ </fileset> ++ <!-- <fileset dir="batik-i18n/src/main/resources" excludes="**/.svn/"> ++ <include name="${package-prefix}/i18n/**/resources/*"/> ++ </fileset> --> ++ </jar> ++ </target> + + <!-- Parser (dependencies: util) --> + <target name="parser-jar" depends="init, compile, prepare-build"> +@@ -1559,6 +1644,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.parser"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1579,6 +1666,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.script"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1600,6 +1689,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.transcoder"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1619,6 +1710,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.xml"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1638,6 +1731,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.bridge"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1650,6 +1745,23 @@ + </jar> + </target> + ++ <target name="constants-jar" depends="init, compile, prepare-build"> ++ <jar jarfile="${build}/lib/${project}-constants-${completeVersion}.jar"> ++ <manifest> ++ <attribute name="Implementation-Title" value="Batik constants library"/> ++ <attribute name="Implementation-Version" value="${completeVersion}"/> ++ <attribute name="Implementation-Vendor" value="${vendor}"/> ++ <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.constants"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> ++ </manifest> ++ <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> ++ <fileset dir="${dest}"> ++ <include name="${package-prefix}/util/XMLConstants*.class"/> ++ </fileset> ++ </jar> ++ </target> ++ + <!-- Swing (dependencies: all) --> + <target name="swing-jar" depends="init, compile, prepare-build"> + <jar jarfile="${build}/lib/${project}-swing-${completeVersion}.jar"> +@@ -1658,6 +1770,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.swing"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1677,6 +1791,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.anim"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1699,6 +1815,8 @@ + <attribute name="Implementation-Version" value="${completeVersion}"/> + <attribute name="Implementation-Vendor" value="${vendor}"/> + <attribute name="Build-Id" value="${build.id}"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.extension"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + <fileset dir="${dest}"> +@@ -1729,14 +1847,8 @@ <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Build-Id" value="${build.id}"/> <attribute name="Main-Class" value="org.apache.batik.apps.svgpp.Main"/> @@ -14,10 +302,12 @@ - <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" /> - <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" /> - <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" /> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.svgpp"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> <fileset dir="${dest}"> -@@ -1767,26 +1759,6 @@ JAVA=/usr/bin/java +@@ -1767,26 +1879,8 @@ <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Build-Id" value="${build.id}"/> <attribute name="Main-Class" value="org.apache.batik.apps.slideshow.Main"/> @@ -41,10 +331,12 @@ - <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" /> - <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" /> - <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.slideshow"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> <fileset dir="${dest}"> -@@ -1823,29 +1795,6 @@ JAVA=/usr/bin/java +@@ -1823,29 +1917,8 @@ <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main" /> <attribute name="Build-Id" value="${build.id}"/> @@ -71,19 +363,23 @@ - <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" /> - <attribute name="Class-Path" value="${jarsLibDir}js.jar" /> - <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.squiggle"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> <fileset dir="${dest}"> -@@ -1888,8 +1837,6 @@ JAVA=/usr/bin/java +@@ -1888,8 +1961,8 @@ <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Build-Id" value="${build.id}"/> <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/> - <attribute name="Class-Path" value="${jarsLibDir}${project}-squiggle-${completeVersion}.jar" /> - <attribute name="Class-Path" value="${jarsLibDir}${project}-${project}-extension-${completeVersion}.ja" /> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.squiggle-ext"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/"> -@@ -1935,28 +1882,6 @@ JAVA=/usr/bin/java +@@ -1935,28 +2008,8 @@ <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Main-Class" value="org.apache.batik.apps.rasterizer.Main" /> <attribute name="Build-Id" value="${build.id}"/> @@ -109,28 +405,34 @@ - <attribute name="Class-Path" value="${jarsLibDir}js.jar" /> - <attribute name="Class-Path" value="${jarsLibDir}fop-transcoder-allinone-${fopVersion}.jar" /> - <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar" /> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.rasterizer"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> <fileset dir="${dest}"> -@@ -1996,8 +1921,6 @@ JAVA=/usr/bin/java +@@ -1996,8 +2049,8 @@ <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Build-Id" value="${build.id}"/> <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/> - <attribute name="Class-Path" value="${jarsLibDir}${project}-extension-${jarVersion}.jar" /> - <attribute name="Class-Path" value="${jarsLibDir}${project}-rasterizer-${jarVersion}.jar" /> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.rasterizer-ext"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/"> -@@ -2033,8 +1956,6 @@ JAVA=/usr/bin/java +@@ -2033,8 +2086,8 @@ <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Build-Id" value="${build.id}"/> <attribute name="Main-Class" value="org.apache.batik.apps.ttf2svg.Main"/> - <attribute name="Class-Path" value="${jarsLibDir}${project}-svggen-${jarVersion}.jar" /> - <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" /> ++ <attribute name="Bundle-SymbolicName" value="org.apache.batik.ttf2svg"/> ++ <attribute name="Bundle-Version" value="${completeVersion}"/> </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> <fileset dir="${dest}"> -@@ -2052,34 +1973,6 @@ JAVA=/usr/bin/java +@@ -2052,34 +2105,6 @@ <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Build-Id" value="${build.id}"/> <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main" /> ++++++ xmlgraphics-batik-nolinksinjavadoc.patch ++++++ --- batik-1.10/build.xml 2018-05-11 14:00:20.000000000 +0200 +++ batik-1.10/build.xml 2019-01-20 07:21:04.538559085 +0100 @@ -2435,9 +2435,6 @@ <arg value="-notimestamp"/> <sourcepath path="${src}"/> <classpath refid="libs-classpath"/> - <link href="${dom.javadoc}"/> - <link href="${jdk.javadoc}"/> - <link href="${rhino.javadoc}"/> </javadoc> </target>
