[tomcat] - Updated to 7.0.27 - Fixed jakarta-taglibs-standard BR and R
by Ivan Afonichev
commit 41331728601e4e12dcdf959ceb279048a75a8675
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Sun Apr 8 00:39:19 2012 +0400
- Updated to 7.0.27
- Fixed jakarta-taglibs-standard BR and R
sources | 2 +-
tomcat.spec | 15 ++++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/sources b/sources
index e2b3db7..69a44df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb8e7192b02b6031be6fc23afea2431f apache-tomcat-7.0.26-src.tar.gz
+a7fa41d09ccc1dc324c35fdebebd2afe apache-tomcat-7.0.27-src.tar.gz
diff --git a/tomcat.spec b/tomcat.spec
index 2b3a950..413c213 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 26
+%global micro_version 27
%global packdname apache-tomcat-%{version}-src
%global servletspec 3.0
%global elspec 2.2
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -85,8 +85,6 @@ Source20: %{name}-%{major_version}.%{minor_version}-jsvc.service
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
-#https://issues.apache.org/bugzilla/show_bug.cgi?id=52493
-Patch2: add_parent_logger_getter.patch
BuildArch: noarch
@@ -98,7 +96,7 @@ BuildRequires: apache-commons-collections
BuildRequires: apache-commons-daemon
BuildRequires: apache-commons-dbcp
BuildRequires: apache-commons-pool
-BuildRequires: jakarta-taglibs-standard >= 0:1.1.2-4
+BuildRequires: jakarta-taglibs-standard
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.7.0
BuildRequires: junit
@@ -227,7 +225,7 @@ Expression Language 1.0.
Group: Applications/Internet
Summary: The ROOT and examples web applications for Apache Tomcat
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: jakarta-taglibs-standard >= 0:1.1.2-4
+Requires: jakarta-taglibs-standard >= 0:1.1
%description webapps
The ROOT and examples web applications for Apache Tomcat.
@@ -240,7 +238,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch0 -p0
%patch1 -p0
-%patch2 -p0
%{__ln_s} $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar
%{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar
@@ -662,6 +659,10 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Wed Apr 7 2012 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.27-1
+- Updated to 7.0.27
+- Fixed jakarta-taglibs-standard BR and R
+
* Wed Mar 21 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:7.0.26-2
- Add more depmaps to J2EE apis to help jetty/glassfish updates
12 years
[tomcat/f17] (2 commits) ...Merge pom changes
by Ivan Afonichev
Summary of changes:
9077401... Add POM files for tomcat-api and tomcat-util (#803495) (*)
d0ed2d7... Merge pom changes (*)
(*) This commit already existed in another branch; no separate mail sent
12 years
[tomcat: 2/2] Merge pom changes
by Ivan Afonichev
commit d0ed2d74c2c06238e08b8f96524b82d090bc26d7
Merge: 9077401 37c11cf
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Sat Apr 7 02:12:32 2012 +0400
Merge pom changes
tomcat.spec | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
---
diff --cc tomcat.spec
index 039892b,4244d71..2b3a950
--- a/tomcat.spec
+++ b/tomcat.spec
@@@ -661,9 -649,9 +662,12 @@@ f
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+ * Wed Mar 21 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:7.0.26-2
+ - Add more depmaps to J2EE apis to help jetty/glassfish updates
+
+* Wed Mar 14 2012 Juan Hernandez <juan.hernandez(a)redhat.com> 0:7.0.26-2
+- Added the POM files for tomcat-api and tomcat-util (#803495)
+
* Wed Feb 22 2012 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.26-1
- Updated to 7.0.26
- Bug 790334: Change ownership of logdir for logrotate
12 years
[tomcat: 1/2] Add POM files for tomcat-api and tomcat-util (#803495)
by Ivan Afonichev
commit 907740188d5bea74c49c9b7c3ea50eec07af95da
Author: Juan Hernandez <juan.hernandez(a)redhat.com>
Date: Wed Mar 14 21:16:59 2012 +0100
Add POM files for tomcat-api and tomcat-util (#803495)
Signed-off-by: Ivan Afonichev <ivan.afonichev(a)gmail.com>
tomcat.spec | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 3ce683e..039892b 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -464,6 +464,12 @@ done
%{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
%add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar
+%{__cp} -a tomcat-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
+%add_maven_depmap JPP.%{name}-tomcat-api.pom %{name}/tomcat-api.jar
+
+%{__cp} -a tomcat-util.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
+%add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.jar
+
# replace temporary copy with link
%{__ln_s} -f %{bindir}/tomcat-juli.jar ${RPM_BUILD_ROOT}%{libdir}/
@@ -607,9 +613,16 @@ fi
%{libdir}
%{bindir}/tomcat-juli.jar
%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/*.pom
-# Exclude the POMs that are in sub-packages
-%exclude %{_mavenpomdir}/JPP-*api*.pom
+%{_mavenpomdir}/JPP.%{name}-annotations-api.pom
+%{_mavenpomdir}/JPP.%{name}-catalina-ha.pom
+%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
+%{_mavenpomdir}/JPP.%{name}-catalina.pom
+%{_mavenpomdir}/JPP.%{name}-jasper-el.pom
+%{_mavenpomdir}/JPP.%{name}-jasper.pom
+%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
+%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
+%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
+
%exclude %{libdir}/%{name}-el-%{elspec}-api.jar
%files servlet-%{servletspec}-api
@@ -648,6 +661,9 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Wed Mar 14 2012 Juan Hernandez <juan.hernandez(a)redhat.com> 0:7.0.26-2
+- Added the POM files for tomcat-api and tomcat-util (#803495)
+
* Wed Feb 22 2012 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.26-1
- Updated to 7.0.26
- Bug 790334: Change ownership of logdir for logrotate
12 years
[maven-shade-plugin] Update to latest upstream release.
by Alexander Kurtakov
commit 17c6425fea134be0e42f1bf79413780727af46c9
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Apr 6 14:42:15 2012 +0300
Update to latest upstream release.
.gitignore | 1 +
maven-shade-plugin.spec | 12 ++++++------
sources | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e213d1..476b562 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ maven-shade-plugin-1.3.3.tar.xz
/maven-shade-plugin-1.4.tar.xz
/maven-shade-plugin-1.4-source-release.zip
maven-shade-plugin-1.5-source-release.zip
+maven-shade-plugin-1.6-source-release.zip
diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec
index 75b09ff..ba6156f 100644
--- a/maven-shade-plugin.spec
+++ b/maven-shade-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-shade-plugin
-Version: 1.5
-Release: 4%{?dist}
+Version: 1.6
+Release: 1%{?dist}
Summary: This plugin provides the capability to package the artifact in an uber-jar
Group: Development/Libraries
@@ -8,8 +8,6 @@ License: ASL 2.0
URL: http://maven.apache.org/plugins/%{name}
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
-Patch0: %{name}-migration-to-component-metadata.patch
-
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -31,6 +29,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-testing-harness
BuildRequires: jdependency >= 0.6
+BuildRequires: xmlunit
Requires: ant
Requires: maven
Requires: jpackage-utils
@@ -57,8 +56,6 @@ Requires: jpackage-utils
%prep
%setup -q
-%patch0 -p1
-
rm src/test/jars/plexus-utils-1.4.1.jar
ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
@@ -90,6 +87,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%doc LICENSE
%changelog
+* Fri Apr 6 2012 Alexander Kurtakov <akurtako(a)redhat.com> 1.6-1
+- Update to latest upstream release.
+
* Mon Mar 05 2012 Jaromir Capik <jcapik(a)redhat.com> - 1.5-4
- Migration to plexus-containers-component-metadata
diff --git a/sources b/sources
index 2356972..93031c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cb42d96fede5f9cf97902c87fd03dd4 maven-shade-plugin-1.5-source-release.zip
+ab41625037442638fbdbb88449b17a66 maven-shade-plugin-1.6-source-release.zip
12 years