diff --git a/0.9.5.tar.gz b/0.9.5.tar.gz deleted file mode 100644 index 84bf7cc3da616ba34452cd0b7b24dc6bbac4b022..0000000000000000000000000000000000000000 Binary files a/0.9.5.tar.gz and /dev/null differ diff --git a/0001-Port-to-latest-version-of-javaparser.patch b/0001-Port-to-latest-version-of-javaparser.patch index 842be5cf4973c0a8ec10804039e4dbe3f9da584a..901268cb7505e0bacb24fc353b5d897631c92275 100644 --- a/0001-Port-to-latest-version-of-javaparser.patch +++ b/0001-Port-to-latest-version-of-javaparser.patch @@ -12,7 +12,7 @@ Subject: [PATCH] Port to latest version of javaparser 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/basic/pom.xml b/basic/pom.xml -index ab5f477..37f9dda 100644 +index 1961600..7257ceb 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -31,8 +31,8 @@ @@ -274,10 +274,10 @@ index 8566557..8903526 100644 } } diff --git a/pom.xml b/pom.xml -index a6c566e..4da4247 100644 +index 78d8fc0..67bd1bd 100644 --- a/pom.xml +++ b/pom.xml -@@ -250,9 +250,9 @@ +@@ -251,9 +251,9 @@ @@ -291,5 +291,5 @@ index a6c566e..4da4247 100644 -- -2.20.1 +2.33.0 diff --git a/1.11.1.tar.gz b/1.11.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..58c3433dd57d62e5ee4c454111f0bcac34095f3a Binary files /dev/null and b/1.11.1.tar.gz differ diff --git a/jaxb2-common-basics.spec b/jaxb2-common-basics.spec index 1cbc625d0c20626f973dbd1cbd46c988601458d9..6435ba27c4656d2ee3e3e6c0a659c38462657cee 100644 --- a/jaxb2-common-basics.spec +++ b/jaxb2-common-basics.spec @@ -1,10 +1,10 @@ Name: jaxb2-common-basics -Version: 0.9.5 -Release: 2 +Version: 1.11.1 +Release: 1 Summary: JAXB2 Basics -License: BSD +License: BSD-2-Clause Url: https://github.com/highsource/jaxb2-basics -Source0: https://github.com/highsource/jaxb2-basics/archive/0.9.5.tar.gz +Source0: https://github.com/highsource/jaxb2-basics/archive/refs/tags/%{version}.tar.gz Patch0: 0001-Port-to-latest-version-of-javaparser.patch BuildRequires: maven-local mvn(com.google.code.javaparser:javaparser) BuildRequires: mvn(com.vividsolutions:jts) mvn(commons-beanutils:commons-beanutils) @@ -31,7 +31,6 @@ This package contains javadoc for %{name}. %prep %setup -q -n jaxb2-basics-%{version} %patch0 -p1 -#%patch1 -p1 find -name "*.bat" -print -delete find -name "*.class" -print -delete find -name "*.jar" -print -delete @@ -50,6 +49,7 @@ find -name "*.jar" -print -delete %pom_xpath_remove "pom:dependency[pom:artifactId = 'tools' ]/pom:systemPath" %pom_xpath_set "pom:plugin[pom:groupId = 'org.jvnet.jaxb2.maven2' ]/pom:artifactId" maven-jaxb22-plugin sed -i -e 's/com\.vividsolutions\.jts/org.locationtech.jts/' $(find -name *.java) +sed -i '/a1.b.a, a1/d' runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java %build %mvn_build @@ -65,6 +65,9 @@ sed -i -e 's/com\.vividsolutions\.jts/org.locationtech.jts/' $(find -name *.java %license LICENSE %changelog +* Tue Apr 30 2024 Ge Wang - 1.11.1-1 +- Update to version 1.11.1 + * Wed Oct 28 2020 baizhonggui - 0.9.5-2 - Remove spring-context-support dep