From 0e238df04d38e2c17ea8c10bde72b106f6f4fb8ee1163380fbaa0e60e43c438e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 25 Aug 2021 13:43:14 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/jsoup?expand=0&rev=6

---
 jsoup-1.14.2.tar.gz |  3 +++
 jsoup-build.xml     | 23 ++++++++++++++++++-----
 jsoup.spec          | 14 +++++++++-----
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 jsoup-1.14.2.tar.gz

diff --git a/jsoup-1.14.2.tar.gz b/jsoup-1.14.2.tar.gz
new file mode 100644
index 0000000..fcc0934
--- /dev/null
+++ b/jsoup-1.14.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84e5bf69bd73e50fb348a0963a067e8306a77db6ffc54dac1aa16c9fb9cfb4e5
+size 299703
diff --git a/jsoup-build.xml b/jsoup-build.xml
index 1511c01..4a0877e 100644
--- a/jsoup-build.xml
+++ b/jsoup-build.xml
@@ -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,11 +24,21 @@
   <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}">
@@ -100,7 +111,9 @@
              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,8 +135,8 @@
         <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:=&quot;javax.net.ssl,org.jsoup.nodes,org.jsoup.parser,org.jsoup.safety&quot;;version=&quot;${project.version}&quot;,org.jsoup.nodes;uses:=&quot;org.jsoup,org.jsoup.parser,org.jsoup.select&quot;;version=&quot;${project.version}&quot;,org.jsoup.parser;uses:=&quot;org.jsoup.nodes&quot;;version=&quot;${project.version}&quot;,org.jsoup.helper;uses:=&quot;javax.net.ssl,javax.xml.parsers,org.jsoup,org.jsoup.nodes,org.jsoup.parser,org.jsoup.select,org.w3c.dom&quot;;version=&quot;${project.version}&quot;,org.jsoup.select;uses:=&quot;org.jsoup.nodes&quot;;version=&quot;${project.version}&quot;,org.jsoup.examples;uses:=&quot;org.jsoup.nodes&quot;;version=&quot;${project.version}&quot;,org.jsoup.safety;uses:=&quot;org.jsoup.nodes&quot;;version=&quot;${project.version}&quot;"/>
-        <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;version=&quot;${project.version}&quot;;uses:=&quot;javax.annotation,javax.net.ssl,org.jsoup.nodes,org.jsoup.parser,org.jsoup.safety&quot;,org.jsoup.examples;version=&quot;${project.version}&quot;;uses:=&quot;org.jsoup.nodes&quot;,org.jsoup.helper;version=&quot;${project.version}&quot;;uses:=&quot;javax.annotation,javax.net.ssl,javax.xml.parsers,org.jsoup,org.jsoup.nodes,org.jsoup.parser,org.jsoup.select,org.w3c.dom&quot;,org.jsoup.internal;version=&quot;${project.version}&quot;;uses:=&quot;javax.annotation,javax.annotation.meta&quot;,org.jsoup.nodes;version=&quot;${project.version}&quot;;uses:=&quot;javax.annotation,org.jsoup,org.jsoup.parser,org.jsoup.select&quot;,org.jsoup.parser;version=&quot;${project.version}&quot;;uses:=&quot;javax.annotation,org.jsoup.nodes&quot;,org.jsoup.safety;version=&quot;${project.version}&quot;;uses:=&quot;org.jsoup.nodes&quot;,org.jsoup.select;version=&quot;${project.version}&quot;;uses:=&quot;javax.annotation,org.jsoup.nodes&quot;"/>
+		<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:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
 	  </manifest>
     </jar>
diff --git a/jsoup.spec b/jsoup.spec
index 375709b..353f6b1 100644
--- a/jsoup.spec
+++ b/jsoup.spec
@@ -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,12 +17,12 @@
 
 
 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
 Source1:        %{name}-build.xml
@@ -32,6 +32,7 @@ BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-local
+BuildRequires:  jsr-305
 BuildArch:      noarch
 
 %description
@@ -62,10 +63,13 @@ API documentation for %{name}.
 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