[jboss-dmr/f17] Properly building the project with apt-maven-plugin

Marek Goldmann goldmann at fedoraproject.org
Fri Apr 13 21:13:27 UTC 2012


commit 73b4b3c51ccf8e4fbeb1baa6b0cb3c6a1095b8b2
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Fri Apr 13 23:13:11 2012 +0200

    Properly building the project with apt-maven-plugin

 jboss-dmr.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/jboss-dmr.spec b/jboss-dmr.spec
index 7971c50..be47992 100644
--- a/jboss-dmr.spec
+++ b/jboss-dmr.spec
@@ -3,7 +3,7 @@
 
 Name:             jboss-dmr
 Version:          1.1.1
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          JBoss DMR
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -12,7 +12,6 @@ URL:              https://github.com/jbossas/jboss-dmr
 # git clone git://github.com/jbossas/jboss-dmr.git
 # cd jboss-dmr/ && git archive --format=tar --prefix=jboss-dmr-1.1.1.Final/ 1.1.1.Final | xz > jboss-dmr-1.1.1.Final.tar.xz
 Source0:          %{name}-%{namedversion}.tar.xz
-Patch0:           %{name}-%{namedversion}-pom.patch
 
 BuildArch:        noarch
 
@@ -27,6 +26,7 @@ BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-release-plugin
 BuildRequires:    maven-resources-plugin
 BuildRequires:    maven-surefire-plugin
+BuildRequires:    apt-maven-plugin
 BuildRequires:    junit4
 BuildRequires:    maven-surefire-provider-junit4
 BuildRequires:    jboss-parent
@@ -52,11 +52,10 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{namedversion}
-%patch0 -p1
-
-mv src/placeholder/java/org/jboss/dmr/*.java src/main/java/org/jboss/dmr/
 
 %build
+export MAVEN_OPTS="-XX:-UseSplitVerifier"
+
 # Skipped tests because of one failure - testFromJSONString
 # Tests run: 201, Failures: 1, Errors: 1, Skipped: 0 
 mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
@@ -86,6 +85,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Apr 13 2012 Marek Goldmann <mgoldman at redhat.com> 1.1.1-4
+- Properly building the project with apt-maven-plugin
+
 * Fri Mar 09 2012 Marek Goldmann <mgoldman at redhat.com> 1.1.1-3
 - Relocated jars to _javadir
 


More information about the scm-commits mailing list