Build with maven 3.x.

- Use upstream source.
- Guidelines fixes.
This commit is contained in:
Alexander Kurtakov 2011-06-09 22:18:54 +03:00
parent 1fe852f3d4
commit 0c46a842b4
5 changed files with 21 additions and 99 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
maven-shade-plugin-1.3.3.tar.xz
/maven-shade-plugin-1.4.tar.xz
/maven-shade-plugin-1.4-source-release.zip

View File

@ -1,38 +0,0 @@
<dependencies>
<dependency>
<maven>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
<version>3.2</version>
</maven>
<jpp>
<groupId>JPP/objectweb-asm</groupId>
<artifactId>asm-commons</artifactId>
<version>3.2</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.2</version>
</maven>
<jpp>
<groupId>JPP/objectweb-asm</groupId>
<artifactId>asm</artifactId>
<version>3.2</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>asm</groupId>
<artifactId>asm-tree</artifactId>
<version>3.2</version>
</maven>
<jpp>
<groupId>JPP/objectweb-asm</groupId>
<artifactId>asm-tree</artifactId>
<version>3.2</version>
</jpp>
</dependency>
</dependencies>

View File

@ -1,25 +1,20 @@
Name: maven-shade-plugin
Version: 1.4
Release: 3%{?dist}
Release: 4%{?dist}
Summary: This plugin provides the capability to package the artifact in an uber-jar
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/%{name}
# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-1.4
# tar caf maven-shade-plugin-1.4.tar.xz maven-shade-plugin-1.4
Source0: %{name}-%{version}.tar.xz
Source1: %{name}.depmap
Patch1: pom.xml.maven-artifact-manager.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: plexus-utils
BuildRequires: ant-nodeps
BuildRequires: maven2
BuildRequires: ant
BuildRequires: maven
BuildRequires: maven-wagon
BuildRequires: maven-enforcer-plugin
BuildRequires: plexus-container-default
@ -27,14 +22,14 @@ BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-shared-plugin-testing-harness
BuildRequires: maven-plugin-testing-harness
BuildRequires: jdependency >= 0.6
Requires: ant-nodeps
Requires: maven2
Requires: ant
Requires: maven
Requires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: jdependency >= 0.6
@ -58,37 +53,19 @@ Requires: jpackage-utils
%description javadoc
%{summary}.
%prep
%setup -q #You may need to update this according to your Source0
rm src/test/jars/plexus-utils-1.4.1.jar
ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
# Add dependency on maven-artifact-manager
%patch1 -p0
# remove failing test: testShadeWithFilter
rm src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
# we skip test because even with binary mvn release these fail for
# various reasons.
mvn-jpp -e \
-Dmaven2.jpp.mode=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven2.jpp.depmap.file="%{SOURCE1}" \
install javadoc:javadoc
mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%install
rm -rf %{buildroot}
# jars
install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# poms
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
@ -96,10 +73,8 @@ install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
rm -rf target/site/api*
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@ -107,21 +82,20 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
* Thu Jun 9 2011 Alexander Kurtakov <akurtako@redhat.com> 1.4-4
- Build with maven 3.x.
- Use upstream source.
- Guidelines fixes.
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

View File

@ -1,15 +0,0 @@
--- pom.xml-orig 2010-10-14 15:48:17.996790048 +0200
+++ pom.xml 2010-10-14 15:48:59.436790527 +0200
@@ -79,6 +79,12 @@
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+
<!-- Plexus -->
<dependency>

View File

@ -1 +1 @@
fbb400f3b2d21f229222396683e03855 maven-shade-plugin-1.4.tar.xz
4f9a2f31806f882d159383121d5f4030 maven-shade-plugin-1.4-source-release.zip