diff --git a/opentest4j-1.2.0.pom b/opentest4j-1.3.0.pom similarity index 71% rename from opentest4j-1.2.0.pom rename to opentest4j-1.3.0.pom index d493612c5371afb95ed77ff51b883aee1f4877ce..c89bd03149651b3011aa7e99ed4312e646527607 100644 --- a/opentest4j-1.2.0.pom +++ b/opentest4j-1.3.0.pom @@ -1,17 +1,22 @@ - + + + + + 4.0.0 org.opentest4j opentest4j - 1.2.0 + 1.3.0 org.opentest4j:opentest4j Open Test Alliance for the JVM https://github.com/ota4j-team/opentest4j The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt @@ -33,7 +38,7 @@ mmerdes Matthias Merdes - Matthias.Merdes@heidelberg-mobil.com + matthias.merdes@heidelpay.com sbrannen diff --git a/opentest4j.spec b/opentest4j.spec index dc05f03cfa24dfe166898d73471003cf4cd78943..3ee478866e4d25456a94228ae49d1ea58ebea0f2 100644 --- a/opentest4j.spec +++ b/opentest4j.spec @@ -1,5 +1,5 @@ Name: opentest4j -Version: 1.2.0 +Version: 1.3.0 Release: 1 Summary: Open Test Alliance for the JVM License: ASL 2.0 @@ -8,6 +8,8 @@ BuildArch: noarch Source0: https://github.com/ota4j-team/opentest4j/archive/r%{version}.tar.gz Source100: https://repo1.maven.org/maven2/org/opentest4j/opentest4j/%{version}/opentest4j-%{version}.pom BuildRequires: maven-local mvn(junit:junit) +BuildRequires: java-11-openjdk java-11-openjdk-devel + %description Open Test Alliance for the JVM is a minimal common foundation for testing libraries on the JVM. The primary goal of the project is to @@ -27,7 +29,10 @@ API documentation for %{name}. %setup -q -n opentest4j-r%{version} find -name \*.jar -delete cp -p %{SOURCE100} pom.xml +mv src/module/java/* src/main/java %pom_add_dep junit:junit:4.12:test + + %pom_xpath_inject pom:project " @@ -37,7 +42,6 @@ cp -p %{SOURCE100} pom.xml - org.opentest4j opentest4j opentest4j.org %{version} @@ -53,13 +57,56 @@ cp -p %{SOURCE100} pom.xml + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile + + compile + + + 8 + + **/module-info.java + + + + + module-info + + compile + + + 9 + + **/module-info.java + + + + + default-testCompile + + testCompile + + + 11 + + + + " + sed -i -e '/org\.apache\.commons\.codec/d' src/test/java/org/opentest4j/AssertionFailedErrorTests.java %build -%mvn_build +export JAVA_HOME=%{_jvmdir}/java-11-openjdk +export CFLAGS="${RPM_OPT_FLAGS}" +export CXXFLAGS="${RPM_OPT_FLAGS}" +%mvn_build -f %install %mvn_install @@ -72,6 +119,9 @@ sed -i -e '/org\.apache\.commons\.codec/d' src/test/java/org/opentest4j/Assertio %license LICENSE %changelog +* Thu Jul 18 2024 xu_ping <707078654@qq.com> - 1.3.0-1 +- Upgrade the version to 1.3.0 + * Fri Dec 15 2023 Ge Wang - 1.2.0-1 - Upgrade the version to 1.2.0 diff --git a/r1.2.0.tar.gz b/r1.2.0.tar.gz deleted file mode 100644 index fb4f7a8c4b83710b777dfc4e1a2ed26ba5ce61a0..0000000000000000000000000000000000000000 Binary files a/r1.2.0.tar.gz and /dev/null differ diff --git a/r1.3.0.tar.gz b/r1.3.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9a0899b09f55633141537b6bff9b0e73878931b0 Binary files /dev/null and b/r1.3.0.tar.gz differ