commit 3606620535125fc487f83a6af1c48135ed0a46d4 Author: Stanislav Ochotnicky sochotnicky@redhat.com Date: Thu Jun 23 12:14:22 2011 +0200
Add several missing things to (Build)Requires
- Fix build for maven3-only buildroot
0001-Pom-dependencies-fix.patch | 54 ++++++++++++++++++++++++++++ 0002-Maven-3-compatibility-functions.patch | 32 ++++++++++++++++ add-servlet-dep.patch | 19 ---------- maven-site-plugin.spec | 42 +++++++++++++++------ 4 files changed, 116 insertions(+), 31 deletions(-) --- diff --git a/0001-Pom-dependencies-fix.patch b/0001-Pom-dependencies-fix.patch new file mode 100644 index 0000000..3e2cb7e --- /dev/null +++ b/0001-Pom-dependencies-fix.patch @@ -0,0 +1,54 @@ +From 62554696dc9ba729a8990f29c344512eec5f88e0 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky sochotnicky@redhat.com +Date: Mon, 27 Jun 2011 10:34:48 +0200 +Subject: [PATCH 1/2] Pom dependencies fix + +--- + pom.xml | 17 ++++++++++++++++- + 1 files changed, 16 insertions(+), 1 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 3fbbb71..c29d2d0 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -179,7 +179,7 @@ under the License. + <properties> + <doxiaVersion>1.2</doxiaVersion> + <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion> +- <mavenVersion>2.2.0</mavenVersion> ++ <mavenVersion>3.0.3</mavenVersion> + <wagonVersion>1.0-beta-6</wagonVersion> + </properties> + +@@ -203,6 +203,11 @@ under the License. + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> ++ <artifactId>maven-core</artifactId> ++ <version>${mavenVersion}</version> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>${mavenVersion}</version> + </dependency> +@@ -345,6 +350,16 @@ under the License. + <artifactId>jetty</artifactId> + <version>6.1.5</version> + </dependency> ++ <dependency> ++ <groupId>javax.servlet</groupId> ++ <artifactId>servlet-api</artifactId> ++ <version>2.5</version> ++ </dependency> ++ <dependency> ++ <groupId>org.mortbay.jetty</groupId> ++ <artifactId>jetty-util</artifactId> ++ <version>6.1.24</version> ++ </dependency> + + <!-- test --> + <dependency> +-- +1.7.5.4 + diff --git a/0002-Maven-3-compatibility-functions.patch b/0002-Maven-3-compatibility-functions.patch new file mode 100644 index 0000000..bdc8635 --- /dev/null +++ b/0002-Maven-3-compatibility-functions.patch @@ -0,0 +1,32 @@ +From 9fc579f0a193d952d9efd4896a83ad7765d89f94 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky sochotnicky@redhat.com +Date: Mon, 27 Jun 2011 10:36:03 +0200 +Subject: [PATCH 2/2] Maven 3 compatibility functions + +--- + .../site/SiteDescriptorArtifactMetadata.java | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java b/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java +index 2ad6437..8e570d1 100644 +--- a/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java ++++ b/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java +@@ -114,6 +114,15 @@ public class SiteDescriptorArtifactMetadata + return "site descriptor " + artifact.getGroupId() + ":" + artifact.getArtifactId() + " " + file.getName(); + } + ++ public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata ) ++ { ++ SiteDescriptorArtifactMetadata m = (SiteDescriptorArtifactMetadata) metadata; ++ if ( !m.file.equals( file ) ) ++ { ++ throw new IllegalStateException( "Cannot add two different pieces of metadata for: " + getKey() ); ++ } ++ } ++ + public void merge( ArtifactMetadata metadata ) + { + SiteDescriptorArtifactMetadata m = (SiteDescriptorArtifactMetadata) metadata; +-- +1.7.5.4 + diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec index c6a48c9..c934763 100644 --- a/maven-site-plugin.spec +++ b/maven-site-plugin.spec @@ -1,18 +1,20 @@ Name: maven-site-plugin Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven Site Plugin
Group: Development/Libraries License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-site-plugin/ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%%7Bname%7D/%%7Bversi... -Patch0: add-servlet-dep.patch +Patch0: 0001-Pom-dependencies-fix.patch +Patch1: 0002-Maven-3-compatibility-functions.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0 BuildRequires: maven +BuildRequires: maven-artifact-manager BuildRequires: maven-plugin-plugin BuildRequires: maven-assembly-plugin BuildRequires: plexus-maven-plugin @@ -24,16 +26,35 @@ BuildRequires: maven-resources-plugin BuildRequires: maven-doxia BuildRequires: maven-doxia-sitetools BuildRequires: maven-doxia-tools +BuildRequires: maven-project BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit BuildRequires: maven-plugin-testing-harness BuildRequires: maven-plugin-cobertura +BuildRequires: maven-wagon BuildRequires: jetty +BuildRequires: servlet25 +BuildRequires: plexus-archiver +BuildRequires: plexus-containers-container-default +BuildRequires: plexus-i18n +BuildRequires: plexus-velocity +BuildRequires: plexus-utils + Requires: maven Requires: jetty Requires: java Requires: jpackage-utils +Requires: maven-artifact-manager Requires: maven-doxia-tools +Requires: maven-project +Requires: maven-shared-reporting-api +Requires: maven-wagon +Requires: servlet25 +Requires: plexus-archiver +Requires: plexus-containers-container-default +Requires: plexus-i18n +Requires: plexus-velocity +Requires: plexus-utils Requires(post): jpackage-utils Requires(postun): jpackage-utils
@@ -52,8 +73,9 @@ Requires: jpackage-utils API documentation for %{name}.
%prep -%setup -q -%patch0 +%setup -q +%patch0 -p1 +%patch1 -p1
%build mvn-rpmbuild \ @@ -76,23 +98,19 @@ install -pm 644 pom.xml \ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files -%defattr(-,root,root,-) %{_javadir}/* %{_mavenpomdir}/* %{_mavendepmapfragdir}/*
%files javadoc -%defattr(-,root,root,-) %{_javadocdir}/%{name}
%changelog +* Thu Jun 23 2011 Stanislav Ochotnicky sochotnicky@redhat.com - 2.3-2 +- Add several missing things to (Build)Requires +- Fix build for maven3-only buildroot + * Wed May 25 2011 Alexander Kurtakov akurtako@redhat.com 2.3-1 - Update to new upstream version.