diff --git a/0001-Port-to-Maven-3-API.patch b/0001-Port-to-Maven-3-API.patch index 45538f5..fa1ef5d 100644 --- a/0001-Port-to-Maven-3-API.patch +++ b/0001-Port-to-Maven-3-API.patch @@ -1,3 +1,20 @@ +From 6a4c8a3177ad95989baa4df28d8a3479faf8be8c Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 12 Oct 2015 15:48:16 +0200 +Subject: [PATCH] Port to Maven 3 API + +--- + enforcer-rules/pom.xml | 6 ++- + .../enforcer/AbstractBanDependencies.java | 13 +++-- + .../enforcer/BanTransitiveDependencies.java | 7 ++- + .../enforcer/DependencyConvergence.java | 29 +++++------ + .../enforcer/RequirePluginVersions.java | 51 +++++++------------ + .../enforcer/RequireUpperBoundDeps.java | 31 ++++------- + .../enforcer/utils/DependencyVersionMap.java | 6 +-- + .../enforcer/utils/EnforcerRuleUtils.java | 40 +++------------ + pom.xml | 11 ++-- + 9 files changed, 78 insertions(+), 116 deletions(-) + diff --git a/enforcer-rules/pom.xml b/enforcer-rules/pom.xml index 187d38b..076c84a 100644 --- a/enforcer-rules/pom.xml diff --git a/0002-Port-to-artifact-transfer-0.11.0.patch b/0002-Port-to-artifact-transfer-0.11.0.patch deleted file mode 100644 index 67b4bcc..0000000 --- a/0002-Port-to-artifact-transfer-0.11.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -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; - diff --git a/maven-enforcer.spec b/maven-enforcer.spec index 1d6cd2a..6da9b6e 100644 --- a/maven-enforcer.spec +++ b/maven-enforcer.spec @@ -1,41 +1,43 @@ +%bcond_with bootstrap + Name: maven-enforcer Version: 3.0.0~M3 Release: 4%{?dist} Summary: Maven Enforcer License: ASL 2.0 +URL: https://maven.apache.org/enforcer +BuildArch: noarch %global upstream_version %(echo '%{version}' | tr '~' '-') -URL: https://maven.apache.org/enforcer Source0: https://repo1.maven.org/maven2/org/apache/maven/enforcer/enforcer/%{upstream_version}/enforcer-%{upstream_version}-source-release.zip # TODO forward upstream # 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 - -BuildArch: noarch - BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.resolver:maven-resolver-util) -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-dependency-tree) +BuildRequires: mvn(org.apache.maven.enforcer:enforcer-api) +BuildRequires: mvn(org.apache.maven.enforcer:enforcer-rules) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-compat) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.beanshell:bsh) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +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-dependency-tree) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +%endif %description Enforcer is a build rule execution framework. @@ -68,16 +70,17 @@ This component contains the standard Enforcer Rules. %prep %setup -q -n enforcer-%{upstream_version} - -# Use Unix line endings -find -name '*.java' -exec sed -i 's/\r//' {} \; -find -name 'pom.xml' -exec sed -i 's/\r//' {} \; - %patch0 -p1 -%patch1 -p1 + +# Port to maven-artifact-transfer 0.11.0 +sed -i 's/shared\.artifact\.resolve/shared.transfer.artifact.resolve/' enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java +sed -i 's/shared\.artifact\.resolve/shared.transfer.artifact.resolve/' enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java %pom_remove_plugin :maven-enforcer-plugin +find -name EvaluateBeanshell.java -delete +%pom_remove_dep :bsh enforcer-rules + # Avoid dependency cycle %pom_xpath_inject pom:build/pom:pluginManagement/pom:plugins " @@ -110,6 +113,9 @@ sed -e "s|plexus-maven-plugin|plexus-compon %doc LICENSE NOTICE %changelog +* Fri May 14 2021 Marian Koncek - 3.0.0~M3-1 +- Update to upstream version 3.0.0~M3 + * Tue Jan 26 2021 Fedora Release Engineering - 3.0.0~M3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -125,6 +131,9 @@ sed -e "s|plexus-maven-plugin|plexus-compon * Wed Jan 29 2020 Fedora Release Engineering - 3.0.0~M2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 3.0.0~M2-2 +- Mass rebuild for javapackages-tools 201902 + * Sun Nov 03 2019 Fabio Valentini - 3.0.0~M2-2 - Port to maven-artifact-transfer 0.11.0. @@ -134,6 +143,12 @@ sed -e "s|plexus-maven-plugin|plexus-compon * Thu Jul 25 2019 Fedora Release Engineering - 1.4.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Wed May 29 2019 Marian Koncek - 3.0.0-1 +- Update to upstream version 3.0.0~M2 + +* Fri May 24 2019 Mikolaj Izdebski - 1.4.1-9 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 01 2019 Fedora Release Engineering - 1.4.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild