[maven-site-plugin] BR/R servlet 3.
by Alexander Kurtakov
commit b13521e4bd7e450832fcfdd6ddfcdef229c70755
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Apr 18 01:47:12 2012 +0300
BR/R servlet 3.
maven-site-plugin.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec
index 7e5af3f..8dcc780 100644
--- a/maven-site-plugin.spec
+++ b/maven-site-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-site-plugin
Version: 3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Maven Site Plugin
Group: Development/Libraries
@@ -37,7 +37,7 @@ BuildRequires: maven-wagon
BuildRequires: maven-reporting-exec
BuildRequires: plexus-containers-component-metadata
BuildRequires: jetty >= 8.1.0-0.1.rc5
-BuildRequires: servlet25
+BuildRequires: servlet3
BuildRequires: plexus-archiver
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-i18n
@@ -55,7 +55,7 @@ Requires: maven-project
Requires: maven-shared-reporting-api
Requires: maven-wagon
Requires: maven-reporting-exec
-Requires: servlet25
+Requires: servlet3
Requires: plexus-archiver
Requires: plexus-containers-container-default
Requires: plexus-i18n
@@ -115,6 +115,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Wed Apr 18 2012 Alexander Kurtakov <akurtako(a)redhat.com> 3.0-5
+- BR/R servlet 3.
+
* Thu Jan 26 2012 Alexander Kurtakov <akurtako(a)redhat.com> 3.0-4
- Add BR/R on jetty-parent.
12 years, 1 month
[apache-commons-configuration] Update to current guidelines.
by Alexander Kurtakov
commit cef07ae90144fcd14d0803dc1437a2112d29974e
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Apr 18 01:36:58 2012 +0300
Update to current guidelines.
- Move to servlet 3.
0002-Remove-test-deps.patch | 64 -------------------------------
apache-commons-configuration-depmap.xml | 26 ------------
apache-commons-configuration.spec | 55 ++++++++++-----------------
3 files changed, 20 insertions(+), 125 deletions(-)
---
diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec
index 6888505..f838818 100644
--- a/apache-commons-configuration.spec
+++ b/apache-commons-configuration.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.6
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Commons Configuration Package
Group: Development/Libraries
@@ -12,23 +12,22 @@ License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
Patch0: 0001-Change-ant-groupId-to-org.apache.ant.patch
-Patch1: 0002-Remove-test-deps.patch
BuildArch: noarch
BuildRequires: java-devel
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-idea-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
BuildRequires: maven
BuildRequires: xalan-j2
@@ -38,33 +37,29 @@ BuildRequires: apache-commons-beanutils >= 0:1.7.0
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-lang
BuildRequires: apache-commons-logging
-# convert to apache-commons when transition is done
BuildRequires: apache-commons-collections
-BuildRequires: jakarta-commons-dbcp
+BuildRequires: apache-commons-dbcp
BuildRequires: apache-commons-digester
BuildRequires: apache-commons-jxpath
-BuildRequires: jakarta-commons-pool
-BuildRequires: servlet25
-BuildRequires: tomcat6
+BuildRequires: apache-commons-pool
+BuildRequires: tomcat-servlet-3.0-api
-Requires: servlet25
+Requires: tomcat-servlet-3.0-api
Requires: apache-commons-beanutils >= 0:1.7.0
Requires: apache-commons-codec
Requires: apache-commons-jxpath
Requires: apache-commons-lang
Requires: apache-commons-logging
Requires: apache-commons-collections
-Requires: jakarta-commons-dbcp
+Requires: apache-commons-dbcp
Requires: apache-commons-digester
-Requires: jakarta-commons-pool
+Requires: apache-commons-pool
Requires: xerces-j2
Requires: xml-commons-apis
Requires(post): jpackage-utils >= 1.7.2
Requires(postun): jpackage-utils >= 1.7.2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} < 0:%{version}-%{release}
@@ -96,7 +91,6 @@ Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
-%patch1 -p1
%{__sed} -i 's/\r//' LICENSE.txt
%build
@@ -124,31 +118,22 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
# should use proper groupid org.apache.commons and also artifactid
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%{_mavendepmapfragdir}/*
%{_mavenpomdir}/JPP-%{short_name}.pom
%doc LICENSE.txt
%{_javadir}/*.jar
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Apr 18 2012 Alexander Kurtakov <akurtako(a)redhat.com> 1.6-7
+- Update to current guidelines.
+- Move to servlet 3.
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 1 month