diff --git a/jetty-test-helper-3.1.tar.gz b/jetty-test-helper-3.1.tar.gz deleted file mode 100644 index 3b82348c4e2b37e1e765c3337622d66baa037947..0000000000000000000000000000000000000000 Binary files a/jetty-test-helper-3.1.tar.gz and /dev/null differ diff --git a/jetty-test-helper-5.9.tar.gz b/jetty-test-helper-5.9.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f6b588c36049226b3261de8ef7bad15952879678 Binary files /dev/null and b/jetty-test-helper-5.9.tar.gz differ diff --git a/jetty-test-helper.spec b/jetty-test-helper.spec index b21cb04194740aa926b2dd7dce9cd1f3f5680343..14176040e8655a28cf57829e0f542b04dc605aba 100644 --- a/jetty-test-helper.spec +++ b/jetty-test-helper.spec @@ -1,15 +1,22 @@ Name: jetty-test-helper -Version: 3.1 -Release: 2 +Version: 5.9 +Release: 1 License: ASL 2.0 or EPL-1.0 Summary: Jetty toolchain test helper URL: https://github.com/eclipse/jetty.toolchain -Source0: https://github.com/eclipse/jetty.toolchain/archive/%{name}-%{version}.tar.gz +Source0: https://github.com/jetty/jetty-toolchain/archive/refs/tags/%{name}-%{version}.tar.gz Source1: https://github.com/eclipse/jetty.project/blob/jetty-9.3.x/LICENSE-eplv10-aslv20.html +Source2: https://repo.maven.apache.org/maven2/org/junit/jupiter/junit-jupiter/5.8.0/junit-jupiter-5.8.0.pom BuildArch: noarch BuildRequires: maven-local mvn(junit:junit) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-toolchain:pom:) BuildRequires: mvn(org.hamcrest:hamcrest-library) +BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-artifact-remote-resources) +BuildRequires: mvn(org.eclipse.aether:aether-connector-basic) +BuildRequires: mvn(org.eclipse.aether:aether-transport-wagon) +BuildRequires: mvn(org.apache.maven.wagon:wagon-http) +BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) %description Unit Testing Support for Jetty (common classes for some unit tests). @@ -19,29 +26,69 @@ Summary: Javadoc %{name} This package contains the API documentation for %{name}. %prep -%setup -q -n jetty.toolchain-%{name}-%{version}/%{name} +%setup -q -n jetty-toolchain-%{name}-%{version}/%{name} find -name '*.?ar' -delete find -name '*.class' -delete cp %{SOURCE1} . %pom_remove_plugin :maven-pmd-plugin -%pom_remove_plugin :maven-license-plugin -%pom_remove_plugin :findbugs-maven-plugin -%pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-source-plugin +sed -i '//d' pom.xml + +MVN_DEPENDENCY_PLUGIN_EXTRA_XML=" + + prepare-package + + copy + + + + + org.junit.jupiter + junit-jupiter + 5.8.0 + false + project.build.directory + + + + + +" + +%pom_add_plugin org.apache.maven.plugins:maven-dependency-plugin:3.0.2 . "$MVN_DEPENDENCY_PLUGIN_EXTRA_XML" +sed -i 's/project.build.directory/${project.build.directory}/g' pom.xml +cp %{SOURCE2} ./ %build -%mvn_build +%mvn_build -b +sed -i '/junit-jupiter/,+2d;:go;1,2!{P;N;D};N;bgo' .xmvn-reactor +sed -i '/org.junit.jupiter/d' .xmvn-reactor +sed -i '$d' .xmvn-reactor +sed -i '51d' .xmvn-reactor +sed -i '32d' .xmvn-reactor %install +install -d -m 0755 %{buildroot}%{_javadir}/junit5/ +install -d -m 0755 %{buildroot}%{_mavenpomdir}/junit5/ +install -pm 0644 ./target/junit-jupiter-5.8.0.jar %{buildroot}%{_javadir}/junit5/junit-jupiter.jar +install -pm 0644 ./junit-jupiter-5.8.0.pom %{buildroot}%{_mavenpomdir}/junit5/junit-jupiter.pom +%add_maven_depmap junit5/junit-jupiter.pom junit5/junit-jupiter.jar %mvn_install + %files -f .mfiles +%{_javadir}/junit5/junit-jupiter.jar +%{_mavenpomdir}/junit5/junit-jupiter.pom %license LICENSE-eplv10-aslv20.html %files javadoc -f .mfiles-javadoc %license LICENSE-eplv10-aslv20.html %changelog +* Tue Jan 30 2024 Ge Wang - 5.9-1 +- update to version 5.9 + * Mon May 9 2022 baizhonggui - 3.1-2 - modify license identifier diff --git a/junit-jupiter-5.8.0.pom b/junit-jupiter-5.8.0.pom new file mode 100644 index 0000000000000000000000000000000000000000..2d00a50a59fd9d24a999fa959f6958f0034b7fe2 --- /dev/null +++ b/junit-jupiter-5.8.0.pom @@ -0,0 +1,95 @@ + + + + + + + + 4.0.0 + org.junit.jupiter + junit-jupiter + 5.8.0 + JUnit Jupiter (Aggregator) + Module "junit-jupiter" of JUnit 5. + https://junit.org/junit5/ + + + Eclipse Public License v2.0 + https://www.eclipse.org/legal/epl-v20.html + + + + + bechte + Stefan Bechtold + stefan.bechtold@me.com + + + jlink + Johannes Link + business@johanneslink.net + + + marcphilipp + Marc Philipp + mail@marcphilipp.de + + + mmerdes + Matthias Merdes + matthias.merdes@heidelpay.com + + + sbrannen + Sam Brannen + sam@sambrannen.com + + + sormuras + Christian Stein + sormuras@gmail.com + + + juliette-derancourt + Juliette de Rancourt + derancourt.juliette@gmail.com + + + + scm:git:git://github.com/junit-team/junit5.git + scm:git:git://github.com/junit-team/junit5.git + https://github.com/junit-team/junit5 + + + + + org.junit + junit-bom + 5.8.0 + pom + import + + + + + + org.junit.jupiter + junit-jupiter-api + 5.8.0 + compile + + + org.junit.jupiter + junit-jupiter-params + 5.8.0 + compile + + + org.junit.jupiter + junit-jupiter-engine + 5.8.0 + runtime + + +