!3 Update to version 5.9

From: @wang--ge 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530

jetty-test-helper.spec

@@ -1,15 +1,22 @@
 Name:                jetty-test-helper
-Version:             3.1
+Version:             5.9
-Release:             2
+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 :license-maven-plugin
-%pom_remove_plugin :findbugs-maven-plugin
-%pom_remove_plugin :maven-site-plugin
 %pom_remove_plugin :maven-source-plugin
+sed -i '/<release>/d' pom.xml
+
+MVN_DEPENDENCY_PLUGIN_EXTRA_XML="<executions>
+  <execution>
+    <phase>prepare-package</phase>
+    <goals>
+      <goal>copy</goal>
+    </goals>
+    <configuration>
+      <artifactItems>
+        <artifactItem>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter</artifactId>
+          <version>5.8.0</version>
+          <overWrite>false</overWrite>
+          <outputDirectory>project.build.directory</outputDirectory>
+          <destFileName></destFileName>
+        </artifactItem>
+      </artifactItems>
+    </configuration>
+  </execution>
+</executions>"
+
+%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 <wang__ge@126.com> - 5.9-1
+- update to version 5.9
+
 * Mon May 9 2022 baizhonggui <baizhonggui@h-partners.com> - 3.1-2
 - modify license identifier
 

junit-jupiter-5.8.0.pom

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.junit.jupiter</groupId>
+  <artifactId>junit-jupiter</artifactId>
+  <version>5.8.0</version>
+  <name>JUnit Jupiter (Aggregator)</name>
+  <description>Module "junit-jupiter" of JUnit 5.</description>
+  <url>https://junit.org/junit5/</url>
+  <licenses>
+    <license>
+      <name>Eclipse Public License v2.0</name>
+      <url>https://www.eclipse.org/legal/epl-v20.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>bechte</id>
+      <name>Stefan Bechtold</name>
+      <email>stefan.bechtold@me.com</email>
+    </developer>
+    <developer>
+      <id>jlink</id>
+      <name>Johannes Link</name>
+      <email>business@johanneslink.net</email>
+    </developer>
+    <developer>
+      <id>marcphilipp</id>
+      <name>Marc Philipp</name>
+      <email>mail@marcphilipp.de</email>
+    </developer>
+    <developer>
+      <id>mmerdes</id>
+      <name>Matthias Merdes</name>
+      <email>matthias.merdes@heidelpay.com</email>
+    </developer>
+    <developer>
+      <id>sbrannen</id>
+      <name>Sam Brannen</name>
+      <email>sam@sambrannen.com</email>
+    </developer>
+    <developer>
+      <id>sormuras</id>
+      <name>Christian Stein</name>
+      <email>sormuras@gmail.com</email>
+    </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
+    <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
+    <url>https://github.com/junit-team/junit5</url>
+  </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.8.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.8.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.8.0</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>