Pierre Gruet pushed to branch master at Debian Java Maintainers / zookeeper
Commits: 2a25e091 by Pierre Gruet at 2022-10-31T15:49:09+01:00 Using Suite instead of deprecated JunitPlatform to run unit tests - - - - - be389c56 by Pierre Gruet at 2022-10-31T15:49:47+01:00 Exporting LC_ALL=C.UTF-8 in d/rules - - - - - 52b08128 by Pierre Gruet at 2022-10-31T15:50:05+01:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - + debian/patches/36-JUnitPlatform-deprecation.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +zookeeper (3.8.0-9) unstable; urgency=medium + + * Team upload + * Using Suite instead of deprecated JunitPlatform to run unit tests + (Closes: #1022333) + * Exporting LC_ALL=C.UTF-8 in d/rules + + -- Pierre Gruet <p...@debian.org> Mon, 31 Oct 2022 15:49:56 +0100 + zookeeper (3.8.0-8) unstable; urgency=medium * Team upload ===================================== debian/patches/36-JUnitPlatform-deprecation.patch ===================================== @@ -0,0 +1,53 @@ +Description: JunitPlatform is deprecated in JUnit5, starting from the version + 1.8 of junit-platform. Using Suite instead. +Author: Pierre Gruet <p...@debian.org> +Forwarded: no +Last-Update: 2022-10-31 + +--- a/pom.xml ++++ b/pom.xml +@@ -588,6 +588,11 @@ + <version>${junit.version}</version> + </dependency> + <dependency> ++ <groupId>org.junit.platform</groupId> ++ <artifactId>junit-platform-suite-engine</artifactId> ++ <version>debian</version> ++ </dependency> ++ <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <version>${junit.version}</version> +--- a/zookeeper-server/pom.xml ++++ b/zookeeper-server/pom.xml +@@ -164,6 +164,11 @@ + <scope>test</scope> + </dependency> + <dependency> ++ <groupId>org.junit.platform</groupId> ++ <artifactId>junit-platform-suite-engine</artifactId> ++ <scope>test</scope> ++ </dependency> ++ <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <scope>test</scope> +--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/NettyNettySuiteTest.java ++++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NettyNettySuiteTest.java +@@ -18,14 +18,13 @@ + + package org.apache.zookeeper.test; + +-import org.junit.platform.runner.JUnitPlatform; + import org.junit.platform.suite.api.SelectClasses; +-import org.junit.runner.RunWith; ++import org.junit.platform.suite.api.Suite; + + /** + * Run tests with: Netty Client against Netty server + */ +-@RunWith(JUnitPlatform.class) ++@Suite + @SelectClasses({ACLTest.class, AsyncOpsTest.class, ChrootClientTest.class, ClientTest.class, FourLetterWordsTest.class, NullDataTest.class, SessionTest.class, WatcherTest.class, ReconfigTest.class}) + public class NettyNettySuiteTest extends NettyNettySuiteBase { + ===================================== debian/patches/series ===================================== @@ -31,3 +31,4 @@ 33-spelling.patch 34-no-rpath-with-libtool.patch 35-flaky-test.patch +36-JUnitPlatform-deprecation.patch ===================================== debian/rules ===================================== @@ -1,5 +1,6 @@ #!/usr/bin/make -f +export LC_ALL=C.UTF-8 export JAVA_HOME=/usr/lib/jvm/default-java DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) View it on GitLab: https://salsa.debian.org/java-team/zookeeper/-/compare/b74ebf0d654c87ad2100b7688b0e395bd41a1540...52b08128e6f0a198a02c325b0cc5a0f98039bc69 -- View it on GitLab: https://salsa.debian.org/java-team/zookeeper/-/compare/b74ebf0d654c87ad2100b7688b0e395bd41a1540...52b08128e6f0a198a02c325b0cc5a0f98039bc69 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits