From e1a5b4bb4264bc8e59498df4c2c9b24f96824702 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Thu, 15 May 2025 17:18:18 +0800 Subject: [PATCH] Fix build failure caused by javaparser update to 3.25.10 --- ...Port-to-latest-version-of-javaparser.patch | 42 +++++++++++-------- jaxb2-common-basics.spec | 8 ++-- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/0001-Port-to-latest-version-of-javaparser.patch b/0001-Port-to-latest-version-of-javaparser.patch index 901268c..bdd2b0e 100644 --- a/0001-Port-to-latest-version-of-javaparser.patch +++ b/0001-Port-to-latest-version-of-javaparser.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Port to latest version of javaparser --- basic/pom.xml | 6 +- - .../inheritance/util/JavaTypeParser.java | 26 ++++----- + .../inheritance/util/JavaTypeParser.java | 29 +++++----- .../util/TypeToJTypeConvertingVisitor.java | 56 ++++++++++--------- - .../inheritance/tests/JavaTypeParserTest.java | 34 +++++------ + .../inheritance/tests/JavaTypeParserTest.java | 37 ++++++------ pom.xml | 6 +- - 5 files changed, 64 insertions(+), 64 deletions(-) + 5 files changed, 68 insertions(+), 66 deletions(-) diff --git a/basic/pom.xml b/basic/pom.xml index 1961600..7257ceb 100644 @@ -34,10 +34,10 @@ index 1961600..7257ceb 100644 \ No newline at end of file + diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java -index 2d5d07a..6e94f62 100644 +index 2d5d07a..b2f6485 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java +++ b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java -@@ -1,16 +1,16 @@ +@@ -1,16 +1,17 @@ package org.jvnet.jaxb2_commons.plugin.inheritance.util; -import japa.parser.JavaParser; @@ -46,7 +46,7 @@ index 2d5d07a..6e94f62 100644 -import japa.parser.ast.body.ClassOrInterfaceDeclaration; -import japa.parser.ast.body.TypeDeclaration; -import japa.parser.ast.type.ClassOrInterfaceType; -+import com.github.javaparser.JavaParser; ++import com.github.javaparser.StaticJavaParser; +import com.github.javaparser.ParseProblemException; +import com.github.javaparser.ast.CompilationUnit; +import com.github.javaparser.ast.NodeList; @@ -55,21 +55,24 @@ index 2d5d07a..6e94f62 100644 +import com.github.javaparser.ast.type.ClassOrInterfaceType; import java.io.ByteArrayInputStream; ++import java.nio.charset.StandardCharsets; import java.io.UnsupportedEncodingException; import java.util.Collections; -import java.util.List; import java.util.Map; import org.apache.commons.lang3.Validate; -@@ -52,18 +52,16 @@ public class JavaTypeParser { +@@ -51,19 +52,17 @@ public class JavaTypeParser { + private JType parseType(String type, JCodeModel codeModel) { final String text = "public class Ignored extends " + type + " {}"; try { - CompilationUnit compilationUnit = JavaParser.parse( +- CompilationUnit compilationUnit = JavaParser.parse( - new ByteArrayInputStream(text.getBytes("UTF-8")), "UTF-8"); - final List typeDeclarations = compilationUnit - .getTypes(); - final TypeDeclaration typeDeclaration = typeDeclarations.get(0); -+ new ByteArrayInputStream(text.getBytes("UTF-8"))); ++ CompilationUnit compilationUnit = StaticJavaParser.parse( ++ new ByteArrayInputStream(text.getBytes("UTF-8")), StandardCharsets.UTF_8); + final TypeDeclaration typeDeclaration = compilationUnit.getType(0); final ClassOrInterfaceDeclaration classDeclaration = (ClassOrInterfaceDeclaration) typeDeclaration; - final List _extended = classDeclaration @@ -207,10 +210,10 @@ index 5b8a4b7..9f7ae21 100644 } } diff --git a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java b/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java -index 8566557..8903526 100644 +index 8566557..e20d7a2 100644 --- a/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java +++ b/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java -@@ -1,15 +1,15 @@ +@@ -1,15 +1,16 @@ package org.jvnet.jaxb2_commons.plugin.inheritance.tests; -import japa.parser.JavaParser; @@ -220,7 +223,7 @@ index 8566557..8903526 100644 -import japa.parser.ast.type.ClassOrInterfaceType; -import japa.parser.ast.type.ReferenceType; -import japa.parser.ast.type.Type; -+import com.github.javaparser.JavaParser; ++import com.github.javaparser.StaticJavaParser; +import com.github.javaparser.ast.CompilationUnit; +import com.github.javaparser.ast.NodeList; +import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; @@ -231,16 +234,19 @@ index 8566557..8903526 100644 import java.io.ByteArrayInputStream; -import java.util.List; ++import java.nio.charset.StandardCharsets; import junit.framework.TestCase; -@@ -20,29 +20,29 @@ public class JavaTypeParserTest extends TestCase { +@@ -19,30 +20,30 @@ public class JavaTypeParserTest extends TestCase { + final String text = "public class Dummy implements java.util.Comparator{}"; - final CompilationUnit compilationUnit = JavaParser.parse( +- final CompilationUnit compilationUnit = JavaParser.parse( - new ByteArrayInputStream(text.getBytes("UTF-8")), "UTF-8"); - final List typeDeclarations = compilationUnit -+ new ByteArrayInputStream(text.getBytes("UTF-8"))); ++ final CompilationUnit compilationUnit = StaticJavaParser.parse( ++ new ByteArrayInputStream(text.getBytes("UTF-8")), StandardCharsets.UTF_8); + final NodeList> typeDeclarations = compilationUnit .getTypes(); assertEquals(1, typeDeclarations.size()); @@ -274,7 +280,7 @@ index 8566557..8903526 100644 } } diff --git a/pom.xml b/pom.xml -index 78d8fc0..67bd1bd 100644 +index 78d8fc0..ddf39cf 100644 --- a/pom.xml +++ b/pom.xml @@ -251,9 +251,9 @@ @@ -286,10 +292,10 @@ index 78d8fc0..67bd1bd 100644 - 1.0.11 + com.github.javaparser + javaparser-core -+ 3.3.5 ++ 3.25.10 -- -2.33.0 +2.49.0 diff --git a/jaxb2-common-basics.spec b/jaxb2-common-basics.spec index 6435ba2..d4eda91 100644 --- a/jaxb2-common-basics.spec +++ b/jaxb2-common-basics.spec @@ -1,6 +1,6 @@ Name: jaxb2-common-basics Version: 1.11.1 -Release: 1 +Release: 2 Summary: JAXB2 Basics License: BSD-2-Clause Url: https://github.com/highsource/jaxb2-basics @@ -29,8 +29,7 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -n jaxb2-basics-%{version} -%patch0 -p1 +%autosetup -n jaxb2-basics-%{version} -p1 find -name "*.bat" -print -delete find -name "*.class" -print -delete find -name "*.jar" -print -delete @@ -65,6 +64,9 @@ sed -i '/a1.b.a, a1/d' runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/ %license LICENSE %changelog +* Fri May 16 2025 yaoxin <1024769339@qq.com> - 1.11.1-2 +- Fix build failure caused by javaparser update to 3.25.10 + * Tue Apr 30 2024 Ge Wang - 1.11.1-1 - Update to version 1.11.1 -- Gitee