[Git][java-team/lucene8][master] 2 commits: Fix FTBFS due to JARs not being present for all hamcrest artifacts (Closes: #1022323).

[Andrius Merkys (@merkys)]

Andrius Merkys pushed to branch master at Debian Java Maintainers / lucene8


Commits:
8a623bc0 by Andrius Merkys at 2022-11-25T07:59:43-05:00
Fix FTBFS due to JARs not being present for all hamcrest artifacts (Closes: #1022323).

- - - - -
f22e7bdf by Andrius Merkys at 2022-11-25T08:00:34-05:00
Update changelog for 8.8.1-4 release

- - - - -


2 changed files:

- debian/changelog
- debian/patches/0002-missing-hamcrest-dependency.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+lucene8 (8.8.1-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS due to JARs not being present for all hamcrest artifacts
+    (Closes: #1022323).
+
+ -- Andrius Merkys <merkys at debian.org>  Fri, 25 Nov 2022 08:00:25 -0500
+
 lucene8 (8.8.1-3) unstable; urgency=medium
 
   * Fixed the build failure with OpenJDK 17 (Closes: #1011606)


=====================================
debian/patches/0002-missing-hamcrest-dependency.patch
=====================================
@@ -4,8 +4,6 @@ Forwarded: not-needed
 Bug-Debian: https://bugs.debian.org/822843
 
 --
-diff --git a/test-framework/ivy.xml b/test-framework/ivy.xml
-index 9b2932d..c6aa492 100644
 --- a/test-framework/ivy.xml
 +++ b/test-framework/ivy.xml
 @@ -25,7 +25,7 @@
@@ -13,7 +11,18 @@ index 9b2932d..c6aa492 100644
    <dependencies>
      <dependency org="junit" name="junit" rev="${/junit/junit}" conf="compile"/>
 -    <dependency org="org.hamcrest" name="hamcrest-core" rev="${/org.hamcrest/hamcrest-core}" conf="compile"/>
-+    <dependency org="org.hamcrest" name="hamcrest-core" rev="debian" conf="compile"/>
++    <dependency org="org.hamcrest" name="hamcrest" rev="${/org.hamcrest/hamcrest}" conf="compile"/>
      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="${/com.carrotsearch.randomizedtesting/randomizedtesting-runner}" conf="compile"/>
  
      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
+--- a/ivy-versions.properties
++++ b/ivy-versions.properties
+@@ -283,7 +283,7 @@
+ /org.gagravarr/vorbis-java-core = ${org.gagravarr.vorbis.java.version}
+ /org.gagravarr/vorbis-java-tika = ${org.gagravarr.vorbis.java.version}
+ 
+-/org.hamcrest/hamcrest-core = 1.3
++/org.hamcrest/hamcrest = 1.3
+ 
+ /org.hsqldb/hsqldb = 2.4.0
+ /org.jdom/jdom2 = 2.0.6



View it on GitLab: https://salsa.debian.org/java-team/lucene8/-/compare/da2becf908eddf803b6f858f6201aa95f1dd1ebe...f22e7bdfd29d46b378c85c6463473792e50eb721

-- 
View it on GitLab: https://salsa.debian.org/java-team/lucene8/-/compare/da2becf908eddf803b6f858f6201aa95f1dd1ebe...f22e7bdfd29d46b378c85c6463473792e50eb721
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/20221125/e583368f/attachment.htm>