PR#2: port to maven-artifact-transfer 0.11.0 - rpms/maven-enforcer

rpms / maven-enforcer

#2 port to maven-artifact-transfer 0.11.0

Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.

Unknown source master into master

port to maven-artifact-transfer 0.11.0

Fabio Valentini • 4 years ago

cd971bf

.gitignore

file modified

+4 -1

		`@@ -1,4 +1,7 @@`
		`- enforcer-1.0-beta-2.tar.xz`
		`+ /results_*`
		`+ /*.src.rpm`
		`+`
		`+ /enforcer-1.0-beta-2.tar.xz`
		`/enforcer-1.0.tar.xz`
		`/enforcer-1.0.1-source-release.zip`
		`/enforcer-1.2-source-release.zip`

0002-Port-to-artifact-transfer-0.11.0.patch

file added

+30

		`@@ -0,0 +1,30 @@`
		`+ diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java`
		`+ index f2e2cc7..c81de9d 100644`
		`+ --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java`
		`+ +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java`
		`+ @@ -66,8 +66,8 @@ import org.apache.maven.project.DefaultProjectBuildingRequest;`
		`+ import org.apache.maven.project.MavenProject;`
		`+ import org.apache.maven.project.ProjectBuildingRequest;`
		`+ import org.apache.maven.settings.Settings;`
		`+ -import org.apache.maven.shared.artifact.resolve.ArtifactResolver;`
		`+ -import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;`
		`+ +import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;`
		`+ +import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;`
		`+ import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;`
		`+ import org.codehaus.plexus.component.repository.exception.ComponentLookupException;`
		`+ import org.codehaus.plexus.util.ReflectionUtils;`
		`+ diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java`
		`+ index 3974a9e..d319e74 100644`
		`+ --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java`
		`+ +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java`
		`+ @@ -30,8 +30,8 @@ import org.apache.maven.plugin.logging.Log;`
		`+ import org.apache.maven.project.DefaultProjectBuildingRequest;`
		`+ import org.apache.maven.project.MavenProject;`
		`+ import org.apache.maven.project.ProjectBuildingRequest;`
		`+ -import org.apache.maven.shared.artifact.resolve.ArtifactResolver;`
		`+ -import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;`
		`+ +import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;`
		`+ +import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;`
		`+ import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;`
		`+ import org.codehaus.plexus.component.repository.exception.ComponentLookupException;`
		`+`

maven-enforcer.spec

file modified

+8 -1

		`@@ -2,7 +2,7 @@`

		`Name: maven-enforcer`
		`Version: 3.0.0~M2`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`Summary: Maven Enforcer`
		`License: ASL 2.0`
		`URL: http://maven.apache.org/enforcer`
		`@@ -14,6 +14,9 @@`
		`# https://issues.apache.org/jira/browse/MENFORCER-267`
		`Patch0: 0001-Port-to-Maven-3-API.patch`

		`+ # port to maven-artifact-transfer 0.11.0`
		`+ Patch1: 0002-Port-to-artifact-transfer-0.11.0.patch`
		`+`
		`BuildRequires: maven-local`
		`BuildRequires: mvn(com.google.code.findbugs:jsr305)`
		`BuildRequires: mvn(commons-lang:commons-lang)`
		`@@ -71,6 +74,7 @@`
		`find -name 'pom.xml' -exec sed -i 's/\r//' {} \;`

		`%patch0 -p1`
		`+ %patch1 -p1`

		`%pom_remove_plugin :maven-enforcer-plugin`

		`@@ -106,6 +110,9 @@`
		`%doc LICENSE NOTICE`

		`%changelog`
		`+ * Sun Nov 03 2019 Fabio Valentini <decathorpe@gmail.com> - 3.0.0~M2-2`
		`+ - Port to maven-artifact-transfer 0.11.0.`
		`+`
		`* Thu Aug 08 2019 Marian Koncek <mkoncek@redhat.com> - 3.0.0~M2-1`
		`- Update to upstream verssion 3.0.0~M2`