Compare commits

...

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

2
.gitignore vendored

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

@ -1 +1 @@
05f9dde376df2938ae78a17c2282211b749b2cf8 SOURCES/r1.2.0.tar.gz
31003ea0225e2d18f0ff82ee42676a39af26b72c SOURCES/r1.3.0.tar.gz

@ -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.2.0</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>

@ -1,20 +1,21 @@
%bcond_with bootstrap
Name: opentest4j
Version: 1.2.0
Release: 10%{?dist}
Version: 1.3.0
Release: 7%{?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
BuildRequires: maven-local
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
%endif
@ -39,6 +40,8 @@ API documentation for %{name}.
find -name \*.jar -delete
cp -p %{SOURCE100} pom.xml
mv src/module/java/* src/main/java
%pom_add_dep junit:junit::test
%pom_xpath_inject pom:project "
@ -50,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>
@ -66,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>"
@ -88,18 +129,51 @@ sed -i -e '/org\.apache\.commons\.codec/d' src/test/java/org/opentest4j/Assertio
%license LICENSE
%changelog
* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1.2.0-10
- Rebuild with regenerated Requires on Java
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.3.0-7
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1.3.0-6
- Bump release for Aug 2024 java mass rebuild
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.3.0-5
- Bump release for June 2024 mass rebuild
* 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
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.0-9
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-8
- Rebuild to workaround DistroBaker issue
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-8
- Set explicit Java compiler source/target levels to 1.7
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-7
- Bootstrap Maven for CentOS Stream 9
* 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

Loading…
Cancel
Save