[Git][java-team/libfreemarker-java][master] 3 commits: Migrate ivy.xml DOCTYPE decl to ivysettings.xml (Closes: #1060940)
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Wed Feb 28 06:35:12 GMT 2024
Tony Mancill pushed to branch master at Debian Java Maintainers / libfreemarker-java
Commits:
03791e28 by tony mancill at 2024-02-27T22:33:20-08:00
Migrate ivy.xml DOCTYPE decl to ivysettings.xml (Closes: #1060940)
- - - - -
f4bc74a3 by tony mancill at 2024-02-27T22:33:20-08:00
Refresh pom to match upstream version
- - - - -
f56f7b3d by tony mancill at 2024-02-27T22:33:20-08:00
Prepare changelog for upload
- - - - -
5 changed files:
- debian/changelog
- debian/patches/series
- + debian/patches/workaround-doctype-decl.patch
- debian/pom.xml
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libfreemarker-java (2.3.32-2) unstable; urgency=medium
+
+ * Team upload.
+ * Migrate ivy.xml DOCTYPE decl to ivysettings.xml (Closes: #1060940)
+ * Refresh pom to match upstream version
+
+ -- tony mancill <tmancill at debian.org> Tue, 27 Feb 2024 22:20:10 -0800
+
libfreemarker-java (2.3.32-1) unstable; urgency=medium
* New upstream release
=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@ exclude-avalon-logger.patch
jython-compatibility.patch
fix-tests-classpath.patch
disable-rmic.patch
+workaround-doctype-decl.patch
=====================================
debian/patches/workaround-doctype-decl.patch
=====================================
@@ -0,0 +1,78 @@
+Description: set version dependencies in ivysettings.xml to avoid
+ this error:
+ [ivy:cachepath] [[Fatal Error] ivy.xml:23:10: DOCTYPE is disallowed
+ when the feature "http://apache.org/xml/features/disallow-doctype-decl"
+ set to true. in file:/<<PKGBUILDDIR>>/ivy.xml
+ Setting the system properties described in [1] to allow DOCTYPE didn't work.
+ [1] https://github.com/apache/ant-ivy/commit/2be17bc18b0e1d4123007d579e43ba1a4b6fab3d
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060940
+Author: tony mancill <tmancill at debian.org>
+
+--- a/ivy.xml
++++ b/ivy.xml
+@@ -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" />
+@@ -124,9 +119,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="${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="commons-logging" name="commons-logging" rev="1.1.1" conf="build.base->default" />
+
+ <dependency org="org.zeroturnaround" name="javarebel-sdk" rev="1.2.2" conf="build.base->default" />
+@@ -148,10 +143,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="${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="displaytag" name="displaytag" rev="1.2" conf="test->default">
+ <exclude org="com.lowagie" name="itext" />
+@@ -162,10 +157,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="${spring.version}" 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="${spring.version}" conf="test->default">
+ <exclude org="commons-logging" name="commons-logging" />
+ </dependency>
+
+--- a/ivysettings.xml
++++ b/ivysettings.xml
+@@ -18,6 +18,10 @@
+ -->
+
+ <ivysettings>
++ <property name="jetty.version" value="7.6.21.v20160908"/>
++ <property name="slf4j.version" value="1.6.1"/>
++ <property name="spring.version" value="2.5.6.SEC03"/>
++
+ <!-- As we use our own resolved, we rather don't use the user level Ivy cache: -->
+ <caches defaultCacheDir="${ivy.project.dir}/.ivy/cache">
+ <cache name="freemarkerCache" useOrigin="true" />
=====================================
debian/pom.xml
=====================================
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,24 +17,24 @@
specific language governing permissions and limitations
under the License.
-->
-
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>17</version>
</parent>
-
+
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version></version>
-
+
<packaging>jar</packaging>
-
+
<name>Apache FreeMarker</name>
<description>
FreeMarker is a "template engine"; a generic tool to generate text output based on templates.
@@ -44,20 +44,20 @@
<name>Apache Software Foundation</name>
<url>http://apache.org</url>
</organization>
-
+
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
+ <distribution>repo</distribution>
</license>
</licenses>
-
+
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/freemarker.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/freemarker.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=freemarker.git</url>
- <tag>v2.3.31</tag>
+ <tag>v2.3.32</tag>
</scm>
<issueManagement>
@@ -85,7 +85,7 @@
<post>private at freemarker.apache.org</post>
</mailingList>
</mailingLists>
-
+
<dependencies>
<!-- no required dependencies -->
</dependencies>
=====================================
debian/rules
=====================================
@@ -1,8 +1,7 @@
#!/usr/bin/make -f
-POM_VERSION := 2.3.31
+POM_VERSION := 2.3.32
MAVEN_REPO := https://repo1.maven.org/maven2
-
JAVA_HOME := /usr/lib/jvm/default-java
%:
View it on GitLab: https://salsa.debian.org/java-team/libfreemarker-java/-/compare/171487469997d505591c63db31a22f3b4240d3e6...f56f7b3ddcaf9710e530883667b3b8d0abdc2b29
--
View it on GitLab: https://salsa.debian.org/java-team/libfreemarker-java/-/compare/171487469997d505591c63db31a22f3b4240d3e6...f56f7b3ddcaf9710e530883667b3b8d0abdc2b29
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240228/807f9a03/attachment.htm>
More information about the pkg-java-commits
mailing list