[Git][java-team/tiles-autotag][master] 8 commits: Switch to debhelper-compat = 13.

Markus Koschany (@apo) gitlab at salsa.debian.org
Sat Nov 13 14:27:26 GMT 2021



Markus Koschany pushed to branch master at Debian Java Maintainers / tiles-autotag


Commits:
5c3eb3ae by Markus Koschany at 2021-11-13T14:59:10+01:00
Switch to debhelper-compat = 13.

- - - - -
2a1b2574 by Markus Koschany at 2021-11-13T14:59:21+01:00
wrap-and-sort -sa.

- - - - -
99a18cef by Markus Koschany at 2021-11-13T14:59:35+01:00
Declare compliance with Debian Policy 4.6.0.

- - - - -
226bc4e5 by Markus Koschany at 2021-11-13T15:00:01+01:00
Use canonical VCS-URI.

- - - - -
d8d1c971 by Markus Koschany at 2021-11-13T15:00:38+01:00
Use secure URLs.

- - - - -
73bede24 by Markus Koschany at 2021-11-13T15:02:40+01:00
Remove get-orig-source target.

- - - - -
4a3284c5 by Markus Koschany at 2021-11-13T15:15:34+01:00
Extend the xstream whitelist and allow tiles-autotag classes.

Closes: #997590

- - - - -
449a9947 by Markus Koschany at 2021-11-13T15:17:05+01:00
Update changelog and patch header

- - - - -


7 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/patches/series
- + debian/patches/xstream-whitelist-extension.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+tiles-autotag (1.2-3) unstable; urgency=medium
+
+  * Team upload.
+  * Switch to debhelper-compat = 13.
+  * wrap-and-sort -sa.
+  * Declare compliance with Debian Policy 4.6.0.
+  * Use canonical VCS URI.
+  * Remove get-orig-source target.
+  * Extend the xstream whitelist and allow tiles-autotag classes.
+    (Closes: #997590)
+
+ -- Markus Koschany <apo at debian.org>  Sat, 13 Nov 2021 15:16:22 +0100
+
 tiles-autotag (1.2-2) unstable; urgency=medium
 
   * Depend on libmaven3-core-java instead of libmaven2-core-java


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10


=====================================
debian/control
=====================================
@@ -2,27 +2,35 @@ Source: tiles-autotag
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.5)
-Build-Depends-Indep: junit4,
-                     libcommons-io-java,
-                     libeasymock-java,
-                     libfreemarker-java,
-                     libmaven-bundle-plugin-java,
-                     libmaven3-core-java,
-                     libplexus-compiler-java,
-                     libqdox-java,
-                     libxstream-java,
-                     velocity
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/tiles-autotag.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/tiles-autotag.git
-Homepage: http://tiles.apache.org/tiles-autotag/
+Uploaders:
+ Emmanuel Bourg <ebourg at apache.org>
+Build-Depends:
+ debhelper-compat (= 13),
+ default-jdk,
+ maven-debian-helper (>= 1.5)
+Build-Depends-Indep:
+ junit4,
+ libcommons-io-java,
+ libeasymock-java,
+ libfreemarker-java,
+ libmaven-bundle-plugin-java,
+ libmaven3-core-java,
+ libplexus-compiler-java,
+ libqdox-java,
+ libxstream-java,
+ velocity
+Standards-Version: 4.6.0
+Vcs-Git: https://salsa.debian.org/java-team/tiles-autotag.git
+Vcs-Browser: https://salsa.debian.org/java-team/tiles-autotag
+Homepage: https://tiles.apache.org/tiles-autotag/
 
 Package: libtiles-autotag-java
 Architecture: all
-Depends: ${maven:Depends}, ${misc:Depends}
-Suggests: ${maven:OptionalDepends}
+Depends:
+ ${maven:Depends},
+ ${misc:Depends}
+Suggests:
+ ${maven:OptionalDepends}
 Description: Automatic tag generation for Apache Tiles
  Autotag generates tags (or tag-like) artifact from a common template
  code for a range of templating languages. JSP tags, Freemarker directive


=====================================
debian/copyright
=====================================
@@ -1,6 +1,6 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Tiles Autotag
-Source: http://tiles.apache.org/tiles-autotag/
+Source: https://tiles.apache.org/tiles-autotag/
 Comment:
  The FREEMARKER-LICENSE.txt and XSTREAM-LICENSE.txt files do not apply
  to the code in this package.


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 02-velocity-compatibility.patch
 03-reproducibility.patch
 04-maven-compatibility.patch
+xstream-whitelist-extension.patch


=====================================
debian/patches/xstream-whitelist-extension.patch
=====================================
@@ -0,0 +1,47 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 13 Nov 2021 15:14:58 +0100
+Subject: xstream whitelist extension
+
+Forwarded: no
+---
+ .../main/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojo.java  | 1 +
+ .../main/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojo.java  | 1 +
+ .../java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java   | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojo.java b/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojo.java
+index 1764b37..2c0c09d 100644
+--- a/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojo.java
++++ b/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojo.java
+@@ -106,6 +106,7 @@ public abstract class AbstractGenerateMojo extends AbstractMojo {
+         	InputStream stream = templateSuite.getInputStream();
+             try {
+ 	            XStream xstream = new XStream(new Sun14ReflectionProvider());
++                xstream.allowTypesByWildcard(new String[]{"org.apache.tiles.autotag.**"});
+ 	            suite = (TemplateSuite) xstream.fromXML(stream);
+             } finally {
+ 	            stream.close();
+diff --git a/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojo.java b/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojo.java
+index ef52e03..b7b8c29 100644
+--- a/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojo.java
++++ b/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojo.java
+@@ -146,6 +146,7 @@ public class CreateDescriptorMojo extends AbstractMojo {
+ 		factory.setRequestClass(requestClass);
+ 		TemplateSuite suite = factory.createTemplateSuite();
+ 		XStream xstream = new XStream();
++		xstream.allowTypesByWildcard(new String[]{"org.apache.tiles.autotag.**"});
+ 		OutputStream os = buildContext.newFileOutputStream(outputFile);
+ 		Writer writer = new OutputStreamWriter(os);
+ 		xstream.toXML(suite, writer);
+diff --git a/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java b/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java
+index ba76369..1fc7dbe 100644
+--- a/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java
++++ b/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java
+@@ -106,6 +106,7 @@ public class CreateDescriptorMojoTest {
+         mojo.execute();
+         InputStream sis = new FileInputStream(new File(temp, "META-INF/template-suite.xml"));
+         XStream xstream = new XStream(new Sun14ReflectionProvider());
++        xstream.allowTypesByWildcard(new String[]{"org.apache.tiles.autotag.**"});
+         TemplateSuite suite = (TemplateSuite) xstream.fromXML(sis);
+         sis.close();
+         assertEquals("test", suite.getName());


=====================================
debian/rules
=====================================
@@ -3,5 +3,3 @@
 %:
 	dh $@
 
-get-orig-source:
-	uscan --download-current-version --force-download --no-symlink



View it on GitLab: https://salsa.debian.org/java-team/tiles-autotag/-/compare/4105f1fcaafae2fdfb48b6c7d86caeb300b5ae1a...449a9947bdde551f28dcaf03e80b2057d549c967

-- 
View it on GitLab: https://salsa.debian.org/java-team/tiles-autotag/-/compare/4105f1fcaafae2fdfb48b6c7d86caeb300b5ae1a...449a9947bdde551f28dcaf03e80b2057d549c967
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/20211113/e53c064a/attachment.htm>


More information about the pkg-java-commits mailing list