diff --git a/Bump-asm-to-8.0.1.patch b/Bump-asm-to-8.0.1.patch index ef37adb..aee0bcd 100644 --- a/Bump-asm-to-8.0.1.patch +++ b/Bump-asm-to-8.0.1.patch @@ -1,37 +1,40 @@ -From acf04523b01489645eb441a9248c48838095aa70 Mon Sep 17 00:00:00 2001 -From: Dawid Weiss -Date: Tue, 7 Jul 2020 16:43:12 +0200 -Subject: [PATCH] GH-289: Bump asm to 8.0.1. +From 3c564e5605ef403b77968770c1177f50331a5080 Mon Sep 17 00:00:00 2001 +From: cherry530 +Date: Wed, 23 Aug 2023 14:43:15 +0800 +Subject: [PATCH] Bump ASM to 8.0.1 +Signed-off-by: cherry530 --- - CHANGES.txt | 2 ++ .../src/main/java/com/carrotsearch/ant/tasks/junit4/JUnit4.java | 2 +- pom.xml | 2 +- - 3 files changed, 4 insertions(+), 2 deletions(-) + 2 files changed, 2 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 +index 0cc947f..1053231 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() { +@@ -1847,7 +1847,7 @@ public class JUnit4 extends Task { final TestClass testClass = new TestClass(); ClassReader reader = new ClassReader(is); @SuppressWarnings("deprecation") -- ClassVisitor annotationVisitor = new ClassVisitor(Opcodes.ASM7_EXPERIMENTAL) { +- ClassVisitor annotationVisitor = new ClassVisitor(Opcodes.ASM9) { + 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 +index e6f16ff..1349740 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ org.ow2.asm asm -- 6.2.1 +- 9.2 + 8.0.1 +-- +2.27.0 + diff --git a/change-sample-xml-safe-to-sample-xml.patch b/change-sample-xml-safe-to-sample-xml.patch new file mode 100644 index 0000000..306ebde --- /dev/null +++ b/change-sample-xml-safe-to-sample-xml.patch @@ -0,0 +1,80 @@ +From 49cd79e91c29bab3d2e8e16d76691aabded8fe82 Mon Sep 17 00:00:00 2001 +From: cherry530 +Date: Wed, 23 Aug 2023 14:44:31 +0800 +Subject: [PATCH] change sample-xml-safe to sample-xml + +Signed-off-by: cherry530 +--- + junit4-ant/pom.xml | 8 ++++---- + junit4-maven-plugin-tests/src/it/01-basic-test/pom.xml | 6 +++--- + pom.xml | 4 ++-- + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/junit4-ant/pom.xml b/junit4-ant/pom.xml +index 0cd3d4b..462fd2f 100644 +--- a/junit4-ant/pom.xml ++++ b/junit4-ant/pom.xml +@@ -54,8 +54,8 @@ + + + +- com.carrotsearch.thirdparty +- simple-xml-safe ++ org.simpleframework ++ simple-xml + provided + + +@@ -222,8 +222,8 @@ + !module-info.class + + +- com.carrotsearch.thirdparty +- simple-xml-safe ++ org.simpleframework ++ simple-xml + + + com.carrotsearch.randomizedtesting +diff --git a/junit4-maven-plugin-tests/src/it/01-basic-test/pom.xml b/junit4-maven-plugin-tests/src/it/01-basic-test/pom.xml +index 63b0090..7b36957 100644 +--- a/junit4-maven-plugin-tests/src/it/01-basic-test/pom.xml ++++ b/junit4-maven-plugin-tests/src/it/01-basic-test/pom.xml +@@ -29,8 +29,8 @@ + + + +- com.carrotsearch.thirdparty +- simple-xml-safe ++ org.simpleframework ++ simple-xml + 2.7.1 + + +@@ -71,7 +71,7 @@ + true + warn + +- com.carrotsearch.thirdparty:simple-xml-safe ++ org.simpleframework:simple-xml + + + +diff --git a/pom.xml b/pom.xml +index 1349740..06c24c3 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -138,8 +138,8 @@ + + + +- com.carrotsearch.thirdparty +- simple-xml-safe ++ org.simpleframework ++ simple-xml + 2.7.1 + + +-- +2.27.0 + diff --git a/randomizedtesting-2.8.0.tar.gz b/randomizedtesting-2.8.0.tar.gz new file mode 100644 index 0000000..2ba7eff Binary files /dev/null and b/randomizedtesting-2.8.0.tar.gz differ diff --git a/randomizedtesting.spec b/randomizedtesting.spec index e659aa7..8f8f146 100644 --- a/randomizedtesting.spec +++ b/randomizedtesting.spec @@ -1,12 +1,13 @@ Name: randomizedtesting -Version: 2.7.4 +Version: 2.8.0 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 +Source0: https://github.com/randomizedtesting/randomizedtesting/archive/release/%{version}/%{name}-%{version}.tar.gz Patch0: Bump-asm-to-8.0.1.patch +Patch1: change-sample-xml-safe-to-sample-xml.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) @@ -154,6 +155,9 @@ rm -r randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/TestCla %license LICENSE.txt %changelog +* Wed Aug 23 2023 xu_ping <707078654@qq.com> - 2.8.0-1 +- Update to 2.8.0 + * Tue May 31 2022 yaoxin - 2.7.4-1 - Update to 2.7.4