Compare commits

...

1 Commits

Author SHA1 Message Date
ea2c510ce3 import CS opentest4j-1.3.0-13.module_el9+1171+eb38a622 2025-03-13 14:05:22 +00:00
4 changed files with 147 additions and 14 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/r1.1.1.tar.gz
SOURCES/r1.3.0.tar.gz

View File

@ -1 +1 @@
f3c18434813fc664afdc5387342b6ec9698a486b SOURCES/r1.1.1.tar.gz
31003ea0225e2d18f0ff82ee42676a39af26b72c SOURCES/r1.3.0.tar.gz

View File

@ -1,17 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
<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.opentest4j</groupId>
<artifactId>opentest4j</artifactId>
<version>1.1.1</version>
<version>1.3.0</version>
<name>org.opentest4j:opentest4j</name>
<description>Open Test Alliance for the JVM</description>
<url>https://github.com/ota4j-team/opentest4j</url>
<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<developers>
@ -33,7 +38,7 @@
<developer>
<id>mmerdes</id>
<name>Matthias Merdes</name>
<email>Matthias.Merdes@heidelberg-mobil.com</email>
<email>matthias.merdes@heidelpay.com</email>
</developer>
<developer>
<id>sbrannen</id>

View File

@ -1,17 +1,23 @@
%bcond_with bootstrap
Name: opentest4j
Version: 1.1.1
Release: 1%{?dist}
Version: 1.3.0
Release: 13%{?dist}
Summary: Open Test Alliance for the JVM
License: ASL 2.0
License: Apache-2.0
URL: https://github.com/ota4j-team/opentest4j
BuildArch: noarch
ExclusiveArch: %{java_arches} 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
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
%endif
%description
Open Test Alliance for the JVM is a minimal common foundation for
@ -24,17 +30,19 @@ consistent handling of failed assertions and failed assumptions as
well as visualization of test execution in IDEs and reports.
%package javadoc
Summary: Javadoc for %{name}
Summary: API documentation for %{name}
%description javadoc
API documentation for %{name}.
%prep
%setup -q -n opentest4j-r%{version}
%autosetup -p1 -n opentest4j-r%{version}
find -name \*.jar -delete
cp -p %{SOURCE100} pom.xml
%pom_add_dep junit:junit:4.12:test
mv src/module/java/* src/main/java
%pom_add_dep junit:junit::test
%pom_xpath_inject pom:project "
<build>
@ -45,7 +53,6 @@ cp -p %{SOURCE100} pom.xml
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.opentest4j</Automatic-Module-Name>
<Implementation-Title>opentest4j</Implementation-Title>
<Implementation-Vendor>opentest4j.org</Implementation-Vendor>
<Implementation-Version>%{version}</Implementation-Version>
@ -61,6 +68,45 @@ cp -p %{SOURCE100} pom.xml
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>8</release>
<excludes>
<exclude>**/module-info.java</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>module-info</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>9</release>
<includes>
<include>**/module-info.java</include>
</includes>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<release>11</release>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>"
@ -83,6 +129,88 @@ sed -i -e '/org\.apache\.commons\.codec/d' src/test/java/org/opentest4j/Assertio
%license LICENSE
%changelog
* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.0-12
- Update javapackages test plan to f42
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.3.0-6
- Rebuilt for java-21-openjdk as system jdk
* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.3.0-5
- bump of release for for java-21-openjdk as system jdk
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.0-2
- Convert License tag to SPDX format
* Thu Aug 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.0-1
- Update to upstream version 1.3.0
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Feb 15 2023 Marian Koncek <mkoncek@redhat.com> - 1.2.0-13
- Build with module-info
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.2.0-10
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-8
- Set explicit Java compiler source/target levels to 1.7
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-6
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Nov 6 2020 Mat Booth <mat.booth@redhat.com> - 1.2.0-4
- Build with release flag
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.2.0-2
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Mar 04 2020 Fabio Valentini <decathorpe@gmail.com> - 1.2.0-1
- Update to version 1.2.0.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-2
- Mass rebuild for javapackages-tools 201902
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jul 15 2019 Marian Koncek <mkoncek@redhat.com> - 1.2.0-1
- Update to upstream version 1.2.0
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-2
- Mass rebuild for javapackages-tools 201901
* Tue Mar 05 2019 Mat Booth <mat.booth@redhat.com> - 1.1.1-1
- Update to latest upstream release