Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package freemarker for openSUSE:Factory
checked in at 2023-08-23 14:57:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/freemarker (Old)
and /work/SRC/openSUSE:Factory/.freemarker.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freemarker"
Wed Aug 23 14:57:34 2023 rev:6 rq:1105157 version:2.3.31
Changes:
--------
--- /work/SRC/openSUSE:Factory/freemarker/freemarker.changes 2023-07-01
23:18:12.794318565 +0200
+++ /work/SRC/openSUSE:Factory/.freemarker.new.1766/freemarker.changes
2023-08-23 14:58:38.878101032 +0200
@@ -1,0 +2,8 @@
+Mon Aug 21 23:36:08 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * no-doctype.patch
+ + avoid superfluous declaration of versions as entities
+ + DOCTYPE processing is by default disabled in apache-ivy 2.5.2+
+
+-------------------------------------------------------------------
New:
----
no-doctype.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freemarker.spec ++++++
--- /var/tmp/diff_new_pack.9CfAzr/_old 2023-08-23 14:58:39.494102134 +0200
+++ /var/tmp/diff_new_pack.9CfAzr/_new 2023-08-23 14:58:39.498102141 +0200
@@ -35,6 +35,7 @@
Patch4: enable-jdom.patch
# Fix compatibility with javacc 7
Patch5: javacc-7.patch
+Patch6: no-doctype.patch
BuildRequires: ant
BuildRequires: apache-commons-logging
BuildRequires: apache-parent
@@ -90,6 +91,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
# Use system ivy settings
rm ivysettings.xml
++++++ no-doctype.patch ++++++
--- freemarker-2.3.31/ivy.xml 2023-08-22 00:07:13.406451581 +0200
+++ freemarker-2.3.31/ivy.xml 2023-08-22 00:08:27.933659685 +0200
@@ -20,11 +20,6 @@
<!--
AFTER CHANGING THIS FILE don't forget to issue: ant update-deps
-->
-<!DOCTYPE ivy-module [
- <!ENTITY jetty.version "7.6.21.v20160908">
- <!ENTITY slf4j.version "1.6.1">
- <!ENTITY spring.version "2.5.6.SEC03">
-]>
<ivy-module version="2.0">
<info organisation="org.freemarker" module="freemarker">
<license name="Apache License, Version 2.0"
url="https://freemarker.apache.org/docs/app_license.html"; />
@@ -112,9 +107,9 @@
<dependency org="org.python" name="jython" rev="2.5.0"
conf="build.jython2.5->default" />
<dependency org="avalon-logkit" name="avalon-logkit" rev="2.0"
conf="build.base->default" />
- <dependency org="org.slf4j" name="slf4j-api" rev="&slf4j.version;"
conf="build.base->default" />
- <dependency org="org.slf4j" name="log4j-over-slf4j" rev="&slf4j.version;"
conf="build.base->default" />
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="&slf4j.version;"
conf="build.base->default" />
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"
conf="build.base->default" />
+ <dependency org="org.slf4j" name="log4j-over-slf4j" rev="1.6.1"
conf="build.base->default" />
+ <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.1"
conf="build.base->default" />
<dependency org="commons-logging" name="commons-logging" rev="1.1.1"
conf="build.base->default" />
<!-- Not for build.base, as @SuppressFBWarnings causes compilation
warnings in dependent Gradle projects -->
@@ -134,10 +129,10 @@
<dependency org="commons-io" name="commons-io" rev="2.7"
conf="test->default" />
<dependency org="com.google.guava" name="guava" rev="29.0-jre"
conf="test->default" />
- <dependency org="org.eclipse.jetty" name="jetty-server"
rev="&jetty.version;" conf="test->default" />
- <dependency org="org.eclipse.jetty" name="jetty-webapp"
rev="&jetty.version;" conf="test->default" />
- <dependency org="org.eclipse.jetty" name="jetty-jsp" rev="&jetty.version;"
conf="test->default" />
- <dependency org="org.eclipse.jetty" name="jetty-util"
rev="&jetty.version;" conf="test->default" />
+ <dependency org="org.eclipse.jetty" name="jetty-server"
rev="7.6.21.v20160908" conf="test->default" />
+ <dependency org="org.eclipse.jetty" name="jetty-webapp"
rev="7.6.21.v20160908" conf="test->default" />
+ <dependency org="org.eclipse.jetty" name="jetty-jsp"
rev="7.6.21.v20160908" conf="test->default" />
+ <dependency org="org.eclipse.jetty" name="jetty-util"
rev="7.6.21.v20160908" conf="test->default" />
<dependency org="displaytag" name="displaytag" rev="1.2"
conf="test->default">
<exclude org="com.lowagie" name="itext" />
@@ -148,10 +143,10 @@
<!-- Override Java 9 incompatible version (coming from displaytag): -->
<dependency org="commons-lang" name="commons-lang" rev="2.6"
conf="test->default" />
- <dependency org="org.springframework" name="spring-core"
rev="&spring.version;" conf="test->default">
+ <dependency org="org.springframework" name="spring-core" rev="2.5.6.SEC03"
conf="test->default">
<exclude org="commons-logging" name="commons-logging" />
</dependency>
- <dependency org="org.springframework" name="spring-test"
rev="&spring.version;" conf="test->default">
+ <dependency org="org.springframework" name="spring-test" rev="2.5.6.SEC03"
conf="test->default">
<exclude org="commons-logging" name="commons-logging" />
</dependency>
Only in freemarker-2.3.31: ivy.xml.orig
Only in freemarker-2.3.31: ivy.xml.rej
