i8c-stream-201902
changed/i8c-stream-201902/maven-assembly-plugin-3.1.1-3.module_el8.2.0+363+9996591c
commit
ada6d8c2ce
@ -0,0 +1 @@
|
||||
SOURCES/maven-assembly-plugin-3.1.1-source-release.zip
|
@ -0,0 +1 @@
|
||||
32fc3a186c9bde502758ae4354288288ba5b86be SOURCES/maven-assembly-plugin-3.1.1-source-release.zip
|
@ -0,0 +1,51 @@
|
||||
From 943f668d4326a2ef174bcf6ce86ec347aff3487d Mon Sep 17 00:00:00 2001
|
||||
From: Karl Heinz Marbaise <khmarbaise@apache.org>
|
||||
Date: Sun, 26 May 2019 12:05:14 +0200
|
||||
Subject: [PATCH] [MASSEMBLY-911] - Upgrade maven-artifact-transfer 0.11.0
|
||||
|
||||
---
|
||||
pom.xml | 2 +-
|
||||
.../repository/DefaultRepositoryAssembler.java | 14 +++++++-------
|
||||
2 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index e5eb3a34..6acf3c5f 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -116,7 +116,7 @@ under the License.
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.shared</groupId>
|
||||
<artifactId>maven-artifact-transfer</artifactId>
|
||||
- <version>0.9.0</version>
|
||||
+ <version>0.11.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
diff --git a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
|
||||
index 31318b0f..ffc6b120 100644
|
||||
--- a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
|
||||
+++ b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
|
||||
@@ -36,16 +36,16 @@
|
||||
import org.apache.maven.plugins.assembly.repository.model.RepositoryInfo;
|
||||
import org.apache.maven.project.MavenProject;
|
||||
import org.apache.maven.project.ProjectBuildingRequest;
|
||||
-import org.apache.maven.shared.artifact.TransferUtils;
|
||||
import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter;
|
||||
import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter;
|
||||
import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter;
|
||||
-import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
|
||||
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
|
||||
-import org.apache.maven.shared.artifact.resolve.ArtifactResult;
|
||||
-import org.apache.maven.shared.dependencies.resolve.DependencyResolver;
|
||||
-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
|
||||
-import org.apache.maven.shared.repository.RepositoryManager;
|
||||
+import org.apache.maven.shared.transfer.artifact.TransferUtils;
|
||||
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
|
||||
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
|
||||
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult;
|
||||
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
|
||||
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
|
||||
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
|
||||
import org.apache.maven.shared.utils.io.FileUtils;
|
||||
import org.codehaus.plexus.component.annotations.Component;
|
||||
import org.codehaus.plexus.component.annotations.Requirement;
|
@ -0,0 +1,89 @@
|
||||
From 6191bf7a4019ccb507068ceca594a8a7a4b6ade4 Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
Date: Fri, 25 Oct 2019 15:01:11 +0200
|
||||
Subject: [PATCH] Port to plexus-archiver 4.2.0
|
||||
|
||||
---
|
||||
.../archiver/AssemblyProxyArchiver.java | 61 +++++++++++++++++++
|
||||
1 file changed, 61 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
|
||||
index 7b9a621..170d243 100644
|
||||
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
|
||||
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
|
||||
@@ -44,6 +44,8 @@ import java.io.InputStream;
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
+import java.util.Comparator;
|
||||
+import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -1029,4 +1031,63 @@ public class AssemblyProxyArchiver
|
||||
}
|
||||
}
|
||||
|
||||
+ @Override
|
||||
+ public void setLastModifiedDate( final Date lastModifiedDate ) {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public Date getLastModifiedDate() {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setFilenameComparator( Comparator<String> filenameComparator ) {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setOverrideUid( int uid ) {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setOverrideUserName( String userName ) {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public int getOverrideUid() {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public String getOverrideUserName() {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setOverrideGid( int gid ) {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setOverrideGroupName( String groupName ) {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public int getOverrideGid() {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public String getOverrideGroupName() {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void configureReproducible( Date lastModifiedDate ) {
|
||||
+ throw new UnsupportedOperationException();
|
||||
+ }
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
@ -0,0 +1,242 @@
|
||||
Name: maven-assembly-plugin
|
||||
Version: 3.1.1
|
||||
Release: 3%{?dist}
|
||||
Summary: Maven Assembly Plugin
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/plugins/maven-assembly-plugin/
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
Patch0: 0000-Upgrade-maven-artifact-transfer-0.11.0.patch
|
||||
Patch1: 0001-Port-to-plexus-archiver-4.2.0.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.google.code.findbugs:jsr305)
|
||||
BuildRequires: mvn(commons-codec:commons-codec)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(org.apache.maven:maven-archiver)
|
||||
BuildRequires: mvn(org.apache.maven:maven-artifact)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-model)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.shared:file-management)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-filtering)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-shared-io)
|
||||
BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
|
||||
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-io)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||
|
||||
%description
|
||||
A Maven plugin to create archives of your project's sources, classes,
|
||||
dependencies etc. from flexible assembly descriptors.
|
||||
|
||||
%package javadoc
|
||||
Summary: API documentation for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package provides %{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
# Tests need easymockclassextension version 2.x, which is incompatible
|
||||
# with easymockclassextension version 3.x we have in Fedora.
|
||||
%mvn_build -f
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Tue May 07 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.1.1-3
|
||||
- Rebuilt for MSVSphere 8.9
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-3
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-2
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Mon May 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-1
|
||||
- Update to upstream version 3.1.1
|
||||
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.1.0-3
|
||||
- Escape macros in %%changelog
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Mon Sep 11 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-1
|
||||
- Update to upstream version 3.1.0
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Thu Nov 17 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-1
|
||||
- Update to upstream version 3.0.0
|
||||
|
||||
* Thu Jun 30 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-8
|
||||
- Compile against Maven 3 APIs
|
||||
|
||||
* Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-7
|
||||
- Regenerate build-requires
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Jan 5 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-5
|
||||
- Port to Maven Shared IO 3.0.0
|
||||
|
||||
* Wed Dec 2 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-4
|
||||
- Rebuild for maven-common-artifact-filters ABI change
|
||||
|
||||
* Tue Nov 10 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-3
|
||||
- Port to maven-filtering 3.0.0
|
||||
|
||||
* Mon Oct 12 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-2
|
||||
- Rebuild for maven-common-artifact-filters 3.0 ABI
|
||||
|
||||
* Mon Oct 12 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-1
|
||||
- Update to upstream version 2.6
|
||||
|
||||
* Thu Jul 02 2015 Michael Simacek <msimacek@redhat.com> - 2.5.5-3
|
||||
- Port to current plexus-archiver
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Jun 8 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5.5-1
|
||||
- Update to upstream version 2.5.5
|
||||
|
||||
* Mon Apr 27 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5.4-1
|
||||
- Update to upstream version 2.5.4
|
||||
|
||||
* Thu Mar 26 2015 Michael Simacek <msimacek@redhat.com> - 2.5.3-1
|
||||
- Update to upstream version 2.5.3
|
||||
|
||||
* Fri Feb 13 2015 gil cattaneo <puntogil@libero.it> - 2.5.2-2
|
||||
- introduce license macro
|
||||
|
||||
* Fri Nov 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5.2-1
|
||||
- Update to upstream version 2.5.2
|
||||
|
||||
* Thu Nov 6 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5.1-1
|
||||
- Update to upstream version 2.5.1
|
||||
|
||||
* Fri Oct 24 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5-1
|
||||
- Update to upstream version 2.5
|
||||
|
||||
* Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.1-3
|
||||
- Remove legacy Obsoletes/Provides for maven2 plugin
|
||||
|
||||
* Mon Sep 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.1-2
|
||||
- Update to plexus-archiver 2.6.1 and plexus-io 2.1.1
|
||||
|
||||
* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.1-1
|
||||
- Update to upstream version 2.4.1
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed Mar 19 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4-9
|
||||
- Add missing BR on modello
|
||||
- Resolves: rhbz#1077910
|
||||
|
||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.4-8
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Mon Apr 22 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4-6
|
||||
- Build with xmvn
|
||||
- Install license files
|
||||
- Resolves: rhbz#915608
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2.4-4
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
* Thu Dec 13 2012 Tomas Radej <tradej@redhat.com> - 2.4-1
|
||||
- Updated to latest upstream version.
|
||||
- Fixed mail in changelog
|
||||
|
||||
* Thu Nov 22 2012 Jaromir Capik <jcapik@redhat.com> - 2.3-3
|
||||
- Migration to plexus-containers-container-default
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Wed Mar 07 2012 Tomas Radej <tradej@redhat.com> - 2.3-1
|
||||
- Update to latest upstream vresion.
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Dec 12 2011 Tomas Radej <tradej@redhat.com> - 2.2.2-3
|
||||
- Added R on plexus-containers-component-metadata
|
||||
|
||||
* Mon Dec 12 2011 Alexander Kurtakov <akurtako@redhat.com> 2.2.2-2
|
||||
- Remove plexus-maven-plugin require.
|
||||
|
||||
* Tue Dec 6 2011 Alexander Kurtakov <akurtako@redhat.com> 2.2.2-1
|
||||
- Update to latest upstream version.
|
||||
|
||||
* Sun Oct 2 2011 Alexander Kurtakov <akurtako@redhat.com> 2.2.1-4
|
||||
- Add missing BR/R.
|
||||
|
||||
* Mon Jul 15 2011 Jaromir Capik <jcapik@redhat.com> 2.2.1-3
|
||||
- modello removed from requires
|
||||
- %%update_maven_depmap removed
|
||||
|
||||
* Mon May 23 2011 Jaromir Capik <jcapik@redhat.com> 2.2.1-2
|
||||
- Migration from plexus-maven-plugin to plexus-containers-component-metadata
|
||||
- Missing modello dependency added
|
||||
- Minor spec file changes according to the latest guidelines
|
||||
|
||||
* Thu Mar 17 2011 Alexander Kurtakov <akurtako@redhat.com> 2.2.1-1
|
||||
- Update to upstream 2.2.1 release.
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Dec 29 2010 Alexander Kurtakov <akurtako@redhat.com> 2.2-1
|
||||
- Update to final release.
|
||||
|
||||
* Tue Jun 15 2010 Alexander Kurtakov <akurtako@redhat.com> 2.2-0.4.beta5
|
||||
- Add missing BuildRequires.
|
||||
|
||||
* Tue Jun 15 2010 Alexander Kurtakov <akurtako@redhat.com> 2.2-0.3.beta5
|
||||
- Add missing Requires.
|
||||
|
||||
* Thu Jun 03 2010 Yong Yang <yyang@redhat.com> - 2.2-0.2.beta5
|
||||
- Chmod 0644 for depmap.xml
|
||||
- Fix Obsoletes and Provides
|
||||
- Change to BR java
|
||||
|
||||
* Thu May 20 2010 Yong Yang <yyang@redhat.com> - 2.2-0.1.beta5
|
||||
- Initial build
|
Loading…
Reference in new issue