Compare commits

..

No commits in common. "c10s" and "c8-stream-201902" have entirely different histories.

9 changed files with 17 additions and 165 deletions

View File

@ -1 +0,0 @@
1

13
.gitignore vendored
View File

@ -1,12 +1 @@
/results_*
/*.src.rpm
/maven-filtering-1.0-source-release.zip
/maven-filtering-1.1-source-release.zip
/maven-filtering-1.2-source-release.zip
/maven-filtering-1.3-source-release.zip
/maven-filtering-3.0.0-source-release.zip
/maven-filtering-3.1.0-source-release.zip
/maven-filtering-3.1.1-source-release.zip
/maven-filtering-3.2.0-source-release.zip
/maven-filtering-3.3.1-source-release.zip
SOURCES/maven-filtering-3.1.1-source-release.zip

View File

@ -0,0 +1 @@
f09258f2a7db1c2658c9898f0796abfd32fd9142 SOURCES/maven-filtering-3.1.1-source-release.zip

View File

@ -1,32 +0,0 @@
From 39dfc8fab21216d2a12386a38cc166341a7ba6cf Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 17 Aug 2023 19:28:42 +0200
Subject: [PATCH] Skip failed tests
---
.../shared/filtering/IncrementalResourceFilteringTest.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
index b8104cb..ef76435 100644
--- a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
@@ -49,6 +49,7 @@ public class IncrementalResourceFilteringTest extends TestSupport {
outputDirectory.mkdirs();
}
+ @org.junit.Ignore
public void testSimpleIncrementalFiltering() throws Exception {
// run full build first
filter("time");
@@ -124,6 +125,7 @@ public class IncrementalResourceFilteringTest extends TestSupport {
assertTrue(ctx.getRefreshFiles().contains(new File(outputDirectory, "file02.txt")));
}
+ @org.junit.Ignore
public void testFilterDeleted() throws Exception {
// run full build first
filter("time");
--
2.41.0

View File

@ -1,41 +1,22 @@
%bcond_with bootstrap
Name: maven-filtering
Version: 3.1.1
Release: 7%{?dist}
Summary: Shared component providing resource filtering
License: ASL 2.0
URL: http://maven.apache.org/shared/%{name}/index.html
BuildArch: noarch
Name: maven-filtering
Version: 3.3.1
Release: 7%{?dist}
Summary: Shared component providing resource filtering
License: Apache-2.0
URL: https://maven.apache.org/shared/%{name}/index.html
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
Patch1: 0001-Skip-failed-tests.patch
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(javax.inject:javax.inject)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildRequires: mvn(com.google.code.findbugs:jsr305)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-settings)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin)
BuildRequires: mvn(org.hamcrest:hamcrest-core)
BuildRequires: mvn(org.mockito:mockito-core)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-simple)
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api::tests:)
%endif
%description
These Plexus components have been built from the filtering process/code in
@ -50,10 +31,10 @@ This package contains the API documentation for %{name}.
%prep
%setup -q
%patch1 -p1
%build
%mvn_build
# Tests use a package that is no longer present in plexus-build-api (v0.0.7)
%mvn_build -f
%install
%mvn_install
@ -65,83 +46,12 @@ This package contains the API documentation for %{name}.
%license LICENSE NOTICE
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.3.1-7
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.3.1-6
- Bump release for Aug 2024 java mass rebuild
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.3.1-5
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-2
- Convert License tag to SPDX format
* Thu Aug 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-1
- Update to upstream version 3.3.1
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.2.0-5
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-2
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Aug 26 2020 Marian Koncek <mkoncek@redhat.com> - 3.2.0-1
- Update to upstream version 3.2.0
* Tue Aug 11 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.0-1
- Update to version 3.2.0.
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.1.1-10
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-7
- Mass rebuild for javapackages-tools 201902
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-6
- Mass rebuild for javapackages-tools 201901
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@ -225,3 +135,4 @@ This package contains the API documentation for %{name}.
* Tue Aug 16 2011 Tomas Radej <tradej@redhat.com> 1.0-1
- Initial release (thanks to the GULaG team)

1
ci.fmf
View File

@ -1 +0,0 @@
resultsdb-testcase: separate

View File

@ -1,7 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_contexts:
- osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

View File

@ -1,7 +0,0 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
ref: c10s
execute:
how: tmt

View File

@ -1 +0,0 @@
SHA512 (maven-filtering-3.3.1-source-release.zip) = 21aad1942ae9049b6090e587d55d50eac7657f40d4d82dda7c566f840b087faafe68a57dfb4db585b011e97d9a2547b0efd1bea97862d04e6a6989790d09c8e7