[Git][java-team/lucene-solr][master] 5 commits: Really remove libcommons-httpclient-java from Build-Depends.

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / lucene-solr


Commits:
fddf1d5a by Markus Koschany at 2021-02-27T21:12:08+01:00
Really remove libcommons-httpclient-java from Build-Depends.

See #800983

- - - - -
8c0cfc8e by Markus Koschany at 2021-02-27T22:04:44+01:00
openjdk-17

- - - - -
ccb0258d by Markus Koschany at 2021-02-27T22:17:07+01:00
Really fix build failure with OpenJDK 17.

Closes: #982001

- - - - -
6d2e0e62 by Markus Koschany at 2021-02-27T22:25:15+01:00
Revert "openjdk-17"

This reverts commit 8c0cfc8eb8db93601d8da40a1510d85a6b29cd07.

- - - - -
7325a387 by Markus Koschany at 2021-02-27T22:26:05+01:00
Update changelog

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/disable-rmic.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+lucene-solr (3.6.2+dfsg-24) UNRELEASED; urgency=medium
+
+  * Really remove libcommons-httpclient-java from Build-Depends.
+    (Closes: #800983)
+  * Really fix build failure with OpenJDK 17. (Closes: #982001)
+
+ -- Markus Koschany <apo at debian.org>  Sat, 27 Feb 2021 22:25:22 +0100
+
 lucene-solr (3.6.2+dfsg-23) unstable; urgency=medium
 
   * Declare compliance with Debian Policy 4.5.1.


=====================================
debian/control
=====================================
@@ -20,7 +20,6 @@ Build-Depends:
  libcommons-compress-java,
  libcommons-digester-java,
  libcommons-fileupload-java (>= 1.2.1),
- libcommons-httpclient-java (>= 3.1),
  libcommons-io-java (>= 1.4),
  libcommons-lang-java,
  libcommons-logging-java,


=====================================
debian/patches/disable-rmic.patch
=====================================
@@ -0,0 +1,23 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 27 Feb 2021 22:15:45 +0100
+Subject: disable rmic
+
+Bug-Debian: https://bugs.debian.org/982001
+Forwarded: not-needed
+---
+ lucene/contrib/remote/build.xml | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/lucene/contrib/remote/build.xml b/lucene/contrib/remote/build.xml
+index 3978b74..1cf17e1 100644
+--- a/lucene/contrib/remote/build.xml
++++ b/lucene/contrib/remote/build.xml
+@@ -27,8 +27,5 @@
+ 	
+ 	<!-- Overrides common.compile-core to add rmic -->
+ 	<target name="compile-core" depends="common.compile-core" description="Compiles core classes, including rmic">
+-		<rmic classname="org.apache.lucene.search.RemoteSearchable" base="${build.dir}/classes/java" stubversion="1.2">
+-			<classpath refid="classpath" />
+-		</rmic>
+ 	</target>
+ </project>


=====================================
debian/patches/series
=====================================
@@ -1,10 +1,8 @@
-#add-osgi-manifest
 javacc-system.patch
 fix-jar-matches.patch
 disable-ivy.patch
 icu4.4-compat.patch
 regex-test-failure.patch
-#set-data-dir.patch
 remove-prettify.patch
 CVE-2013-6397.patch
 CVE-2013-6407_CVE-2013-6408.patch
@@ -18,3 +16,4 @@ ant-1.10.patch
 CVE-2018-1308.patch
 web.xml.patch
 CVE-2019-0193.patch
+disable-rmic.patch



View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/-/compare/d0eb5f536adad94f2cd7c2035b3df1f4ac61e6a0...7325a387cd3e01510dafd32395664a007cbeb249

-- 
View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/-/compare/d0eb5f536adad94f2cd7c2035b3df1f4ac61e6a0...7325a387cd3e01510dafd32395664a007cbeb249
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210227/84dfa7c2/attachment.htm>