Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jsoup for openSUSE:Factory checked in at 2021-08-27 21:43:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jsoup (Old) and /work/SRC/openSUSE:Factory/.jsoup.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jsoup" Fri Aug 27 21:43:51 2021 rev:2 rq:914521 version:1.14.2 Changes: -------- --- /work/SRC/openSUSE:Factory/jsoup/jsoup.changes 2019-02-25 17:54:26.798499671 +0100 +++ /work/SRC/openSUSE:Factory/.jsoup.new.1899/jsoup.changes 2021-08-27 21:45:00.378047599 +0200 @@ -1,0 +2,7 @@ +Fri Aug 27 06:57:23 UTC 2021 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 1.14.2 + * fixes bsc#1189749, CVE-2021-37714 +- Generate tarball using source service instead of a script + +------------------------------------------------------------------- Old: ---- generate-tarball.sh jsoup-1.11.3.tar.gz New: ---- _service jsoup-1.14.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jsoup.spec ++++++ --- /var/tmp/diff_new_pack.n4DcZV/_old 2021-08-27 21:45:00.918048244 +0200 +++ /var/tmp/diff_new_pack.n4DcZV/_new 2021-08-27 21:45:00.918048244 +0200 @@ -1,7 +1,7 @@ # # spec file for package jsoup # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,20 @@ Name: jsoup -Version: 1.11.3 +Version: 1.14.2 Release: 0 Summary: Java library for working with HTML License: MIT Group: Development/Libraries/Java -URL: http://jsoup.org/ +URL: https://jsoup.org/ # ./generate-tarball.sh -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.xz Source1: %{name}-build.xml -# The sources contain non-free scraped web pages as test data -Source100: generate-tarball.sh BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.7 BuildRequires: javapackages-local +BuildRequires: jsr-305 BuildArch: noarch %description @@ -58,14 +57,17 @@ API documentation for %{name}. %prep -%setup -q -n %{name}-%{name}-%{version} +%setup -q cp %{SOURCE1} . %pom_remove_plugin :animal-sniffer-maven-plugin -%pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin :japicmp-maven-plugin +%pom_remove_plugin :maven-failsafe-plugin %build -%ant -f %{name}-build.xml jar javadoc +mkdir -p lib +build-jar-repository -s lib jsr-305 +%{ant} -f %{name}-build.xml jar javadoc %install # jar ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/jhy/jsoup.git</param> <param name="version">1.14.2</param> <param name="revision">jsoup-1.14.2</param> <param name="exclude">src/test/resources</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ jsoup-build.xml ++++++ --- /var/tmp/diff_new_pack.n4DcZV/_old 2021-08-27 21:45:00.962048296 +0200 +++ /var/tmp/diff_new_pack.n4DcZV/_new 2021-08-27 21:45:00.966048301 +0200 @@ -11,7 +11,7 @@ <property name="project.name" value="jsoup Java HTML Parser"/> <property name="project.groupId" value="org.jsoup"/> <property name="project.artifactId" value="jsoup"/> - <property name="project.version" value="1.11.3"/> + <property name="project.version" value="1.14.2"/> <property name="project.description" value="jsoup is a Java library for working with real-world HTML. It provides a very convenient API for extracting and manipulating data, using the best of DOM, CSS, and jquery-like methods. jsoup implements the WHATWG HTML5 specification, and parses HTML to the same DOM as modern browsers do."/> <property name="project.organization.name" value="Jonathan Hedley"/> <property name="project.build.sourceEncoding" value="UTF-8"/> @@ -24,12 +24,22 @@ <property name="build.resourceDir.0" value="src/main/java"/> <property name="build.resourceDir.1" value="."/> - <property name="compiler.source" value="1.7"/> + <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <fileset dir="lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <!-- ====================================================================== --> <!-- Cleaning up target --> <!-- ====================================================================== --> @@ -56,6 +66,7 @@ <src> <pathelement location="${build.srcDir.0}"/> </src> + <classpath refid="build.classpath"/> </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir.0}"> @@ -95,12 +106,14 @@ nonavbar="false" serialwarn="false" source="${compiler.source}" - encoding="${project.build.sourceEncoding}" + encoding="${project.build.sourceEncoding}" linksource="false" overview="${build.javadocDir.0}/overview.html" doctitle="${project.name} ${project.version} API" windowtitle="${project.name} ${project.version} API" - breakiterator="false"/> + breakiterator="false"> + <classpath refid="build.classpath"/> + </javadoc> </target> <!-- ====================================================================== --> @@ -122,10 +135,10 @@ <attribute name="Bundle-SymbolicName" value="org.jsoup"/> <attribute name="Bundle-Vendor" value="${project.organization.name}"/> <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.jsoup;uses:="javax.net.ssl,org.jsoup.nodes,org.jsoup.parser,org.jsoup.safety";version="${project.version}",org.jsoup.nodes;uses:="org.jsoup,org.jsoup.parser,org.jsoup.select";version="${project.version}",org.jsoup.parser;uses:="org.jsoup.nodes";version="${project.version}",org.jsoup.helper;uses:="javax.net.ssl,javax.xml.parsers,org.jsoup,org.jsoup.nodes,org.jsoup.parser,org.jsoup.select,org.w3c.dom";version="${project.version}",org.jsoup.select;uses:="org.jsoup.nodes";version="${project.version}",org.jsoup.examples;uses:="org.jsoup.nodes";version="${project.version}",org.jsoup.safety;uses:="org.jsoup.nodes";version="${project.version}""/> - <attribute name="Import-Package" value="javax.net.ssl,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.jsoup,org.w3c.dom"/> + <attribute name="Export-Package" value="org.jsoup;uses:="javax.annotation,javax.net.ssl,org.jsoup.nodes,org.jsoup.parser,org.jsoup.safety";version="${project.version}",org.jsoup.examples;uses:="org.jsoup.nodes";version="${project.version}",org.jsoup.helper;uses:="javax.annotation,javax.net.ssl,javax.xml.parsers,org.jsoup,org.jsoup.nodes,org.jsoup.parser,org.jsoup.select,org.w3c.dom";version="${project.version}",org.jsoup.internal;uses:="javax.annotation,javax.annotation.meta";version="${project.version}",org.jsoup.nodes;uses:="javax.annotation,org.jsoup,org.jsoup.parser,org.jsoup.select";version="${project.version}",org.jsoup.parser;uses:="javax.annotation,org.jsoup.nodes";version="${project.version}",org.jsoup.safety;uses:="org.jsoup.nodes";version="${project.version}",org.jsoup.select;uses:="javax.annotation,org.jsoup.nodes"; version="${project.version}""/> + <attribute name="Import-Package" value="javax.annotation,javax.annotation.meta,javax.net.ssl,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.jsoup,org.jsoup.helper,org.jsoup.internal,org.jsoup.nodes,org.jsoup.parser,org.jsoup.safety,org.jsoup.select,org.w3c.dom"/> <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> - </manifest> + </manifest> </jar> </target>
