Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2019-02-25 17:47:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Mon Feb 25 17:47:26 2019 rev:50 rq:678590 version:9.0.14 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2019-02-06 15:47:46.627246124 +0100 +++ /work/SRC/openSUSE:Factory/.tomcat.new.28833/tomcat.changes 2019-02-25 17:47:30.946854314 +0100 @@ -1,0 +2,11 @@ +Tue Feb 19 17:22:16 UTC 2019 - ma...@suse.com + +- Don't overwrite changes made to server.xml contexts when updating + bundled webapps. + +------------------------------------------------------------------- +Mon Feb 18 15:55:12 UTC 2019 - ma...@suse.com + +- Set javac target to 1.8 when building docs samples and serverxmltool + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.KbKD2a/_old 2019-02-25 17:47:32.338853743 +0100 +++ /var/tmp/diff_new_pack.KbKD2a/_new 2019-02-25 17:47:32.338853743 +0100 @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -37,6 +37,7 @@ %define workdir %{cachedir}/work %define tomcatappdir %{_datadir}/%{name}/tomcat-webapps %define serverxmltool %{_libexecdir}/%{name}/serverxml-tool.sh +%define javac_target 1.8 #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates @@ -79,8 +80,6 @@ Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch #PATCH-FIX-UPSTREAM: from jpackage.org package Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch -#PATCH-FIX-OPENSUSE: skip few windows specific parts of build -#Patch2: %{name}-%{major_version}.%{minor_version}-property-build.windows.patch # PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373 Patch2: %{name}-%{major_version}.%{minor_version}-JDTCompiler-java.patch # PATCH-FIX-SLE: Change security manager default policies bnc#891264 @@ -104,7 +103,7 @@ BuildRequires: geronimo-qname-1_1-api BuildRequires: geronimo-saaj-1_1-api BuildRequires: jakarta-taglibs-standard >= 1.1 -BuildRequires: java-devel >= 1.8 +BuildRequires: java-devel >= 1.8.0 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit @@ -141,25 +140,25 @@ intended to be a collaboration of the best-of-breed developers from around the world. -ATTENTION-> This tomcat is build with java 1.8.0 +ATTENTION: This tomcat is built with java 1.8.0. %package admin-webapps -Summary: The host-manager and manager web applications for Apache Tomcat +Summary: The host manager and manager web applications for Apache Tomcat Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} %description admin-webapps -The host-manager and manager web based applications for Apache Tomcat. +The host manager and manager web-based applications for Apache Tomcat. %package embed Summary: Libraries for Embedding Apache Tomcat Group: Productivity/Networking/Web/Servers %description embed -Embedded support (various Libraries) for Apache Tomcat +Embeddeding support (various libraries) for Apache Tomcat. %package docs-webapp -Summary: The docs web application for Apache Tomcat +Summary: The "docs" web application for Apache Tomcat Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} @@ -182,7 +181,7 @@ %package javadoc Summary: Javadoc generated documentation for Apache Tomcat -Group: Productivity/Networking/Web/Servers +Group: Documentation/HTML %description javadoc Javadoc generated documentation files for Apache Tomcat. @@ -254,12 +253,11 @@ The ROOT and examples web applications for Apache Tomcat %prep -%setup -q -n %{packdname} -%setup -q -D -T -n %{packdname} -b 33 +%setup -q -n %{packdname} -b33 # remove pre-built binaries and windows files find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ - -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t rm -f + -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete %patch0 %patch1 %patch2 @@ -313,7 +311,7 @@ pushd output/dist/src/webapps/docs/appdev/sample/src mkdir -p ../web/WEB-INF/classes -javac -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java +javac -source %{javac_target} -target %{javac_target} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java pushd ../web jar cf ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.war * popd @@ -329,7 +327,7 @@ jar ufm output/build/bin/tomcat-juli.jar %{SOURCE16} pushd %{_builddir}/tomcat-serverxml-tool -javac com/suse/tcserverxml/ApplyStylesheet.java +javac -source %{javac_target} -target %{javac_target} com/suse/tcserverxml/ApplyStylesheet.java jar cfe serverxmltool.jar com.suse.tcserverxml.ApplyStylesheet com/suse/tcserverxml/ApplyStylesheet.class com/suse/tcserverxml/add-context.xslt com/suse/tcserverxml/remove-context.xslt popd ++++++ tomcat-serverxml-tool.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomcat-serverxml-tool/com/suse/tcserverxml/ApplyStylesheet.java new/tomcat-serverxml-tool/com/suse/tcserverxml/ApplyStylesheet.java --- old/tomcat-serverxml-tool/com/suse/tcserverxml/ApplyStylesheet.java 2019-02-01 14:22:41.596349711 +0100 +++ new/tomcat-serverxml-tool/com/suse/tcserverxml/ApplyStylesheet.java 2019-02-19 18:33:41.000000000 +0100 @@ -59,6 +59,7 @@ if (contextXml != null) { transformer.setParameter("contextXml", contextXml); } + transformer.setParameter("forceUpdate", "false"); DOMSource source = new DOMSource(document); StreamResult result = new StreamResult(System.out); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tomcat-serverxml-tool/com/suse/tcserverxml/add-context.xslt new/tomcat-serverxml-tool/com/suse/tcserverxml/add-context.xslt --- old/tomcat-serverxml-tool/com/suse/tcserverxml/add-context.xslt 2019-02-01 19:15:21.616296444 +0100 +++ new/tomcat-serverxml-tool/com/suse/tcserverxml/add-context.xslt 2019-02-19 18:33:41.000000000 +0100 @@ -4,6 +4,7 @@ <xsl:param name="path" /> <xsl:param name="docBase" /> <xsl:param name="contextXml" /> + <xsl:param name="forceUpdate" /> <xsl:template match="@*|node()"> <xsl:copy> @@ -15,7 +16,7 @@ <xsl:copy> <!-- Update existing Context --> <xsl:apply-templates select="@*|node()"> - <xsl:with-param name="updateContext">true</xsl:with-param> + <xsl:with-param name="updateContext" select="$forceUpdate"></xsl:with-param> </xsl:apply-templates> </xsl:copy> </xsl:template>
