[maven-enforcer] Removal of plexus-maven-plugin dependency (not needed)
Jaromír Cápík
jcapik at fedoraproject.org
Fri Jul 15 10:37:29 UTC 2011
commit 463755a018f29080d2d59c9506d77ebac6b60c10
Author: Jaromír Cápík <jcapik at redhat.com>
Date: Fri Jul 15 12:37:13 2011 +0200
Removal of plexus-maven-plugin dependency (not needed)
maven-enforcer.spec | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/maven-enforcer.spec b/maven-enforcer.spec
index 75a616f..895c0db 100644
--- a/maven-enforcer.spec
+++ b/maven-enforcer.spec
@@ -1,6 +1,6 @@
Name: maven-enforcer
Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven Enforcer
Group: Development/Libraries
@@ -29,7 +29,6 @@ BuildRequires: maven-site-plugin
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
-BuildRequires: plexus-maven-plugin
BuildRequires: plexus-containers-component-javadoc
Requires: maven
Requires: jpackage-utils
@@ -81,8 +80,6 @@ This component contains the standard Enforcer Rules.
%prep
%setup -q -n enforcer-%{version}
-# fix old dep on javadoc taglet
-
%build
mvn-rpmbuild \
-e \
@@ -92,30 +89,30 @@ mvn-rpmbuild \
%install
# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
-install -m 644 enforcer-api/target/enforcer-api-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/enforcer-api.jar
+install -m 644 enforcer-api/target/enforcer-api-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}/enforcer-api.jar
install -m 644 enforcer-rules/target/enforcer-rules-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/enforcer-rules.jar
-install -m 644 maven-enforcer-plugin/target/maven-enforcer-plugin-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/plugin.jar
+ %{buildroot}%{_javadir}/%{name}/enforcer-rules.jar
+install -m 644 maven-enforcer-plugin/target/maven-enforcer-plugin-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}/plugin.jar
# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.maven.enforcer enforcer %{version} JPP %{name}
install -pm 644 enforcer-api/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-enforcer-api.pom
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-enforcer-api.pom
%add_to_maven_depmap org.apache.maven.enforcer enforcer-api %{version} JPP/%{name} enforcer-api
install -pm 644 enforcer-rules/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-enforcer-rules.pom
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-enforcer-rules.pom
%add_to_maven_depmap org.apache.maven.enforcer enforcer-rules %{version} JPP/%{name} enforcer-rules
install -pm 644 maven-enforcer-plugin/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-plugin.pom
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-plugin.pom
%add_to_maven_depmap org.apache.maven.plugins maven-enforcer-plugin %{version} JPP/%{name} plugin
# javadoc
@@ -147,6 +144,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadir}/%{name}/plugin*
%changelog
+* Fri Jul 15 2011 Jaromir Capik <jcapik at redhat.com> - 1.0.1-2
+- Removal of plexus-maven-plugin dependency (not needed)
+
* Tue Jun 28 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-1
- Update to latest upstream 1.0.1.
- Adapt to current guidelines.
More information about the scm-commits
mailing list