Compare commits
No commits in common. 'stream-javapackages-tools-202201-rhel-9.1.0' and 'i8c-stream-201902' have entirely different histories.
stream-jav
...
i8c-stream
@ -1,22 +1 @@
|
||||
/results_*
|
||||
/*.src.rpm
|
||||
|
||||
/maven-assembly-plugin-2.2-beta-5-src.tar.gz
|
||||
/maven-assembly-plugin-2.2-source-release.zip
|
||||
/maven-assembly-plugin-2.2.1-source-release.zip
|
||||
/maven-assembly-plugin-2.2.2-source-release.zip
|
||||
/maven-assembly-plugin-2.3-source-release.zip
|
||||
/maven-assembly-plugin-2.4-source-release.zip
|
||||
/maven-assembly-plugin-2.4.1-source-release.zip
|
||||
/maven-assembly-plugin-2.5-source-release.zip
|
||||
/maven-assembly-plugin-2.5.1-source-release.zip
|
||||
/maven-assembly-plugin-2.5.2-source-release.zip
|
||||
/maven-assembly-plugin-2.5.3-source-release.zip
|
||||
/maven-assembly-plugin-2.5.4-source-release.zip
|
||||
/maven-assembly-plugin-2.5.5-source-release.zip
|
||||
/maven-assembly-plugin-2.6-source-release.zip
|
||||
/maven-assembly-plugin-3.0.0-source-release.zip
|
||||
/maven-assembly-plugin-3.1.0-source-release.zip
|
||||
/maven-assembly-plugin-3.1.1-source-release.zip
|
||||
/maven-assembly-plugin-3.2.0-source-release.zip
|
||||
/maven-assembly-plugin-3.3.0-source-release.zip
|
||||
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
|
||||
|
||||
Loading…
Reference in new issue