Compare commits
No commits in common. "c9" and "c8-stream-201902" have entirely different histories.
c9
...
c8-stream-
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/maven-filtering-3.2.0-source-release.zip
|
||||
SOURCES/maven-filtering-3.1.1-source-release.zip
|
||||
|
||||
@ -1 +1 @@
|
||||
35f7da9811aa67330bd361d8ccf40d369ae8da3c SOURCES/maven-filtering-3.2.0-source-release.zip
|
||||
f09258f2a7db1c2658c9898f0796abfd32fd9142 SOURCES/maven-filtering-3.1.1-source-release.zip
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,39 +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.2.0
|
||||
Release: 6%{?dist}
|
||||
Summary: Shared component providing resource filtering
|
||||
License: ASL 2.0
|
||||
URL: https://maven.apache.org/shared/%{name}/index.html
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
Patch1: 0001-Skip-failed-tests.patch
|
||||
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
BuildRequires: maven-local
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: mvn(com.google.code.findbugs:jsr305)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
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.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-model)
|
||||
BuildRequires: mvn(org.apache.maven:maven-settings)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
|
||||
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.plexus)
|
||||
BuildRequires: mvn(org.hamcrest:hamcrest-core)
|
||||
BuildRequires: mvn(org.mockito:mockito-core)
|
||||
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
|
||||
@ -48,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
|
||||
@ -63,56 +46,12 @@ This package contains the API documentation for %{name}.
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.2.0-6
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-5
|
||||
- Rebuild to workaround DistroBaker issue
|
||||
|
||||
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-4
|
||||
- Non-bootstrap build
|
||||
|
||||
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-3
|
||||
- Bootstrap Maven for CentOS Stream 9
|
||||
|
||||
* 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
|
||||
|
||||
@ -196,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)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user