[Git][java-team/jimfs][master] 3 commits: Revert previous attempt to fix build issue

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Java Maintainers / jimfs


Commits:
83d1bb3a by Andreas Tille at 2020-08-08T17:26:31+02:00
Revert previous attempt to fix build issue

- - - - -
8a486fcb by Andreas Tille at 2020-08-08T17:29:29+02:00
Build targetting Java 1.8

- - - - -
203dbe07 by Andreas Tille at 2020-08-08T17:32:03+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/maven.properties
- − debian/patches/fix-963396.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
-jimfs (1.1-6) UNRELEASED; urgency=medium
+jimfs (1.1-6) unstable; urgency=medium
 
+  [ Andreas Tille ]
   * Team upload.
   * Standards-Version: 4.5.0 (routine-update)
   * debhelper-compat 13 (routine-update)
@@ -11,10 +12,12 @@ jimfs (1.1-6) UNRELEASED; urgency=medium
   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
     Repository-Browse.
   * Drop redundant debian/gbp.conf
-  * Fix build issue
-    Closes: 963396
 
- -- Andreas Tille <tille at debian.org>  Thu, 06 Aug 2020 10:20:18 +0200
+  [ Thorsten Glaser ]
+  * Build targetting Java 1.8
+    Closes: #963396
+
+ -- Andreas Tille <tille at debian.org>  Sat, 08 Aug 2020 17:29:41 +0200
 
 jimfs (1.1-5) unstable; urgency=medium
 


=====================================
debian/maven.properties
=====================================
@@ -1,3 +1,4 @@
 # Include here properties to pass to Maven during the build.
 
 maven.test.skip=true
+java.version=1.8


=====================================
debian/patches/fix-963396.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Origin: https://lists.debian.org/debian-java/2020/08/msg00006.html
-Author: Thorsten Glaser <t.glaser at tarent.de>
-Date: Thu, 6 Aug 2020 16:04:22 +0200 (CEST)
-Bug-Debian: https://bugs.debian.org/963396
-Description: Fix build issue
-
---- a/jimfs/src/main/java/com/google/common/jimfs/PathService.java
-+++ b/jimfs/src/main/java/com/google/common/jimfs/PathService.java
-@@ -289,7 +289,7 @@ final class PathService implements Compa
-   private static final Predicate<Object> NOT_EMPTY =
-       new Predicate<Object>() {
-         @Override
--        public boolean apply(Object input) {
-+        public boolean test(Object input) {
-           return !input.toString().isEmpty();
-         }
-       };


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
 remove-com.google.auto.service-dep.patch
 disable-tests-due-to-missing-deps.patch
-fix-963396.patch



View it on GitLab: https://salsa.debian.org/java-team/jimfs/-/compare/2d67acb2f577596a121622a94295407e22155eed...203dbe07c4c87a62634b9717dc59fc052ce2292b

-- 
View it on GitLab: https://salsa.debian.org/java-team/jimfs/-/compare/2d67acb2f577596a121622a94295407e22155eed...203dbe07c4c87a62634b9717dc59fc052ce2292b
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/20200808/4158e597/attachment.html>