[Git][java-team/carrotsearch-randomizedtesting][master] 8 commits: Standards-Version updated to 4.6.2

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Tue Jan 10 16:05:23 GMT 2023



Emmanuel Bourg pushed to branch master at Debian Java Maintainers / carrotsearch-randomizedtesting


Commits:
7178a0ee by Emmanuel Bourg at 2023-01-10T16:52:04+01:00
Standards-Version updated to 4.6.2

- - - - -
c86d1b6d by Emmanuel Bourg at 2023-01-10T16:52:58+01:00
Wrap and sort

- - - - -
e6feb225 by Emmanuel Bourg at 2023-01-10T16:54:12+01:00
Fixed the watch file

- - - - -
489f8bc7 by Emmanuel Bourg at 2023-01-10T16:57:44+01:00
New upstream version 2.7.9
- - - - -
a1579eef by Emmanuel Bourg at 2023-01-10T16:57:45+01:00
Update upstream source from tag 'upstream/2.7.9'

Update to upstream version '2.7.9'
with Debian dir 17df12ec98207d87ff4b98bf4504f252287797a4
- - - - -
9bb86832 by Emmanuel Bourg at 2023-01-10T16:59:06+01:00
Refreshed the patches

- - - - -
99632937 by Emmanuel Bourg at 2023-01-10T17:03:36+01:00
Disable maven-site-plugin

- - - - -
63f6c7aa by Emmanuel Bourg at 2023-01-10T17:05:02+01:00
Upload to unstable

- - - - -


18 changed files:

- CHANGES.txt
- debian/changelog
- debian/control
- debian/maven.ignoreRules
- − debian/patches/0003-java11-compatibility.patch
- debian/patches/series
- debian/watch
- examples/ant/pom.xml
- examples/maven/pom.xml
- examples/security-manager/pom.xml
- junit4-ant/pom.xml
- junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/JUnit4.java
- junit4-maven-plugin-tests/pom.xml
- junit4-maven-plugin/pom.xml
- pom.xml
- randomized-runner/pom.xml
- randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/RandomizedTest.java
- randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/generators/TestRealisticUnicodeGenerator.java


Changes:

=====================================
CHANGES.txt
=====================================
@@ -5,6 +5,16 @@ RandomizedTesting, Change Log
 For an up-to-date CHANGES file see 
 https://github.com/randomizedtesting/randomizedtesting/blob/master/CHANGES
 
+======================= randomizedtesting 2.7.9 ====================
+
+Other:
+
+  * Update ASM to 9.2 to support JDK 17
+
+  * Update JUnit dependency to 4.13.1.
+
+  * Update Ant dependency to 1.9.15.
+
 ======================= randomizedtesting 2.7.8 ====================
 
 Improvements


=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+carrotsearch-randomizedtesting (2.7.9-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+  * Disable maven-site-plugin
+  * Standards-Version updated to 4.6.2
+  * Fixed the watch file
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 Jan 2023 17:04:57 +0100
+
 carrotsearch-randomizedtesting (2.7.8-2) unstable; urgency=medium
 
   * Add dependency on libsimple-xml-java as the binary package


=====================================
debian/control
=====================================
@@ -2,7 +2,8 @@ Source: carrotsearch-randomizedtesting
 Section: java
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
+Uploaders:
+ Sudip Mukherjee <sudipm.mukherjee at gmail.com>
 Build-Depends:
  ant,
  ant-optional,
@@ -10,6 +11,7 @@ Build-Depends:
  default-jdk,
  junit4,
  libasm-java (>= 7.0),
+ libassertj-core-java,
  libcommons-io-java,
  libdom4j-java,
  libgoogle-gson-java,
@@ -20,16 +22,19 @@ Build-Depends:
  libmaven-invoker-plugin-java,
  libmaven-plugin-tools-java (>= 3.2),
  libsimple-xml-java (>> 2.7.1),
- maven-debian-helper (>= 2.0),
- libassertj-core-java
-Standards-Version: 4.5.0
+ maven-debian-helper (>= 2.0)
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/carrotsearch-randomizedtesting.git
 Vcs-Browser: https://salsa.debian.org/java-team/carrotsearch-randomizedtesting
 Homepage: http://labs.carrotsearch.com/randomizedtesting.html
 
 Package: libcarrotsearch-randomizedtesting-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}, libcommons-io-java, libguava-java,
+Depends:
+ ${misc:Depends},
+ ${maven:Depends},
+ libcommons-io-java,
+ libguava-java,
  libsimple-xml-java
 Recommends: ${maven:OptionalDepends}
 Description: Randomized testing infrastructure for JUnit, Ant and Maven


=====================================
debian/maven.ignoreRules
=====================================
@@ -7,3 +7,4 @@ com.pyx4me proguard-maven-plugin * * * *
 net.sf.proguard proguard * * * *
 org.easytesting fest-assert-core * * * *
 org.apache.maven.plugins maven-enforcer-plugin * * * *
+org.apache.maven.plugins maven-site-plugin * * * *


=====================================
debian/patches/0003-java11-compatibility.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Description: Fixes the compatibility with Java 11
-Origin: backport, https://github.com/randomizedtesting/randomizedtesting/commit/e8839732
-
---
-diff --git 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
-index f4b3e83..b703270 100644
---- 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
-@@ -1835,7 +1835,7 @@ public class JUnit4 extends Task {
-             final TestClass testClass = new TestClass();
-             ClassReader reader = new ClassReader(is);
-             @SuppressWarnings("deprecation")
--            ClassVisitor annotationVisitor = new ClassVisitor(Opcodes.ASM8) {
-+            ClassVisitor annotationVisitor = new ClassVisitor(Opcodes.ASM7) {
-               @Override
-               public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-                 String className = Type.getType(desc).getClassName();


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
 0002-remove-submodules-and-proguard-related-stuff.-Won-t-.patch
-0003-java11-compatibility.patch
 0004-fix-dependencies.patch


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
-opts=dversionmangle=s/\+dfsg.*$// \
-    https://github.com/carrotsearch/randomizedtesting/releases .*/(.*)\.tar\.gz
\ No newline at end of file
+version=4
+opts="mode=git" \
+https://github.com/carrotsearch/randomizedtesting refs/tags/release/([\d.]+)


=====================================
examples/ant/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.carrotsearch.randomizedtesting</groupId>
     <artifactId>randomizedtesting-parent</artifactId>
-    <version>2.7.8</version>
+    <version>2.7.9</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 


=====================================
examples/maven/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.carrotsearch.randomizedtesting</groupId>
     <artifactId>randomizedtesting-parent</artifactId>
-    <version>2.7.8</version>
+    <version>2.7.9</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 


=====================================
examples/security-manager/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.carrotsearch.randomizedtesting</groupId>
     <artifactId>randomizedtesting-parent</artifactId>
-    <version>2.7.8</version>
+    <version>2.7.9</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 


=====================================
junit4-ant/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.carrotsearch.randomizedtesting</groupId>
     <artifactId>randomizedtesting-parent</artifactId>
-    <version>2.7.8</version>
+    <version>2.7.9</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 


=====================================
junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/JUnit4.java
=====================================
@@ -1835,7 +1835,7 @@ public class JUnit4 extends Task {
             final TestClass testClass = new TestClass();
             ClassReader reader = new ClassReader(is);
             @SuppressWarnings("deprecation")
-            ClassVisitor annotationVisitor = new ClassVisitor(Opcodes.ASM8) {
+            ClassVisitor annotationVisitor = new ClassVisitor(Opcodes.ASM9) {
               @Override
               public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
                 String className = Type.getType(desc).getClassName();


=====================================
junit4-maven-plugin-tests/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.carrotsearch.randomizedtesting</groupId>
     <artifactId>randomizedtesting-parent</artifactId>
-    <version>2.7.8</version>
+    <version>2.7.9</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 


=====================================
junit4-maven-plugin/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.carrotsearch.randomizedtesting</groupId>
     <artifactId>randomizedtesting-parent</artifactId>
-    <version>2.7.8</version>
+    <version>2.7.9</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 


=====================================
pom.xml
=====================================
@@ -11,7 +11,7 @@
 
   <groupId>com.carrotsearch.randomizedtesting</groupId>
   <artifactId>randomizedtesting-parent</artifactId>
-  <version>2.7.8</version>
+  <version>2.7.9</version>
   <packaging>pom</packaging>
 
   <name>RandomizedTesting Parent POM</name>
@@ -65,8 +65,8 @@
 
     <gpg.passphrase></gpg.passphrase>
 
-    <version.junit>4.12</version.junit>
-    <version.ant>1.9.11</version.ant>
+    <version.junit>4.13.1</version.junit>
+    <version.ant>1.9.15</version.ant>
     <version.assertj>2.2.0</version.assertj>
 
     <version.maven-antrun-plugin>1.8</version.maven-antrun-plugin>
@@ -134,7 +134,7 @@
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm</artifactId>
-        <version>8.0.1</version>
+        <version>9.2</version>
       </dependency>
 
       <dependency>
@@ -550,7 +550,7 @@
         <repository>
           <id>sonatype-nexus-staging</id>
           <name>Sonatype Nexus Releases</name>
-          <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+          <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2</url>
         </repository>
       </distributionManagement>
 


=====================================
randomized-runner/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.carrotsearch.randomizedtesting</groupId>
     <artifactId>randomizedtesting-parent</artifactId>
-    <version>2.7.8</version>
+    <version>2.7.9</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 


=====================================
randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/RandomizedTest.java
=====================================
@@ -4,6 +4,7 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.text.SimpleDateFormat;
@@ -48,10 +49,10 @@ public class RandomizedTest {
 
   /* Commonly used charsets (these must be supported by every JVM). */
 
-  protected static final Charset UTF8 = Charset.forName("UTF-8");
-  protected static final Charset UTF16 = Charset.forName("UTF-16");
-  protected static final Charset ISO8859_1 = Charset.forName("ISO-8859-1");
-  protected static final Charset US_ASCII = Charset.forName("US-ASCII");
+  protected static final Charset UTF8 = StandardCharsets.UTF_8;
+  protected static final Charset UTF16 = StandardCharsets.UTF_16;
+  protected static final Charset ISO8859_1 = StandardCharsets.ISO_8859_1;
+  protected static final Charset US_ASCII = StandardCharsets.US_ASCII;
 
   /* This charset does not need to be supported, but I don't know any JVM under which it wouldn't be. */
   


=====================================
randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/generators/TestRealisticUnicodeGenerator.java
=====================================
@@ -2,6 +2,6 @@ package com.carrotsearch.randomizedtesting.generators;
 
 public class TestRealisticUnicodeGenerator extends StringGeneratorTestBase {
   public TestRealisticUnicodeGenerator() {
-    super(new UnicodeGenerator());
+    super(new RealisticUnicodeGenerator());
   }
 }



View it on GitLab: https://salsa.debian.org/java-team/carrotsearch-randomizedtesting/-/compare/a4149e95901b64429e9b388902c8b64ef272e135...63f6c7aa8ed9bf3e11c67ded761ed2afdfb17e88

-- 
View it on GitLab: https://salsa.debian.org/java-team/carrotsearch-randomizedtesting/-/compare/a4149e95901b64429e9b388902c8b64ef272e135...63f6c7aa8ed9bf3e11c67ded761ed2afdfb17e88
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/20230110/9d4d4292/attachment.htm>


More information about the pkg-java-commits mailing list