[ehcache-core] use servlet api 3.1
by gil
commit b6c1ce61c9f09a6b65fc8a381bbca03cb5f78cd9
Author: gil <puntogil(a)libero.it>
Date: Wed Mar 4 11:05:24 2015 +0100
use servlet api 3.1
ehcache-core.spec | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/ehcache-core.spec b/ehcache-core.spec
index 80e8624..c7953c7 100644
--- a/ehcache-core.spec
+++ b/ehcache-core.spec
@@ -1,6 +1,6 @@
Name: ehcache-core
Version: 2.6.7
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Easy Hibernate Cache
License: ASL 2.0
URL: http://ehcache.org/
@@ -13,12 +13,12 @@ URL: http://ehcache.org/
Source0: %{name}-%{version}-clean-src-svn.tar.gz
Patch0: %{name}-2.6.7-java8.patch
-BuildRequires: ehcache-parent
-BuildRequires: geronimo-jta
-BuildRequires: hibernate3 >= 3.6.10-7
-BuildRequires: ehcache-sizeof-agent
-BuildRequires: slf4j
-BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: mvn(javax.servlet:javax.servlet-api)
+BuildRequires: mvn(javax.transaction:jta)
+BuildRequires: mvn(net.sf.ehcache:ehcache-parent:pom:)
+BuildRequires: mvn(net.sf.ehcache:sizeof-agent)
+BuildRequires: mvn(org.hibernate:hibernate-core:3)
+BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-jdk14)
# test
@@ -38,16 +38,11 @@ BuildRequires: xsom
%endif
BuildRequires: maven-local
-BuildRequires: maven-source-plugin
BuildRequires: rmic-maven-plugin
BuildRequires: xml-maven-plugin
BuildRequires: plexus-resources
-Requires: ehcache-sizeof-agent
-Requires: geronimo-jta
Requires: hibernate3 >= 3.6.10-7
-Requires: slf4j
-Requires: tomcat-servlet-3.0-api
BuildArch: noarch
@@ -67,6 +62,7 @@ This package contains javadoc for %{name}.
%pom_remove_plugin org.codehaus.gmaven:gmaven-plugin
%pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
%pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
+%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
# don't generate source archive
%pom_remove_plugin org.apache.maven.plugins:maven-assembly-plugin
@@ -75,6 +71,9 @@ This package contains javadoc for %{name}.
%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId = 'org.hibernate']/pom:version"
%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId = 'org.hibernate']" "<version>3</version>"
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'javax.servlet']/pom:version" 3.1.0
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'javax.servlet']/pom:artifactId" javax.servlet-api
+
# Don't use buildnumber-plugin, because jna is required (and currently broken)
%pom_xpath_remove "pom:profiles/pom:profile[pom:id = 'buildnumber-git']"
@@ -84,6 +83,8 @@ This package contains javadoc for %{name}.
%pom_remove_dep net.sf.hibernate:hibernate
%pom_xpath_remove "pom:dependencies/pom:dependency[pom:scope = 'test']"
+%pom_xpath_remove "pom:dependencies/pom:dependency/pom:scope"
+
# disable embedded ehcache-sizeof-agent.jar copy
%pom_remove_plugin :maven-dependency-plugin
@@ -93,7 +94,7 @@ This package contains javadoc for %{name}.
%build
# tests skipped. cause: missing dependencies
-%mvn_build -f -- -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/tomcat-tomcat-servlet-api"
+%mvn_build -f
%install
%mvn_install
@@ -105,6 +106,9 @@ This package contains javadoc for %{name}.
%license src/assemble/EHCACHE-CORE-LICENSE.txt
%changelog
+* Wed Mar 04 2015 gil cattaneo <puntogil(a)libero.it> 2.6.7-7
+- use servlet api 3.1
+
* Sun Feb 01 2015 gil cattaneo <puntogil(a)libero.it> 2.6.7-6
- introduce license macro
9 years, 1 month
[cas-client] use servlet api 3.1
by gil
commit d5467102fe1b494cf2655c08622530ed77beb491
Author: gil <puntogil(a)libero.it>
Date: Wed Mar 4 10:42:45 2015 +0100
use servlet api 3.1
cas-client.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/cas-client.spec b/cas-client.spec
index 864e74a..0c89344 100644
--- a/cas-client.spec
+++ b/cas-client.spec
@@ -1,6 +1,6 @@
Name: cas-client
Version: 3.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Jasig CAS Client for Java
License: ASL 2.0 and BSD
Url: http://www.jasig.org/cas
9 years, 1 month
[cas-client] disable tomcat7 module and opensalm support
by gil
commit 82e1902f846a2d66f39ad095517a1ab00d522582
Author: gil <puntogil(a)libero.it>
Date: Wed Mar 4 10:42:06 2015 +0100
disable tomcat7 module and opensalm support
cas-client.spec | 83 +++++++++++++++++++++++----------------------------------
1 file changed, 34 insertions(+), 49 deletions(-)
---
diff --git a/cas-client.spec b/cas-client.spec
index dced42f..864e74a 100644
--- a/cas-client.spec
+++ b/cas-client.spec
@@ -10,42 +10,28 @@ Source0: https://github.com/Jasig/java-%{name}/archive/%{name}-%{version}.
Source1: %{name}-LICENSE.txt
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0: %{name}-3.3.3-integration-tomcat-v7-unreported-exception.patch
-
-BuildRequires: apache-commons-codec
-BuildRequires: ehcache-core
-BuildRequires: joda-time
-BuildRequires: opensaml-java
-BuildRequires: opensaml-java-openws
-BuildRequires: opensaml-java-parent
-BuildRequires: opensaml-java-xmltooling
-BuildRequires: springframework-beans
-BuildRequires: spymemcached
-BuildRequires: tomcat-lib
-BuildRequires: tomcat-servlet-3.0-api
-BuildRequires: xml-security
+BuildRequires: mvn(commons-codec:commons-codec)
+BuildRequires: mvn(commons-lang:commons-lang)
+BuildRequires: mvn(javax.servlet:javax.servlet-api)
+BuildRequires: mvn(joda-time:joda-time)
+BuildRequires: mvn(net.sf.ehcache:ehcache-core)
+BuildRequires: mvn(net.spy:spymemcached)
+BuildRequires: mvn(org.apache.santuario:xmlsec)
+BuildRequires: mvn(org.springframework:spring-beans)
# test deps
-BuildRequires: apache-commons-logging
-BuildRequires: junit
-%if %{fedora} > 20
-BuildRequires: log4j12
+BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(log4j:log4j:1.2.17)
BuildRequires: mvn(org.slf4j:jcl-over-slf4j)
+BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-nop)
BuildRequires: mvn(org.slf4j:slf4j-simple)
-%else
-BuildRequires: log4j
-%endif
-BuildRequires: slf4j
-# org.springframework:spring-test
-BuildRequires: springframework
-BuildRequires: springframework-context
+BuildRequires: mvn(org.springframework:spring-core)
+BuildRequires: mvn(org.springframework:spring-context)
+BuildRequires: mvn(org.springframework:spring-test)
BuildRequires: maven-local
-BuildRequires: maven-source-plugin
-
-Requires: springframework-beans
-Requires: tomcat-servlet-3.0-api
BuildArch: noarch
@@ -62,8 +48,6 @@ This package contains javadoc for %{name}.
%prep
%setup -q -n java-%{name}-%{name}-%{version}
-%patch0 -p0
-
find . -name "*.class" -delete
find . -name "*.jar" -delete
%pom_remove_parent
@@ -80,29 +64,26 @@ find . -name "*.jar" -delete
# require org.jboss.jbossas jboss-as-tomcat 5.1.0.GA
%pom_disable_module cas-client-integration-jboss
%pom_disable_module cas-client-integration-tomcat-v6
-
-%pom_remove_dep javax.servlet:javax.servlet-api
-%pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided
+%pom_disable_module cas-client-integration-tomcat-v7
%pom_remove_dep xml-security:xmlsec cas-client-core
%pom_add_dep org.apache.santuario:xmlsec::runtime cas-client-core
%pom_add_dep org.slf4j:slf4j-nop::test cas-client-support-distributed-ehcache
-sed -i.log4j12 "s|<version>1.2.15|<version>1.2.17|" cas-client-core/pom.xml
-
-%pom_remove_dep org.springframework:spring-test cas-client-core
-rm -r cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutHandlerTests.java \
- cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutFilterTests.java \
- cas-client-core/src/test/java/org/jasig/cas/client/authentication/DefaultAuthenticationRedirectStrategyTests.java \
- cas-client-core/src/test/java/org/jasig/cas/client/authentication/FacesCompatibleAuthenticationRedirectStrategyTests.java \
- cas-client-core/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidationFilterTests.java \
- cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas10TicketValidationFilterTests.java \
- cas-client-core/src/test/java/org/jasig/cas/client/util/CasFilterTests.java \
- cas-client-core/src/test/java/org/jasig/cas/client/util/CommonUtilsTests.java \
- cas-client-core/src/test/java/org/jasig/cas/client/authentication/AuthenticationFilterTests.java \
- cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilterTests.java \
- cas-client-core/src/test/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilterTests.java
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'log4j']/pom:version" 1.2.17 cas-client-core
+
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'javax.servlet-api']/pom:version" 3.1.0
+
+# use, also, org.opensaml:xmltooling currently is broken. see rhbz#1106661
+%pom_remove_dep org.opensaml: cas-client-core
+rm -r cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java \
+ cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java \
+ cas-client-core/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidatorTests.java \
+ cas-client-core/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidationFilterTests.java
+%pom_add_dep commons-lang:commons-lang cas-client-core
+%pom_add_dep joda-time:joda-time cas-client-core
+
# this test fails
rm -r cas-client-support-distributed-ehcache/src/test/java/EhCacheBackedProxyGrantingTicketStorageImplTests.java
rm -r cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas10TicketValidatorTests.java \
@@ -129,6 +110,10 @@ sed -i 's/\r//' LICENSE.txt LICENSE-2.0.txt
%license LICENSE.txt LICENSE-2.0.txt
%changelog
+* Wed Mar 04 2015 gil cattaneo <puntogil(a)libero.it> 3.3.3-3
+- disable tomcat7 module and opensalm support
+- use servlet api 3.1
+
* Fri Jan 30 2015 gil cattaneo <puntogil(a)libero.it> 3.3.3-2
- introduce license macro
@@ -150,4 +135,4 @@ sed -i 's/\r//' LICENSE.txt LICENSE-2.0.txt
- adapt to current guideline
* Fri Nov 16 2012 gil cattaneo <puntogil(a)libero.it> 3.2.1-1
-- initial rpm
\ No newline at end of file
+- initial rpm
9 years, 1 month
[xalan-j2] Move to Servlet 3.1.
by Alexander Kurtakov
commit 9cb2841e93852dd1b22aed3d3b5a085b7285d665
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Mar 4 09:59:07 2015 +0200
Move to Servlet 3.1.
xalan-j2.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/xalan-j2.spec b/xalan-j2.spec
index 9060564..21b0193 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -32,7 +32,7 @@
Name: xalan-j2
Version: 2.7.1
-Release: 25%{?dist}
+Release: 26%{?dist}
Epoch: 0
Summary: Java XSLT processor
# src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C
@@ -62,7 +62,7 @@ BuildRequires: bcel
BuildRequires: java_cup
BuildRequires: regexp
BuildRequires: sed
-BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: tomcat-servlet-3.1-api
BuildRequires: xerces-j2 >= 0:2.7.1
BuildRequires: xml-commons-apis >= 0:1.3
BuildRequires: xml-stylebook
@@ -102,7 +102,7 @@ Javadoc for %{name}.
%package demo
Summary: Demo for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: tomcat-servlet-3.0-api
+Requires: tomcat-servlet-3.1-api
%description demo
Demonstrations and samples for %{name}.
@@ -236,6 +236,9 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
%{_datadir}/%{name}
%changelog
+* Wed Mar 4 2015 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.7.1-26
+- Move to Servlet 3.1.
+
* Thu Feb 12 2015 Michael Simacek <msimacek(a)redhat.com> - 0:2.7.1-25
- Remove bundled JARs
- Remove unused patch
9 years, 1 month
[hsqldb1] Bump to tomcat servlet api 3.1.
by Alexander Kurtakov
commit b9de978093232694086bedf3f47202fafe0845f0
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Mar 4 09:48:43 2015 +0200
Bump to tomcat servlet api 3.1.
hsqldb1.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/hsqldb1.spec b/hsqldb1.spec
index 89e8fa3..3c5d0d7 100644
--- a/hsqldb1.spec
+++ b/hsqldb1.spec
@@ -3,7 +3,7 @@
%global majorversion 1
Name: hsqldb1
Version: 1.8.1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: HyperSQL Database Engine
License: BSD
URL: http://hsqldb.sourceforge.net/
@@ -13,9 +13,9 @@ Patch0: hsqldb-jdbc-4.1.patch
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: junit
-BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: tomcat-servlet-3.1-api
-Requires: tomcat-servlet-3.0-api
+Requires: tomcat-servlet-3.1-api
Requires: jpackage-utils
BuildArch: noarch
@@ -61,7 +61,7 @@ chmod -R go=u-w *
cp %{SOURCE1} ./pom.xml
%build
-export CLASSPATH=$(build-classpath tomcat-servlet-3.0-api junit)
+export CLASSPATH=$(build-classpath tomcat-servlet-api junit)
pushd build
ant jar javadoc
popd
@@ -89,6 +89,9 @@ cp -r doc/src/* %{buildroot}%{_javadocdir}/%{name}
%license doc/hsqldb_lic.txt
%changelog
+* Wed Mar 4 2015 Alexander Kurtakov <akurtako(a)redhat.com> 1.8.1.3-6
+- Bump to tomcat servlet api 3.1.
+
* Thu Feb 05 2015 gil cattaneo <puntogil(a)libero.it> 1.8.1.3-5
- introduce license macro
9 years, 1 month
[avalon-logkit] Bump to servlet 3.1.
by Alexander Kurtakov
commit 06fa1f82c2b9334adb4a84c3bb16f9b6e8f1efae
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Mar 4 09:23:39 2015 +0200
Bump to servlet 3.1.
avalon-logkit.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index e7dee2e..b89e89f 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -33,7 +33,7 @@
Name: avalon-%{short_name}
Version: 2.1
-Release: 17%{?dist}
+Release: 18%{?dist}
Epoch: 0
Summary: Java logging toolkit
License: ASL 2.0
@@ -46,7 +46,7 @@ Patch1: avalon-logkit-pom-deps.patch
Patch2: avalon-logkit-encoding.patch
Patch3: java7.patch
Requires: avalon-framework >= 0:4.1.4
-Requires: tomcat-servlet-3.0-api
+Requires: tomcat-servlet-3.1-api
Requires: jms
Requires: javamail
@@ -58,7 +58,7 @@ BuildRequires: log4j
BuildRequires: avalon-framework >= 0:4.1.4
# Required for converting jars to OSGi bundles
BuildRequires: aqute-bnd
-BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: tomcat-servlet-3.1-api
BuildRequires: jms
BuildArch: noarch
@@ -119,6 +119,9 @@ cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Wed Mar 4 2015 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.1-18
+- Bump to servlet 3.1.
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:2.1-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 1 month
[tomcat/f22] Drop epoch bumped el_1_0_api.
by Alexander Kurtakov
commit 739d854004d497ecbab3f00c5dbe0492a2c3f5fb
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Mar 4 08:38:43 2015 +0200
Drop epoch bumped el_1_0_api.
Having it with epoch 1 will win over all other packages potentially
providing it.
tomcat.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 90fe9e3..2a78f75 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 1
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -214,7 +214,6 @@ Apache Tomcat Servlet API implementation classes.
%package el-%{elspec}-api
Group: Development/Libraries
Summary: Expression Language v1.0 API
-Provides: el_1_0_api = %{epoch}:%{version}-%{release}
Provides: el_api = %{elspec}
Requires(post): chkconfig
Requires(postun): chkconfig
@@ -681,6 +680,9 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Wed Mar 4 2015 Alexander Kurtakov <akurtako(a)redhat.com> 1:7.0.59-3
+- Drop epoch bumped el_1_0_api. Having it with epoch 1 will win over all other packages potentially providing it.
+
* Tue Mar 03 2015 Stephen Gallagher <sgallagh(a)redhat.com> 1:7.0.59-2
- Revert to Tomcat 7.0 in Fedora 22
9 years, 1 month
[tomcat] Drop old provides.
by Alexander Kurtakov
commit a7f5683fd0bbfcb59f4c8f2ae99f9be8fdd9eee7
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Mar 4 08:33:30 2015 +0200
Drop old provides.
tomcat.spec | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 718ce94..82c11ca 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 1
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -167,8 +167,6 @@ which allows tomcat to perform some privileged operations
Group: Development/Libraries
Summary: Apache Tomcat JSP API implementation classes
Provides: jsp = %{jspspec}
-Provides: jsp22
-Provides: %{name}-jsp-2.2-api
Obsoletes: %{name}-jsp-2.2-api
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
@@ -207,7 +205,6 @@ Summary: Apache Tomcat Servlet API implementation classes
Provides: servlet = %{servletspec}
Provides: servlet6
Provides: servlet3
-Provides: %{name}-servlet-3.0-api
Obsoletes: %{name}-servlet-3.0-api
Requires(post): chkconfig
Requires(postun): chkconfig
@@ -218,9 +215,7 @@ Apache Tomcat Servlet API implementation classes.
%package el-%{elspec}-api
Group: Development/Libraries
Summary: Expression Language v%{elspec} API
-Provides: el_1_0_api = %{epoch}:%{version}-%{release}
Provides: el_api = %{elspec}
-Provides: %{name}-el-2.2-api
Obsoletes: %{name}-el-2.2-api
Requires(post): chkconfig
Requires(postun): chkconfig
@@ -683,6 +678,10 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Wed Mar 4 2015 Alexander Kurtakov <akurtako(a)redhat.com> 1:8.0.18-4
+- Fix epoch bumped el_1_0_api that would override all other glassfish/jboss/etc. due to wrong epoch.
+- Drop old provides.
+
* Tue Mar 03 2015 Stephen Gallagher <sgallagh(a)redhat.com> 1:8.0.18-3
- Bump epoch to maintain upgrade path from Fedora 22
9 years, 1 month
[tomcat/f22] Bump epoch for downgrade
by Stephen Gallagher
commit 24584105fac562489fc89a556d7156fa5424aac2
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue Mar 3 15:17:39 2015 -0500
Bump epoch for downgrade
Also clean up changelog
tomcat.spec | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index ecead48..90fe9e3 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -52,9 +52,9 @@
%global _systemddir /lib/systemd/system
Name: tomcat
-Epoch: 0
+Epoch: 1
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
@@ -681,14 +681,28 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
-* Sat Feb 14 2015 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.59-1
+* Tue Mar 03 2015 Stephen Gallagher <sgallagh(a)redhat.com> 1:7.0.59-2
+- Revert to Tomcat 7.0 in Fedora 22
+
+- Sat Feb 14 2015 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.59-1
- Updated to 7.0.59
-* Sun Nov 16 2014 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.57-1
+- Sun Nov 16 2014 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.57-1
- Updated to 7.0.57
- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439
- Use CATALINA_OPTS only on start, resolves: rhbz#1051194
+* Mon Feb 16 2015 Michal Srb <msrb(a)redhat.com> - 0:8.0.18-2
+- Install POM files for org.apache.tomcat:{tomcat-jni,tomcat-util-scan}
+
+* Sun Feb 15 2015 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:8.0.18-1
+- Updated to 8.0.18
+
+* Sat Sep 20 2014 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:8.0.12-1
+- Updated to 8.0.12
+- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439
+- Use CATALINA_OPTS only on start, resolves: rhbz#1051194
+
* Mon Jun 16 2014 Michal Srb <msrb(a)redhat.com> - 0:7.0.54-3
- jsp-api requires el-api
9 years, 1 month
[tomcat/f22] Revert to Tomcat 7
by Stephen Gallagher
commit ce74ddbcd3beba22fb70cd2dc890efa7409bf97f
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue Mar 3 14:58:21 2015 -0500
Revert to Tomcat 7
sources | 2 +-
...patch => tomcat-7.0-bootstrap-MANIFEST.MF.patch | 0
...t-8.0-digest.script => tomcat-7.0-digest.script | 0
tomcat-8.0-jsvc.service => tomcat-7.0-jsvc.service | 0
...log4j.properties => tomcat-7.0-log4j.properties | 0
...p.patch => tomcat-7.0-tomcat-users-webapp.patch | 0
...rapper.script => tomcat-7.0-tool-wrapper.script | 0
tomcat-8.0.conf => tomcat-7.0.conf | 0
tomcat-8.0.logrotate => tomcat-7.0.logrotate | 0
tomcat-8.0.service => tomcat-7.0.service | 0
tomcat-8.0.sysconfig => tomcat-7.0.sysconfig | 0
tomcat-8.0.wrapper => tomcat-7.0.wrapper | 0
tomcat-server | 2 +-
tomcat.spec | 47 ++++++++++------------
14 files changed, 23 insertions(+), 28 deletions(-)
---
diff --git a/sources b/sources
index f4fa4f5..65ac129 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a57119b64a853c796de6b319effae632 apache-tomcat-8.0.18-src.tar.gz
+a9998f1790874aff5ce7955d0221a02b apache-tomcat-7.0.59-src.tar.gz
diff --git a/tomcat-8.0-bootstrap-MANIFEST.MF.patch b/tomcat-7.0-bootstrap-MANIFEST.MF.patch
similarity index 100%
rename from tomcat-8.0-bootstrap-MANIFEST.MF.patch
rename to tomcat-7.0-bootstrap-MANIFEST.MF.patch
diff --git a/tomcat-8.0-digest.script b/tomcat-7.0-digest.script
similarity index 100%
rename from tomcat-8.0-digest.script
rename to tomcat-7.0-digest.script
diff --git a/tomcat-8.0-jsvc.service b/tomcat-7.0-jsvc.service
similarity index 100%
rename from tomcat-8.0-jsvc.service
rename to tomcat-7.0-jsvc.service
diff --git a/tomcat-8.0-log4j.properties b/tomcat-7.0-log4j.properties
similarity index 100%
rename from tomcat-8.0-log4j.properties
rename to tomcat-7.0-log4j.properties
diff --git a/tomcat-8.0-tomcat-users-webapp.patch b/tomcat-7.0-tomcat-users-webapp.patch
similarity index 100%
rename from tomcat-8.0-tomcat-users-webapp.patch
rename to tomcat-7.0-tomcat-users-webapp.patch
diff --git a/tomcat-8.0-tool-wrapper.script b/tomcat-7.0-tool-wrapper.script
similarity index 100%
rename from tomcat-8.0-tool-wrapper.script
rename to tomcat-7.0-tool-wrapper.script
diff --git a/tomcat-8.0.conf b/tomcat-7.0.conf
similarity index 100%
rename from tomcat-8.0.conf
rename to tomcat-7.0.conf
diff --git a/tomcat-8.0.logrotate b/tomcat-7.0.logrotate
similarity index 100%
rename from tomcat-8.0.logrotate
rename to tomcat-7.0.logrotate
diff --git a/tomcat-8.0.service b/tomcat-7.0.service
similarity index 100%
rename from tomcat-8.0.service
rename to tomcat-7.0.service
diff --git a/tomcat-8.0.sysconfig b/tomcat-7.0.sysconfig
similarity index 100%
rename from tomcat-8.0.sysconfig
rename to tomcat-7.0.sysconfig
diff --git a/tomcat-8.0.wrapper b/tomcat-7.0.wrapper
similarity index 100%
rename from tomcat-8.0.wrapper
rename to tomcat-7.0.wrapper
diff --git a/tomcat-server b/tomcat-server
index 951b3ee..bc8bb80 100644
--- a/tomcat-server
+++ b/tomcat-server
@@ -13,8 +13,8 @@ OPTIONS="-Dcatalina.base=$CATALINA_BASE \
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
if [ "$1" = "start" ] ; then
- if [ "${SECURITY_MANAGER}" = "true" ] ; then
FLAGS="${FLAGS} $CATALINA_OPTS"
+ if [ "${SECURITY_MANAGER}" = "true" ] ; then
OPTIONS="${OPTIONS} \
-Djava.security.manager \
-Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy"
diff --git a/tomcat.spec b/tomcat.spec
index c65713a..ecead48 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -28,13 +28,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%global jspspec 2.3
-%global major_version 8
+%global jspspec 2.2
+%global major_version 7
%global minor_version 0
-%global micro_version 18
+%global micro_version 59
%global packdname apache-tomcat-%{version}-src
-%global servletspec 3.1
-%global elspec 3.0
+%global servletspec 3.0
+%global elspec 2.2
%global tcuid 91
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
@@ -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
@@ -88,7 +88,7 @@ Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat
BuildArch: noarch
BuildRequires: ant
-BuildRequires: ecj >= 1:4.4.0
+BuildRequires: ecj >= 1:4.2.1
BuildRequires: findutils
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-daemon
@@ -168,8 +168,6 @@ Group: Development/Libraries
Summary: Apache Tomcat JSP API implementation classes
Provides: jsp = %{jspspec}
Provides: jsp22
-Provides: %{name}-jsp-2.2-api
-Obsoletes: %{name}-jsp-2.2-api
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
Requires(post): chkconfig
@@ -207,8 +205,6 @@ Summary: Apache Tomcat Servlet API implementation classes
Provides: servlet = %{servletspec}
Provides: servlet6
Provides: servlet3
-Provides: %{name}-servlet-3.0-api
-Obsoletes: %{name}-servlet-3.0-api
Requires(post): chkconfig
Requires(postun): chkconfig
@@ -217,16 +213,14 @@ Apache Tomcat Servlet API implementation classes.
%package el-%{elspec}-api
Group: Development/Libraries
-Summary: Expression Language v%{elspec} API
+Summary: Expression Language v1.0 API
Provides: el_1_0_api = %{epoch}:%{version}-%{release}
Provides: el_api = %{elspec}
-Provides: %{name}-el-2.2-api
-Obsoletes: %{name}-el-2.2-api
Requires(post): chkconfig
Requires(postun): chkconfig
%description el-%{elspec}-api
-Expression Language %{elspec}.
+Expression Language 1.0.
%package webapps
Group: Applications/Internet
@@ -257,7 +251,6 @@ export OPT_JAR_LIST="xalan-j2-serializer"
%{__mkdir_p} HACKDIR
touch HACKDIR/build.xml
touch HACKDIR/LICENSE
-
# who needs a build.properties file anyway
%{ant} -Dbase.path="." \
-Dbuild.compiler="modern" \
@@ -266,6 +259,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
-Dcommons-daemon.native.src.tgz="HACK" \
-Djasper-jdt.jar="$(build-classpath ecj)" \
-Djdt.jar="$(build-classpath ecj)" \
+ -Dtomcat-dbcp.jar="$(build-classpath apache-commons-dbcp)" \
-Dtomcat-native.tar.gz="HACK" \
-Dtomcat-native.home="." \
-Dtomcat-native.win.path="HACKDIR" \
@@ -283,7 +277,8 @@ export OPT_JAR_LIST="xalan-j2-serializer"
# remove some jars that we'll replace with symlinks later
%{__rm} output/build/bin/commons-daemon.jar \
- output/build/lib/ecj.jar
+ output/build/lib/ecj.jar \
+ output/build/lib/apache-commons-dbcp.jar
# remove the cruft we created
%{__rm} output/build/bin/tomcat-native.tar.gz
@@ -471,7 +466,7 @@ for pom in *.pom; do
done
# we won't install dbcp, juli-adapters and juli-extras pom files
-for libname in annotations-api catalina jasper-el jasper catalina-ha util-scan jni; do
+for libname in annotations-api catalina jasper-el jasper catalina-ha; do
%{__cp} -a %{name}-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$libname.pom
%add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar -f "tomcat-lib"
done
@@ -481,7 +476,7 @@ done
%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "org.eclipse.jetty.orbit:javax.servlet.jsp"
%{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom
-%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el,javax.el:el-api"
+%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el"
%{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
# Generate a depmap fragment javax.servlet:servlet-api pointing to
@@ -511,6 +506,9 @@ done
%{__cp} -a tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
%add_maven_depmap JPP.%{name}-tomcat-jdbc.pom %{name}/tomcat-jdbc.jar
+%{__cp} -a tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
+%add_maven_depmap JPP.%{name}-tomcat-jdbc.pom %{name}/tomcat-jdbc.jar
+
mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d
cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/%{name}.conf <<EOF
f %{_localstatedir}/run/%{name}.pid 0644 tomcat tomcat -
@@ -683,14 +681,11 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
-* Mon Feb 16 2015 Michal Srb <msrb(a)redhat.com> - 0:8.0.18-2
-- Install POM files for org.apache.tomcat:{tomcat-jni,tomcat-util-scan}
-
-* Sun Feb 15 2015 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:8.0.18-1
-- Updated to 8.0.18
+* Sat Feb 14 2015 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.59-1
+- Updated to 7.0.59
-* Sat Sep 20 2014 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:8.0.12-1
-- Updated to 8.0.12
+* Sun Nov 16 2014 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.57-1
+- Updated to 7.0.57
- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439
- Use CATALINA_OPTS only on start, resolves: rhbz#1051194
9 years, 1 month