switch to XMvn

This commit is contained in:
gil 2013-07-06 21:10:45 +02:00
parent 0b61093a11
commit 90d57f92d6
2 changed files with 9 additions and 64 deletions

View File

@ -1,46 +0,0 @@
--- pom.xml 2012-08-21 03:42:31.000000000 +0200
+++ pom.xml-gil 2012-09-13 15:44:25.590144619 +0200
@@ -346,11 +346,11 @@
<version>1.7</version>
</extension>
- <extension>
+ <!--extension>
<groupId>org.kathrynhuxtable.maven.wagon</groupId>
<artifactId>wagon-gitsite</artifactId>
<version>0.3.1</version>
- </extension>
+ </extension-->
</extensions>
</build>
@@ -361,23 +361,16 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.version}</version>
<configuration>
- <bootclasspath>${sun.boot.class.path}</bootclasspath>
- <doclet>com.google.doclava.Doclava</doclet>
- <useStandardDocletOptions>false</useStandardDocletOptions>
- <additionalJOption>-J-Xmx1024m</additionalJOption>
+ <minmemory>128m</minmemory>
<maxmemory>${javadoc.maxmemory}</maxmemory>
+ <breakiterator>true</breakiterator>
+ <quiet>true</quiet>
+ <verbose>false</verbose>
+ <source>${javac.src.version}</source>
+ <linksource>true</linksource>
<links>
<link>http://docs.oracle.com/javase/6/docs/api/</link>
</links>
- <docletArtifact>
- <groupId>com.google.doclava</groupId>
- <artifactId>doclava</artifactId>
- <version>1.0.3</version>
- </docletArtifact>
- <additionalparam>
- -hdf project.name "${project.name}"
- -d ${project.reporting.outputDirectory}/apidocs
- </additionalparam>
</configuration>
<reportSets>
<reportSet>

View File

@ -1,14 +1,11 @@
%global oname oss-parent
Name: fasterxml-oss-parent
Version: 10
Release: 1%{?dist}
Release: 2%{?dist}
Summary: FasterXML parent pom
Group: Development/Libraries
# pom file licenses ASL 2.0 and LGPL 2.1
License: ASL 2.0 and LGPLv2+
URL: http://fasterxml.com/
# git clone git://github.com/FasterXML/oss-parent.git fasterxml-oss-parent-4
# (cd fasterxml-oss-parent-4/ && git archive --format=tar --prefix=fasterxml-oss-parent-4/ oss-parent-4 | xz > ../fasterxml-oss-parent-4-src-git.tar.xz)
Source0: https://github.com/FasterXML/oss-parent/archive/oss-parent-%{version}.tar.gz
BuildRequires: java-devel
@ -20,9 +17,6 @@ BuildRequires: maven-plugin-bundle
BuildRequires: maven-site-plugin
BuildRequires: replacer
Requires: replacer
Requires: java
BuildArch: noarch
%description
@ -52,22 +46,19 @@ This package contains the parent pom file for FasterXML.com projects.
</configuration>'
%build
# nothing to do
%mvn_build
%install
%mvn_install
mkdir -p %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom
%check
mvn-rpmbuild verify
%files
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%files -f .mfiles
%doc LICENSE NOTICE README.creole
%changelog
* Sat Jul 06 2013 gil cattaneo <puntogil@libero.it> 10-2
- switch to XMvn
- minor changes to adapt to current guideline
* Tue May 07 2013 gil cattaneo <puntogil@libero.it> 10-1
- update to 10