Tony Mancill pushed to branch master at Debian Java Maintainers / testng
Commits: 78258422 by tony mancill at 2018-08-08T13:23:00Z apply patch to remove guava dependency - - - - - 74c20f27 by tony mancill at 2018-08-08T13:24:50Z prepare changelog for upload - - - - - 3 changed files: - debian/changelog - + debian/patches/remove-guava-dependency-pr1086.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +testng (6.9.12-4) unstable; urgency=medium + + * Team upload. + + [ Tiago Stürmer Daitx ] + * d/p/remove-guava-dependency-pr1086.patch: apply upstream patch to + remove guava dependency (Closes: #905675, LP: #1785896) + + -- tony mancill <[email protected]> Wed, 08 Aug 2018 06:24:23 -0700 + testng (6.9.12-3) unstable; urgency=medium * Team upload. ===================================== debian/patches/remove-guava-dependency-pr1086.patch ===================================== --- /dev/null +++ b/debian/patches/remove-guava-dependency-pr1086.patch @@ -0,0 +1,56 @@ +From deeb5847282ae3b5b185c046a8146814bf98b124 Mon Sep 17 00:00:00 2001 +From: Julien Herr <[email protected]> +Date: Thu, 7 Jul 2016 23:04:24 +0200 +Subject: [PATCH] Fix #1085 Remove Guava dependency + +--- + .../internal/annotations/JDK15TagFactory.java | 2 +- + .../org/testng/internal/collections/Ints.java | 19 +++++++++++++++++++ + 2 files changed, 20 insertions(+), 1 deletion(-) + create mode 100644 src/main/java/org/testng/internal/collections/Ints.java + +diff --git a/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java b/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java +index 7e79166d1..7ed9cc19e 100755 +--- a/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java ++++ b/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java +@@ -6,7 +6,6 @@ + import java.util.List; + import java.util.Set; + +-import com.google.common.primitives.Ints; + import org.testng.IAnnotationTransformer; + import org.testng.TestNGException; + import org.testng.annotations.AfterClass; +@@ -37,6 +36,7 @@ + import org.testng.annotations.Test; + import org.testng.collections.Lists; + import org.testng.internal.Utils; ++import org.testng.internal.collections.Ints; + + /** + * This class creates implementations of IAnnotations based on the JDK5 +diff --git a/src/main/java/org/testng/internal/collections/Ints.java b/src/main/java/org/testng/internal/collections/Ints.java +new file mode 100644 +index 000000000..1194230f6 +--- /dev/null ++++ b/src/main/java/org/testng/internal/collections/Ints.java +@@ -0,0 +1,19 @@ ++package org.testng.internal.collections; ++ ++import java.util.ArrayList; ++import java.util.List; ++ ++public final class Ints { ++ ++ private Ints() { ++ throw new Error(); ++ } ++ ++ public static List<Integer> asList(int... ints) { ++ ArrayList<Integer> result = new ArrayList<>(ints.length); ++ for (int val : ints) { ++ result.add(val); ++ } ++ return result; ++ } ++} ===================================== debian/patches/series ===================================== --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ version_java.patch +remove-guava-dependency-pr1086.patch View it on GitLab: https://salsa.debian.org/java-team/testng/compare/12bae0755b067c0f89fd99c3d6eaf5c90d5b1b65...74c20f27274893d72840dd74a4585d1bc743703a -- View it on GitLab: https://salsa.debian.org/java-team/testng/compare/12bae0755b067c0f89fd99c3d6eaf5c90d5b1b65...74c20f27274893d72840dd74a4585d1bc743703a You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
