[maven-enforcer] Remove RPM bug workaround
by Mikolaj Izdebski
commit 3aaf867091aab4470b953bc57b02b9c4173b375e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 15 06:18:02 2012 +0200
Remove RPM bug workaround
maven-enforcer-maven3-compat.patch | 15 ---------
...-enforcer-migration-to-component-metadata.patch | 34 --------------------
...equirePluginVersions-maven3-compatibility.patch | 31 ------------------
maven-enforcer.spec | 11 ++----
4 files changed, 4 insertions(+), 87 deletions(-)
---
diff --git a/maven-enforcer.spec b/maven-enforcer.spec
index 9313e51..884587f 100644
--- a/maven-enforcer.spec
+++ b/maven-enforcer.spec
@@ -1,6 +1,6 @@
Name: maven-enforcer
Version: 1.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven Enforcer
Group: Development/Libraries
@@ -119,12 +119,6 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-
%files
%dir %{_javadir}/%{name}
%{_mavenpomdir}/JPP-%{name}.pom
@@ -150,6 +144,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.1.1-2
+- Remove RPM bug workaround
+
* Fri Oct 12 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.1.1-1
- Update to upstream version 1.1.1
- Convert patches to POM macro
11 years, 7 months
Broken dependencies: joda-time
by Fedora Koji Build System
joda-time has broken dependencies in the epel-5 tree:
On ppc:
joda-time-1.5.2-7.tzdata2008d.el5.noarch requires java > 0:1.5.0
Please resolve this as soon as possible.
11 years, 7 months
Broken dependencies: joda-time
by Fedora Koji Build System
joda-time has broken dependencies in the epel-5 tree:
On ppc:
joda-time-1.5.2-7.tzdata2008d.el5.noarch requires java > 0:1.5.0
Please resolve this as soon as possible.
11 years, 7 months
[maven-enforcer] Update to upstream version 1.1.1
by Mikolaj Izdebski
commit 48627a86e6d50f9f3f2a57afb74c9a68001c56b5
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Oct 12 20:24:04 2012 +0200
Update to upstream version 1.1.1
- Convert patches to POM macro
- Remove patch for bug 748074, upstreamed
maven-enforcer.spec | 22 ++++++++++++----------
sources | 2 +-
2 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/maven-enforcer.spec b/maven-enforcer.spec
index f211fbd..9313e51 100644
--- a/maven-enforcer.spec
+++ b/maven-enforcer.spec
@@ -1,6 +1,6 @@
Name: maven-enforcer
-Version: 1.0.1
-Release: 5%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
Summary: Maven Enforcer
Group: Development/Libraries
@@ -8,11 +8,6 @@ License: ASL 2.0
URL: http://maven.apache.org/enforcer
Source0: http://repo1.maven.org/maven2/org/apache/maven/enforcer/enforcer/%{versio...
-#748074 - maven-enforcer-plugin is not compatible with maven3
-Patch0: %{name}-requirePluginVersions-maven3-compatibility.patch
-Patch1: %{name}-migration-to-component-metadata.patch
-Patch2: %{name}-maven3-compat.patch
-
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -84,9 +79,11 @@ This component contains the standard Enforcer Rules.
%prep
%setup -q -n enforcer-%{version}
-%patch0 -p0
-%patch1 -p1
-%patch2 -p1
+%pom_add_dep org.apache.maven:maven-compat enforcer-rules
+
+sed -e "s|<artifactId>plexus-maven-plugin</artifactId>|<artifactId>plexus-component-metadata</artifactId>|" \
+ -e "s|<goal>descriptor</goal>|<goal>generate-metadata</goal>|" \
+ -i enforcer-{api,rules}/pom.xml
%build
mvn-rpmbuild \
@@ -153,6 +150,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Fri Oct 12 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.1.1-1
+- Update to upstream version 1.1.1
+- Convert patches to POM macro
+- Remove patch for bug 748074, upstreamed
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 388e8fb..cae9f8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9271d09cb4f2841aed40f5718b34e562 enforcer-1.0.1-source-release.zip
+cbfb104743f6f9c80ee5094bc5ee34c5 enforcer-1.1.1-source-release.zip
11 years, 7 months
[Bug 748074] New: maven-enforcer-plugin is not compatible with maven3
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: maven-enforcer-plugin is not compatible with maven3
https://bugzilla.redhat.com/show_bug.cgi?id=748074
Summary: maven-enforcer-plugin is not compatible with maven3
Product: Fedora
Version: 16
Platform: All
OS/Version: Linux
Status: NEW
Severity: low
Priority: unspecified
Component: maven-enforcer
AssignedTo: jcapik(a)redhat.com
ReportedBy: orion(a)cora.nwra.com
QAContact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com
Classification: Fedora
Story Points: ---
Type: ---
Description of problem:
While trying to build mybatis-parent that uses maven-enforcer-plugin:
[INFO] --- maven-enforcer-plugin:1.0.1:enforce (enforce-java) @ mybatis-parent
---
[INFO] The requirePluginVersions rule is currently not compatible with Maven3.
[WARNING] Rule 3: org.apache.maven.plugins.enforcer.RequireProperty failed with
message:
[ERROR] You must set the property 'findbugs.onlyAnalyze' in your project pom!
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 2.996s
[INFO] Finished at: Fri Oct 21 16:25:00 MDT 2011
[INFO] Final Memory: 7M/16M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal
org.apache.maven.plugins:maven-enforcer-plugin:1.0.1:enforce (enforce-java) on
project mybatis-parent: Some Enforcer rules have failed. Look above for
specific messages explaining why the rule failed. -> [Help 1]
I can set -Dfindbugs.onlyAnalyze to work around.
Version-Release number of selected component (if applicable):
maven-enforcer-plugin-1.0.1-2.fc16.noarch
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
11 years, 7 months