[Git][java-team/carrotsearch-randomizedtesting][master] 3 commits: Fixed the compatibility of the junit4-ant module with Java 11
Emmanuel Bourg
gitlab at salsa.debian.org
Fri Sep 20 09:48:41 BST 2019
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / carrotsearch-randomizedtesting
Commits:
357f3b23 by Emmanuel Bourg at 2019-09-20T08:02:49Z
Fixed the compatibility of the junit4-ant module with Java 11
- - - - -
4ee2e640 by Emmanuel Bourg at 2019-09-20T08:44:20Z
Added the missing dependencies required by junit4-ant
- - - - -
67704196 by Emmanuel Bourg at 2019-09-20T08:45:45Z
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/patches/0003-java11-compatibility.patch
- + debian/patches/0004-fix-dependencies.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+carrotsearch-randomizedtesting (2.1.17-4) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the compatibility of the junit4-ant module with Java 11
+ * Added the missing dependencies required by junit4-ant
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 20 Sep 2019 10:45:12 +0200
+
carrotsearch-randomizedtesting (2.1.17-3) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -8,7 +8,8 @@ Build-Depends:
debhelper (>= 11),
default-jdk,
junit4,
- libasm-java (>= 5.0),
+ libasm-java (>= 7.0),
+ libcommons-io-java,
libdom4j-java,
libgoogle-gson-java,
libguava-java,
@@ -26,7 +27,7 @@ Homepage: http://labs.carrotsearch.com/randomizedtesting.html
Package: libcarrotsearch-randomizedtesting-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${misc:Depends}, ${maven:Depends}, libcommons-io-java, libguava-java
Recommends: ${maven:OptionalDepends}
Description: Randomized testing infrastructure for JUnit, Ant and Maven
Inspired by the Apache Lucene project's infrastructure, this project brings
=====================================
debian/patches/0003-java11-compatibility.patch
=====================================
@@ -0,0 +1,13 @@
+Description: Fixes the compatibility with Java 11
+Origin: backport, https://github.com/randomizedtesting/randomizedtesting/commit/e8839732
+--- a/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/JUnit4.java
++++ b/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/JUnit4.java
+@@ -1712,7 +1712,7 @@
+ final String REPLICATE_CLASS = "com.carrotsearch.randomizedtesting.annotations.ReplicateOnEachVm";
+ final TestClass testClass = new TestClass();
+ ClassReader reader = new ClassReader(is);
+- ClassVisitor annotationVisitor = new ClassVisitor(Opcodes.ASM5) {
++ ClassVisitor annotationVisitor = new ClassVisitor(Opcodes.ASM7) {
+ @Override
+ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+ String className = Type.getType(desc).getClassName();
=====================================
debian/patches/0004-fix-dependencies.patch
=====================================
@@ -0,0 +1,56 @@
+Description: Remove the 'provided' scope to ensure the package depends on the right dependencies.
+ This is necessary because proguard is disabled and the dependencies aren't embedded in a single jar.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/junit4-ant/pom.xml
++++ b/junit4-ant/pom.xml
+@@ -22,7 +22,6 @@
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+- <scope>provided</scope>
+ </dependency>
+
+ <!-- Required at runtime -->
+@@ -31,7 +30,6 @@
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <type>jar</type>
+- <scope>provided</scope>
+ </dependency>
+
+ <!-- Embedded into standalone JAR. -->
+@@ -39,7 +37,6 @@
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+- <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jsr305</artifactId>
+@@ -51,25 +48,21 @@
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+- <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+- <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+- <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.simpleframework</groupId>
+ <artifactId>simple-xml</artifactId>
+- <scope>provided</scope>
+ </dependency>
+
+ <dependency>
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
0001-remove-hamcrest-core-exclusion.patch
0002-remove-submodules-and-proguard-related-stuff.-Won-t-.patch
+0003-java11-compatibility.patch
+0004-fix-dependencies.patch
View it on GitLab: https://salsa.debian.org/java-team/carrotsearch-randomizedtesting/compare/60b6e5c5f9075f45070b5a05d7a49b088d4999fe...67704196419f0bc20049e58799fc505e5bd6de48
--
View it on GitLab: https://salsa.debian.org/java-team/carrotsearch-randomizedtesting/compare/60b6e5c5f9075f45070b5a05d7a49b088d4999fe...67704196419f0bc20049e58799fc505e5bd6de48
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/20190920/7d93205f/attachment.html>
More information about the pkg-java-commits
mailing list