Import rpm: 5aa6320cec2215e5af7255a5d46596d094e5495a
This commit is contained in:
James Antill
commit
f482e00332
|
|
@ -0,0 +1 @@
|
|||
SOURCES/maven-filtering-3.1.1-source-release.zip
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
From 2187555deff040b5fd0c75abb4445bf715f9acd8 Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
Date: Wed, 26 Aug 2020 13:32:02 +0200
|
||||
Subject: [PATCH] Skip failed tests
|
||||
|
||||
---
|
||||
.../IncrementalResourceFilteringTest.java | 56 -------------------
|
||||
1 file changed, 56 deletions(-)
|
||||
|
||||
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 06f62f3..e70590c 100644
|
||||
--- a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
|
||||
+++ b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
|
||||
@@ -56,41 +56,6 @@ public class IncrementalResourceFilteringTest
|
||||
outputDirectory.mkdirs();
|
||||
}
|
||||
|
||||
- public void testSimpleIncrementalFiltering()
|
||||
- throws Exception
|
||||
- {
|
||||
- // run full build first
|
||||
- filter( "time" );
|
||||
-
|
||||
- assertTime( "time", "file01.txt" );
|
||||
- assertTime( "time", "file02.txt" );
|
||||
-
|
||||
- // only one file is expected to change
|
||||
- Set<String> changedFiles = new HashSet<>();
|
||||
- changedFiles.add( "file01.txt" );
|
||||
-
|
||||
- TestIncrementalBuildContext ctx =
|
||||
- new TestIncrementalBuildContext( unitDirectory, changedFiles, Collections.emptyMap() );
|
||||
- ThreadBuildContext.setThreadBuildContext( ctx );
|
||||
-
|
||||
- filter( "notime" );
|
||||
- assertTime( "notime", "file01.txt" );
|
||||
- assertTime( "time", "file02.txt" ); // this one is unchanged
|
||||
-
|
||||
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
|
||||
-
|
||||
- ctx = new TestIncrementalBuildContext( unitDirectory, Collections.emptySet(), changedFiles,
|
||||
- Collections.emptyMap() );
|
||||
- ThreadBuildContext.setThreadBuildContext( ctx );
|
||||
-
|
||||
- filter( "moretime" );
|
||||
- assertFalse( new File( outputDirectory, "file01.txt" ).exists() );
|
||||
- assertTime( "time", "file02.txt" ); // this one is unchanged
|
||||
-
|
||||
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
|
||||
-
|
||||
- }
|
||||
-
|
||||
public void testOutputChange()
|
||||
throws Exception
|
||||
{
|
||||
@@ -135,27 +100,6 @@ public class IncrementalResourceFilteringTest
|
||||
|
||||
}
|
||||
|
||||
- public void testFilterDeleted()
|
||||
- throws Exception
|
||||
- {
|
||||
- // run full build first
|
||||
- filter( "time" );
|
||||
-
|
||||
- // all files are reprocessed after content of filters changes
|
||||
- Set<String> deletedFiles = new HashSet<>();
|
||||
- deletedFiles.add( "filters.txt" );
|
||||
- TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( unitDirectory, Collections.emptySet(),
|
||||
- deletedFiles, Collections.emptyMap() );
|
||||
- ThreadBuildContext.setThreadBuildContext( ctx );
|
||||
-
|
||||
- filter( "notime" );
|
||||
- assertTime( "notime", "file01.txt" );
|
||||
- assertTime( "notime", "file02.txt" );
|
||||
-
|
||||
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
|
||||
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file02.txt" ) ) );
|
||||
- }
|
||||
-
|
||||
private void assertTime( String time, String relpath )
|
||||
throws IOException
|
||||
{
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_contexts:
|
||||
- osci_compose_gate
|
||||
rules:
|
||||
# https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
|
||||
- !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}
|
||||
|
|
@ -0,0 +1,132 @@
|
|||
Name: maven-filtering
|
||||
Version: 3.1.1
|
||||
Release: 5%{?dist}
|
||||
Summary: Shared component providing resource filtering
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/shared/%{name}/index.html
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.google.code.findbugs:jsr305)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
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.sonatype.plexus:plexus-build-api)
|
||||
|
||||
%description
|
||||
These Plexus components have been built from the filtering process/code in
|
||||
Maven Resources Plugin. The goal is to provide a shared component for all
|
||||
plugins that needs to filter resources.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package contains the API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
# Tests use a package that is no longer present in plexus-build-api (v0.0.7)
|
||||
%mvn_build -f
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Jul 6 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-2
|
||||
- Regenerate build-requires
|
||||
|
||||
* Fri Jun 3 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-1
|
||||
- Update to upstream version 3.1.1
|
||||
|
||||
* Wed Apr 13 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-1
|
||||
- Update to upstream version 3.1.0
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Mon Nov 9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-1
|
||||
- Update to upstream version 3.0.0
|
||||
- Remove legacy obsoletes/provides
|
||||
- Update to current packaging guidelines
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Fri Oct 24 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-1
|
||||
- Update to upstream version 1.3
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Tue Mar 11 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
|
||||
- Update to upstream version 1.2
|
||||
|
||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1-4
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Wed Feb 19 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-3
|
||||
- Fix unowned directory
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Tue Feb 19 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-1
|
||||
- Update to upstream version 1.1
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.0-10
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
* Tue Nov 27 2012 Tomas Radej <tradej@redhat.com> - 1.0-9
|
||||
- Added NOTICE to javadoc
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu Mar 15 2012 Tomas Radej <tradej@redhat.com> - 1.0-7
|
||||
- Replaced plexus-maven-plugin with plexus-containers-component-metadata
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Wed Aug 31 2011 Tomas Radej <tradej@redhat.com> - 1.0-5
|
||||
- Really fixed Provides/Obsoletes
|
||||
|
||||
* Wed Aug 31 2011 Tomas Radej <tradej@redhat.com> - 1.0-4
|
||||
- Fixed Provides/Obsoletes
|
||||
|
||||
* Wed Aug 31 2011 Tomas Radej <tradej@redhat.com> - 1.0-3
|
||||
- Added Provides/Obsoletes
|
||||
|
||||
* Tue Aug 16 2011 Tomas Radej <tradej@redhat.com> 1.0-2
|
||||
- Removed rm -rf {buildroot}
|
||||
|
||||
* Tue Aug 16 2011 Tomas Radej <tradej@redhat.com> 1.0-1
|
||||
- Initial release (thanks to the GULaG team)
|
||||
|
||||
Loading…
Reference in New Issue