[tomcat/f16] Updated to 7.0.20
by Ivan Afonichev
Summary of changes:
f0cf232... Updated to 7.0.20 (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 8 months
[tomcat] Updated to 7.0.20
by Ivan Afonichev
commit f0cf232913a363c0cae6767a060f2546f9109406
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Mon Aug 15 21:27:41 2011 +0400
Updated to 7.0.20
sources | 2 +-
tomcat.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index c48745b..8b3f4ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ff875b37e463b481b8e5c30b9368ac1 apache-tomcat-7.0.19-src.tar.gz
+bb13b2910cc71c29e571ea062ad6ab3a apache-tomcat-7.0.20-src.tar.gz
diff --git a/tomcat.spec b/tomcat.spec
index 588f9eb..35f3545 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
%global jspspec 2.2
%global major_version 7
%global minor_version 0
-%global micro_version 19
+%global micro_version 20
%global packdname apache-tomcat-%{version}-src
%global servletspec 3.0
%global elspec 2.2
@@ -565,6 +565,9 @@ fi
%{appdir}/sample
%changelog
+* Mon Aug 15 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.20-1
+- Updated to 7.0.20
+
* Tue Jul 26 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.19-1
- Updated to 7.0.19
12 years, 8 months
[plexus-resources] Remove jpackage-utils post/postun requirement
by Stanislav Ochotnicky
commit a2a0134645d487107caa7c75fb316ac94037a39d
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Aug 15 13:57:18 2011 +0200
Remove jpackage-utils post/postun requirement
plexus-resources.spec | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/plexus-resources.spec b/plexus-resources.spec
index 03f5490..f737f5a 100644
--- a/plexus-resources.spec
+++ b/plexus-resources.spec
@@ -46,8 +46,6 @@ Requires: classworlds >= 0:1.1
Requires: plexus-container-default
Requires: plexus-utils
Requires: jpackage-utils >= 0:1.7.3
-Requires(post): jpackage-utils >= 0:1.7.3
-Requires(postun): jpackage-utils >= 0:1.7.3
BuildRequires: jpackage-utils >= 0:1.7.3
BuildRequires: java-devel >= 0:1.5.0
BuildRequires: ant >= 0:1.6
12 years, 8 months
[plexus-resources] plexus-maven-plugin removed (not needed)
by Stanislav Ochotnicky
commit dcc4757ca924762c40fd03ada4aa139ea552a9f3
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Wed Jul 27 15:35:57 2011 +0200
plexus-maven-plugin removed (not needed)
plexus-resources.spec | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/plexus-resources.spec b/plexus-resources.spec
index 0cff732..03f5490 100644
--- a/plexus-resources.spec
+++ b/plexus-resources.spec
@@ -34,7 +34,7 @@
Name: %{parent}-%{subname}
Version: 1.0
-Release: 0.5.a7%{?dist}
+Release: 0.6.a7%{?dist}
Summary: Plexus Resource Manager
License: MIT
Group: Development/Tools
@@ -62,7 +62,6 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
-BuildRequires: plexus-maven-plugin >= 1.3.5
BuildRequires: plexus-container-default
BuildRequires: plexus-utils
@@ -108,12 +107,6 @@ install -pm 644 pom.xml \
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%{_javadir}/%{parent}/*
%{_mavenpomdir}/*
@@ -123,6 +116,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Wed Jul 27 2011 Jaromir Capik <jcapik(a)redhat.com> - 1.0-0.6.a7
+- Removal of plexus-maven-plugin dependency (not needed)
+- Minor spec file changes according to the latest guidelines
+
* Sun Jun 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-0.5.a7
- Build with maven 3.x
12 years, 8 months
[maven-site-plugin] Add shade plugin and junit4 provider BR
by Stanislav Ochotnicky
commit afea765d3872f4cc88515f92d461fa75a68c9226
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Aug 15 11:17:22 2011 +0200
Add shade plugin and junit4 provider BR
also set source encoding to UTF8 to fix javadoc build
0001-Set-source-encoding-property-to-UTF8.patch | 24 +++++++++++++++++++++++
maven-site-plugin.spec | 5 ++++
2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/0001-Set-source-encoding-property-to-UTF8.patch b/0001-Set-source-encoding-property-to-UTF8.patch
new file mode 100644
index 0000000..ae5e0db
--- /dev/null
+++ b/0001-Set-source-encoding-property-to-UTF8.patch
@@ -0,0 +1,24 @@
+From f1bb969252d2b85d54ab138e57d56d3b960429a9 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 15 Aug 2011 11:10:57 +0200
+Subject: [PATCH] Set source encoding property to UTF8
+
+---
+ pom.xml | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index f73ad8a..8052e1c 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -194,6 +194,7 @@ under the License.
+ <javadocPluginVersion>2.6.1</javadocPluginVersion>
+ <projectInfoReportsPluginVersion>2.2</projectInfoReportsPluginVersion>
+ <checkstylePluginVersion>2.5</checkstylePluginVersion>
++ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+--
+1.7.6
+
diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec
index 966b008..78376e2 100644
--- a/maven-site-plugin.spec
+++ b/maven-site-plugin.spec
@@ -8,6 +8,8 @@ License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-site-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
+Patch0: 0001-Set-source-encoding-property-to-UTF8.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -26,6 +28,8 @@ BuildRequires: maven-doxia-tools
BuildRequires: maven-project
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-shade-plugin
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-wagon
@@ -74,6 +78,7 @@ API documentation for %{name}.
%prep
%setup -q
+%patch0 -p1
%build
mvn-rpmbuild \
12 years, 8 months