rpms/maven-enforcer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

port to maven-artifact-transfer 0.11.0

Browse Source
This commit is contained in:
Fabio Valentini 2019-11-04 00:14:13 +01:00
parent e956ca25cf
commit cd971bf4ba
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -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

30
0002-Port-to-artifact-transfer-0.11.0.patch Normal file
View File

@ -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;

9
maven-enforcer.spec
View File

@ -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 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/enforcer/enforcer
# 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 '*.java' -exec sed -i 's/\r//' {} \;
find -name 'pom.xml' -exec sed -i 's/\r//' {} \;
%patch0 -p1
%patch1 -p1
%pom_remove_plugin :maven-enforcer-plugin
@ -106,6 +110,9 @@ sed -e "s|<artifactId>plexus-maven-plugin</artifactId>|<artifactId>plexus-compon
%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