rpms/plexus-containers
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to latest packaging guidelines

Browse Source 
- Remove several unneeded buildrequires
This commit is contained in:
Stanislav Ochotnicky 2013-03-20 10:21:34 +01:00
parent 247c48be32
commit ce7649f97e
3 changed files with 28 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0002-Fix-maven3-compatibility.patch
View File

@ -1,27 +0,0 @@
From 5a2e4822c0e7bf27f86818e6e5e613dad8c556fa Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Tue, 28 Jun 2011 12:59:45 +0200
Subject: [PATCH 2/2] Fix maven3 compatibility
---
plexus-component-metadata/pom.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/plexus-component-metadata/pom.xml b/plexus-component-metadata/pom.xml
index adfb80c..c23af73 100644
--- a/plexus-component-metadata/pom.xml
+++ b/plexus-component-metadata/pom.xml
@@ -38,6 +38,10 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
--
1.7.5.4

16
0003-Fix-OpenJDK7-compatibility.patch
View File

@ -1,16 +0,0 @@
diff --git a/plexus-component-javadoc/pom.xml b/plexus-component-javadoc/pom.xml
index 8030819..bc780f3 100644
--- a/plexus-component-javadoc/pom.xml
+++ b/plexus-component-javadoc/pom.xml
@@ -21,10 +21,7 @@
<profile>
<id>default-tools.jar</id>
<activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
+ <activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>

98
plexus-containers.spec
View File

@ -10,10 +10,9 @@
Name: %{parent}-%{subname}
Version: 1.5.5
Release: 9%{?dist}
Release: 10%{?dist}
Summary: Containers for Plexus
License: ASL 2.0 and MIT
Group: Development/Libraries
URL: http://plexus.codehaus.org/
# svn export \
# http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.5.5
@ -24,25 +23,15 @@ Source2: plexus-component-annotations-build.xml
Source3: plexus-containers-settings.xml
Patch0: 0001-Fix-test-oom.patch
Patch1: 0002-Fix-maven3-compatibility.patch
Patch2: 0003-Fix-OpenJDK7-compatibility.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.3
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-invoker-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin = %{javadoc_plugin_version}
BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-shared-invoker
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-release
BuildRequires: maven-plugin-plugin
BuildRequires: plexus-classworlds
@ -67,34 +56,24 @@ is like a J2EE application server, without all the baggage.
%package component-metadata
Summary: Component metadata from %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: plexus-cli
%description component-metadata
%{summary}.
%package component-javadoc
Summary: Javadoc component from %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description component-javadoc
%{summary}.
%package component-annotations
Summary: Component API from %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
%description component-annotations
%{summary}.
%package container-default
Summary: Default Container from %{name}
Group: Development/Libraries
Requires: %{name}-component-annotations = %{version}-%{release}
Provides: plexus-containers-component-api = %{version}-%{release}
%description container-default
@ -103,7 +82,6 @@ Provides: plexus-containers-component-api = %{version}-%{release}
%package javadoc
Summary: API documentation for all plexus-containers packages
Group: Documentation
Requires: jpackage-utils
Provides: %{name}-component-annotations-javadoc = %{version}-%{release}
Obsoletes: %{name}-component-annotations-javadoc < %{version}-%{release}
Provides: %{name}-component-javadoc-javadoc = %{version}-%{release}
@ -123,8 +101,16 @@ cp %{SOURCE1} plexus-container-default/build.xml
cp %{SOURCE2} plexus-component-annotations/build.xml
%patch0 -p1
%patch1 -p1
%patch2 -p1
# For Maven 3 compat
%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
# OpenJDK7 compatibility
%pom_xpath_replace "pom:profile[pom:id[text()='default-tools.jar']]/pom:activation" "
<activation>
<activeByDefault>true</activeByDefault>
</activation>
" plexus-component-javadoc
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java
@ -132,48 +118,17 @@ mkdir -p plexus-component-annotations/src/test/java
# integration tests fix
sed -i "s|<version>2.3</version>|<version> %{javadoc_plugin_version}</version>|" plexus-component-javadoc/src/it/basic/pom.xml
# plexus-component-api has been merged into plexus-container-default
%mvn_alias ":plexus-container-default" "org.codehaus.plexus:containers-component-api"
# plexus-containers pom goes into main package
%mvn_package ":plexus-containers" ""
%build
mvn-rpmbuild -Dmaven.test.skip=true install
# for integration tests ran during javadoc:javadoc
for file in $MAVEN_REPO_LOCAL/org/apache/maven/plugins/maven-javadoc-plugin/%{javadoc_plugin_version}/*;do
sha1sum $file | awk '{print $1}' > $ile.sha1
done
mvn-rpmbuild javadoc:aggregate
%mvn_build -f -s -d
%install
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 plexus-component-annotations/target/*.jar \
$RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-component-annotations.jar
install -pm 644 plexus-container-default/target/*.jar \
$RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-container-default.jar
install -pm 644 plexus-component-metadata/target/*.jar \
$RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-component-metadata.jar
install -pm 644 plexus-component-annotations/target/*.jar \
$RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-component-javadoc.jar
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
install -pm 644 plexus-component-annotations/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}-component-annotations.pom
install -pm 644 plexus-container-default/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}-container-default.pom
install -pm 644 plexus-component-metadata/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}-component-metadata.pom
install -pm 644 plexus-component-javadoc/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}-component-javadoc.pom
%add_maven_depmap JPP.%{parent}-%{subname}.pom
%add_maven_depmap JPP.%{parent}-%{subname}-component-annotations.pom %{parent}/%{subname}-component-annotations.jar -f component-annotations
# component-api is now folded into container-default
%add_maven_depmap JPP.%{parent}-%{subname}-container-default.pom %{parent}/%{subname}-container-default.jar -a "org.codehaus.plexus:containers-component-api" -f container-default
%add_maven_depmap JPP.%{parent}-%{subname}-component-metadata.pom %{parent}/%{subname}-component-metadata.jar -f component-metadata
%add_maven_depmap JPP.%{parent}-%{subname}-component-javadoc.pom %{parent}/%{subname}-component-javadoc.jar -f component-javadoc
%mvn_install
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@ -181,15 +136,18 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files -f .mfiles
%files component-annotations -f .mfiles-component-annotations
%files container-default -f .mfiles-container-default
%files component-metadata -f .mfiles-component-metadata
%files component-javadoc -f .mfiles-component-javadoc
%files component-annotations -f .mfiles-plexus-component-annotations
%files container-default -f .mfiles-plexus-container-default
%files component-metadata -f .mfiles-plexus-component-metadata
%files component-javadoc -f .mfiles-plexus-component-javadoc
%files javadoc
%doc %{_javadocdir}/*
%files javadoc -f .mfiles-javadoc
%changelog
* Wed Mar 20 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5.5-10
- Update to latest packaging guidelines
- Remove several unneeded buildrequires
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild