[maven-javadoc-plugin/f19] Update to latest upstream, fixes rhbz #979577, works around CVE-2013-1571
by Mat Booth
commit 58836e6153d200dac0a621e2d1a9afeb01f0a86e
Author: Mat Booth <fedora(a)matbooth.co.uk>
Date: Sun Jun 30 16:26:51 2013 +0100
Update to latest upstream, fixes rhbz #979577, works around CVE-2013-1571
- Remove dep on jakarta-commons-httpclient
.gitignore | 1 +
maven-javadoc-plugin.spec | 12 ++++++++----
sources | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7b53797..3ca253c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ maven-javadoc-plugin-2.7.tar.xz
/maven-javadoc-plugin-2.8-source-release.zip
maven-javadoc-plugin-2.8.1-source-release.zip
/maven-javadoc-plugin-2.9-source-release.zip
+/maven-javadoc-plugin-2.9.1-source-release.zip
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index d3333dd..8c0a501 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -1,8 +1,8 @@
%global bootstrap 0
Name: maven-javadoc-plugin
-Version: 2.9
-Release: 6%{?dist}
+Version: 2.9.1
+Release: 1%{?dist}
Summary: Maven Javadoc Plugin
Group: Development/Libraries
@@ -15,7 +15,7 @@ BuildRequires: java-devel >= 1:1.7.0
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang
BuildRequires: apache-commons-logging
-BuildRequires: jakarta-commons-httpclient
+BuildRequires: httpcomponents-client
BuildRequires: log4j
BuildRequires: maven-local
BuildRequires: maven-archiver
@@ -56,7 +56,7 @@ Requires: java
Requires: apache-commons-io
Requires: apache-commons-lang
Requires: apache-commons-logging
-Requires: jakarta-commons-httpclient
+Requires: httpcomponents-client
Requires: log4j
Requires: maven
Requires: maven-archiver
@@ -156,6 +156,10 @@ rm -rf target/site/api*
%endif
%changelog
+* Sun Jun 30 2013 Mat Booth <fedora(a)matbooth.co.uk> - 2.9.1-1
+- Update to latest upstream, fixes rhbz #979577, works around CVE-2013-1571
+- Remove dep on jakarta-commons-httpclient
+
* Wed Apr 10 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.9-6
- Remove test dependencies from POM
diff --git a/sources b/sources
index b963d76..f1ebf85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b0362a03ab6a71c58afffbb08027160 maven-javadoc-plugin-2.9-source-release.zip
+9052e3b44ef54b7ec1a75919f6578eda maven-javadoc-plugin-2.9.1-source-release.zip
10 years, 10 months
[portals-pom] switch to XMvn and pom macros , minor changes to adapt to current guideline
by gil
commit d98751f2a0c359560f161747b90de94f75930395
Author: gil <puntogil(a)libero.it>
Date: Sat Jun 29 17:13:14 2013 +0200
switch to XMvn and pom macros , minor changes to adapt to current guideline
portals-pom.spec | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
---
diff --git a/portals-pom.spec b/portals-pom.spec
index d40b4f5..a18a36e 100644
--- a/portals-pom.spec
+++ b/portals-pom.spec
@@ -1,24 +1,15 @@
-
Name: portals-pom
Version: 1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Apache Portals parent pom
-Group: Development/Libraries
License: ASL 2.0
Url: http://portals.apache.org/
# svn export http://svn.apache.org/repos/asf/portals/portals-pom/tags/portals-pom-1.3
# tar czf portals-pom-1.3-src-svn.tar.gz portals-pom-1.3
-Source0: portals-pom-1.3-src-svn.tar.gz
-# remove org.codehaus.mojo ianal-maven-plugin
-Patch0: portals-pom-1.3-pom.patch
+Source0: %{name}-%{version}-src-svn.tar.gz
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
BuildRequires: maven-local
BuildRequires: maven-install-plugin
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -31,8 +22,9 @@ company-affiliated experts), who use the Internet to communicate, plan,
and develop Portal software and related documentation.
%prep
-%setup -q -n portals-pom-%{version}
-%patch0 -p0
+%setup -q
+
+%pom_remove_plugin :ianal-maven-plugin
for d in LICENSE NOTICE ; do
iconv -f iso8859-1 -t utf-8 $d > $d.conv && mv -f $d.conv $d
@@ -41,20 +33,18 @@ done
%build
-mvn-rpmbuild install
+%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
-
-%files
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc LICENSE NOTICE
%changelog
+* Sat Jun 29 2013 gil cattaneo <puntogil(a)libero.it> 1.3-6
+- switch to XMvn and pom macros , minor changes to adapt to current guideline
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
10 years, 10 months
[znerd-oss-parent] switch to XMvn, minor changes to adapt to current guideline
by gil
commit 1c504fa038cf140251d105a3086f4d3a86f915db
Author: gil <puntogil(a)libero.it>
Date: Sat Jun 29 16:52:25 2013 +0200
switch to XMvn, minor changes to adapt to current guideline
.gitignore | 1 +
sources | 2 +-
znerd-oss-parent.spec | 31 ++++++++++---------------------
3 files changed, 12 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 494def3..622c1a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/znerd-oss-parent-3-src-git.tar.xz
+/znerd-oss-parent-3.tar.gz
diff --git a/sources b/sources
index 873513b..f13bf90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e45d454825f090d08b7e7af3a8d2e1b3 znerd-oss-parent-3-src-git.tar.xz
+aefb49fcc0bba8b48aa14cc20abfc204 znerd-oss-parent-3.tar.gz
diff --git a/znerd-oss-parent.spec b/znerd-oss-parent.spec
index f155d99..cabaa95 100644
--- a/znerd-oss-parent.spec
+++ b/znerd-oss-parent.spec
@@ -1,49 +1,38 @@
Name: znerd-oss-parent
Version: 3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Znerd.org OSS Parent
-Group: Development/Libraries
License: BSD
URL: https://github.com/znerd/znerd-oss-parent
-# git clone git://github.com/znerd/znerd-oss-parent.git znerd-oss-parent-3
-# (cd znerd-oss-parent-3/ && git archive --format=tar --prefix=znerd-oss-parent-3/ znerd-oss-parent-3 | xz > ../znerd-oss-parent-3-src-git.tar.xz)
-Source0: %{name}-%{version}-src-git.tar.xz
+Source0: https://github.com/znerd/%{name}/archive/%{name}-%{version}.tar.gz
BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
BuildRequires: maven-local
BuildRequires: maven-enforcer-plugin
# required by enforcer-plugin
BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
-
-Requires: jpackage-utils
BuildArch: noarch
%description
Parent for znerd.org OSS Projects.
%prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
%build
-# Nothing to do
-%install
+%mvn_build
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom
-%add_maven_depmap JPP.%{name}-parent.pom
-
-%check
-mvn-rpmbuild verify
+%install
+%mvn_install
-%files
-%{_mavenpomdir}/JPP.%{name}-parent.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc CHANGES.txt COPYRIGHT.txt README.txt
%changelog
+* Sat Jun 29 2013 gil cattaneo <puntogil(a)libero.it> 3-6
+- switch to XMvn, minor changes to adapt to current guideline
+
* Tue Feb 19 2013 gil cattaneo <puntogil(a)libero.it> 3-5
- added maven-common-artifact-filters and maven-shared-components as BR
10 years, 10 months