Update to 2.7.4

(cherry picked from commit 355ff9f6d7456091e4d764f261d0cd899dc6b406)
This commit is contained in:
starlet-dx 2022-05-31 16:03:16 +08:00 committed by openeuler-sync-bot
parent 70d1fce822
commit 91dbe75eb8
4 changed files with 45 additions and 3 deletions

Binary file not shown.

BIN
2.7.4.tar.gz Normal file

Binary file not shown.

37
Bump-asm-to-8.0.1.patch Normal file
View File

@ -0,0 +1,37 @@
From acf04523b01489645eb441a9248c48838095aa70 Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date: Tue, 7 Jul 2020 16:43:12 +0200
Subject: [PATCH] GH-289: Bump asm to 8.0.1.
---
CHANGES.txt | 2 ++
.../src/main/java/com/carrotsearch/ant/tasks/junit4/JUnit4.java | 2 +-
pom.xml | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
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 be7c94e3..f4b3e833 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 @@ private TestsCollection processTestResources() {
final TestClass testClass = new TestClass();
ClassReader reader = new ClassReader(is);
@SuppressWarnings("deprecation")
- ClassVisitor annotationVisitor = new ClassVisitor(Opcodes.ASM7_EXPERIMENTAL) {
+ ClassVisitor annotationVisitor = new ClassVisitor(Opcodes.ASM8) {
@Override
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
String className = Type.getType(desc).getClassName();
diff --git a/pom.xml b/pom.xml
index a1664789..1a921e72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>6.2.1</version>
+ <version>8.0.1</version>
</dependency>
<dependency>

View File

@ -1,12 +1,14 @@
Name: randomizedtesting
Version: 2.5.3
Version: 2.7.4
Release: 1
Summary: Java Testing Framework
License: ASL 2.0
URL: http://labs.carrotsearch.com/randomizedtesting.html
Source0: https://github.com/carrotsearch/randomizedtesting/archive/release/%{version}.tar.gz
BuildRequires: maven-local mvn(com.google.guava:guava:19.0) mvn(de.thetaphi:forbiddenapis)
Patch0: Bump-asm-to-8.0.1.patch
BuildRequires: maven-local mvn(com.google.guava:guava) mvn(de.thetaphi:forbiddenapis)
BuildRequires: mvn(dom4j:dom4j) mvn(junit:junit) mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache.ant:ant-junit) mvn(org.apache.maven:maven-artifact)
BuildRequires: mvn(org.apache.maven:maven-compat) mvn(org.apache.maven:maven-core)
@ -52,7 +54,7 @@ Summary: Javadoc for %{name}
This package contains javadoc for %{name}.
%prep
%setup -q -n %{name}-release-%{version}
%autosetup -n %{name}-release-%{version} -p1
find . -name "*.class" -delete
find . -name "*.jar" -delete
find . -name "*.dll" -delete
@ -152,5 +154,8 @@ rm -r randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/TestCla
%license LICENSE.txt
%changelog
* Tue May 31 2022 yaoxin <yaoxin30@h-partners.com> - 2.7.4-1
- Update to 2.7.4
* Thu Jul 30 2020 leiju <leiju4@huawei.com> - 2.5.3-1
- Package init