[maven-javadoc-plugin] Added dep for maven-compat
by Stanislav Ochotnicky
commit c8f3e5302d7235c31f477adc5a76f7fe656d95e0
Author: Tomas Radej <tradej(a)redhat.com>
Date: Wed Dec 14 15:02:52 2011 +0100
Added dep for maven-compat
maven-javadoc-plugin-compat.patch | 16 ++++++++++++++++
maven-javadoc-plugin.spec | 7 ++++++-
2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/maven-javadoc-plugin-compat.patch b/maven-javadoc-plugin-compat.patch
new file mode 100644
index 0000000..f4da1e6
--- /dev/null
+++ b/maven-javadoc-plugin-compat.patch
@@ -0,0 +1,16 @@
+diff --git a/pom.xml b/pom.xml
+index b0620ba..7e065aa 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -67,6 +67,11 @@ under the License.
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>${mavenVersion}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index ee16120..cca2e57 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -2,7 +2,7 @@
Name: maven-javadoc-plugin
Version: 2.8
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Maven Javadoc Plugin
Group: Development/Libraries
@@ -12,6 +12,7 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%
Patch0: remove-test-deps.patch
Patch1: pom.patch
Patch2: reduce-exceptions.patch
+Patch3: %{name}-compat.patch
BuildRequires: maven
BuildRequires: maven-clean-plugin
@@ -62,6 +63,7 @@ API documentation for %{name}.
# Update source for use with newer doxia
%patch1
%patch2
+%patch3 -p1
sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.sink.render|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
@@ -107,6 +109,9 @@ rm -rf target/site/api*
%endif
%changelog
+* Wed Dec 14 2011 Tomas Radej <tradej(a)redhat.com> - 2.8-4
+- Added maven-compat dep to pom.xml
+
* Mon Dec 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.8-3
- Add BR on modello.
12 years, 5 months
[apache-commons-dbutils] Update to latest upstream version.
by Alexander Kurtakov
commit a6959198ba4b76af63a2e6567c0726706ac0bcac
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Wed Dec 14 13:01:26 2011 +0200
Update to latest upstream version.
.gitignore | 1 +
apache-commons-dbutils.spec | 19 +++++++------------
sources | 2 +-
3 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4dcbe00..f225702 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/commons-dbutils-1.3-src.tar.gz
+commons-dbutils-1.4-src.tar.gz
diff --git a/apache-commons-dbutils.spec b/apache-commons-dbutils.spec
index 26ab47e..7bdfacf 100644
--- a/apache-commons-dbutils.spec
+++ b/apache-commons-dbutils.spec
@@ -2,8 +2,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.3
-Release: 2%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Summary: Apache Commons DbUtils Package
Group: Development/Libraries
License: ASL 2.0
@@ -16,8 +16,6 @@ BuildRequires: jpackage-utils
BuildRequires: apache-commons-parent
Requires: java >= 1:1.6.0
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
%description
DbUtils is a small set of classes designed to make working with JDBC easier.
@@ -39,7 +37,7 @@ This package contains the API documentation for %{name}.
sed -i 's/\r//' *.txt
%build
-mvn-rpmbuild install javadoc:aggregate
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
%install
# jars
@@ -50,18 +48,12 @@ ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# poms
install -d -m 0755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap commons-dbutils %{short_name} %{version} JPP %{short_name}
+%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%doc LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
%{_javadir}/*
@@ -73,6 +65,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Dec 14 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.4-1
+- Update to latest upstream version.
+
* Thu May 12 2011 Chris Spike <spike(a)fedoraproject.org> 1.3-2
- Removed defattr macros
- Fixed groupId
diff --git a/sources b/sources
index d0e8d69..f98558e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d579f5c0394ec1c9b191663c3fec0e0 commons-dbutils-1.3-src.tar.gz
+8a148ec373278f71aabed563c1311b0d commons-dbutils-1.4-src.tar.gz
12 years, 5 months