feat: update libspring-java to 4.3.30

modular Java/J2EE application framework - Context

Issue: deepin-community/sig-deepin-sysdev-team#547
Log: update repo

debian/README.Debian.security

@@ -0,0 +1,8 @@
+Important note
+==============
+
+The Spring Framework alias libspring-java in Debian is not intended to be used
+to develop web applications for production purposes. It is mainly required to
+build other packages. There will be no security support for the life time of a
+stable release. Only use it to build other Debian packages or in a trusted
+environment like your local network with trusted devices.

debian/changelog

@@ -1,3 +1,17 @@
+libspring-java (4.3.30-2) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libtomcat10-java instead of libtomcat9-java.
+  * Add xmlbeans-4-ftbfs.patch and fix FTBFS with xmlbeans 4.
+    (Closes: #1011689)
+  * Ignore junit-bom and jboss-logging artifact.
+  * Ignore org.eclipse.persistence:jakarta.persistence.
+  * Install README.Debian.security and explain that libspring-java should be
+    only used for building other Debian packages or in a secured local
+    environment with trusted devices.
+
+ -- Markus Koschany <[email protected]>  Mon, 27 Feb 2023 21:50:50 +0100
+
 libspring-java (4.3.30-1) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -79,7 +79,7 @@ Build-Depends-Indep: bsh,
                      libservlet-api-java,
                      libtaglibs-standard-jstlel-java,
                      libtiles-java (>= 3.0),
-                     libtomcat9-java,
+                     libtomcat10-java,
                      libvelocity-tools-java (>= 2.0-3),
                      libwebjars-locator-java,
                      libwebjars-locator-core-java,
@@ -158,7 +158,7 @@ Recommends: libasm-java (>= 5.0),
             libgeronimo-validation-1.0-spec-java,
             libjodatime-java,
             libspring-instrument-java (= ${source:Version}),
-            libtomcat9-java
+            libtomcat10-java
 Suggests: bsh,
           groovy
 Description: modular Java/J2EE application framework - Context

debian/docs

@@ -1 +1,2 @@
 README.md
+debian/README.Debian.security

debian/maven.ignoreRules

@@ -18,3 +18,6 @@ net.sourceforge.htmlunit htmlunit * * * *
 net.sf.jasperreports jasperreports * * * *
 io.projectreactor reactor-core * * * *
 io.projectreactor reactor-net * * * *
+org.jboss.logging jboss-logging * * * *
+org.junit junit-bom * * * *
+org.eclipse.persistence jakarta.persistence * * * *

debian/maven.rules

@@ -13,8 +13,8 @@ s/javax.transaction/org.apache.geronimo.specs/ s/javax.transaction-api/geronimo-
 s/javax.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.0_spec/ * s/.*/debian/ * *
 junit junit * s/.*/4.x/ * *
 log4j log4j * s/.*/1.2.x/ * *
-org.apache.tomcat s/catalina/tomcat-catalina/ * s/.*/9.x/ * *
-org.apache.tomcat tomcat-websocket * s/.*/9.x/ * *
+org.apache.tomcat s/catalina/tomcat-catalina/ * s/.*/10.x/ * *
+org.apache.tomcat tomcat-websocket * s/.*/10.x/ * *
 org.codehaus.castor s/castor/castor-xml/ * s/.*/debian/ * *
 s/org.codehaus.fabric3.api/org.apache.geronimo.specs/ s/commonj/geronimo-commonj_1.1_spec/ * s/.*/debian/ * *
 org.eclipse.jetty* * * s/.*/9.x/ * *

debian/patches/series

@@ -19,3 +19,4 @@
 0051-reproducible-build-source-date.patch
 0052-no-jasperreports.patch
 0053-ignore-reactor.patch
+xmlbeans-4-ftbfs.patch

debian/patches/xmlbeans-4-ftbfs.patch

@@ -0,0 +1,55 @@
+From: Markus Koschany <[email protected]>
+Date: Mon, 27 Feb 2023 20:09:29 +0100
+Subject: xmlbeans 4 ftbfs
+
+Forwarded: not-needed
+---
+ .../java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java   | 6 +-----
+ .../org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java     | 4 ++--
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
+index a3107b0..66339f9 100644
+--- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
++++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
+@@ -30,7 +30,6 @@ import javax.xml.stream.XMLEventWriter;
+ import javax.xml.stream.XMLStreamReader;
+ import javax.xml.stream.XMLStreamWriter;
+
+-import org.apache.xmlbeans.XMLStreamValidationException;
+ import org.apache.xmlbeans.XmlError;
+ import org.apache.xmlbeans.XmlException;
+ import org.apache.xmlbeans.XmlObject;
+@@ -315,10 +314,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller {
+ 	 * @return the corresponding {@code XmlMappingException}
+ 	 */
+ 	protected XmlMappingException convertXmlBeansException(Exception ex, boolean marshalling) {
+-		if (ex instanceof XMLStreamValidationException) {
+-			return new ValidationFailureException("XMLBeans validation exception", ex);
+-		}
+-		else if (ex instanceof XmlException || ex instanceof SAXException) {
++		if (ex instanceof XmlException || ex instanceof SAXException) {
+ 			if (marshalling) {
+ 				return new MarshallingFailureException("XMLBeans marshalling exception",  ex);
+ 			}
+diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
+index f78f015..6488f3e 100644
+--- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
++++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
+@@ -49,14 +49,14 @@ public class XmlOptionsFactoryBean implements FactoryBean<XmlOptions> {
+ 	 * @see XmlOptions#SAVE_PRETTY_PRINT
+ 	 * @see XmlOptions#LOAD_STRIP_COMMENTS
+ 	 */
+-	public void setOptions(Map<String, ?> optionsMap) {
++	/*public void setOptions(Map<String, ?> optionsMap) {
+ 		this.xmlOptions = new XmlOptions();
+ 		if (optionsMap != null) {
+ 			for (Map.Entry<String, ?> option : optionsMap.entrySet()) {
+ 				this.xmlOptions.put(option.getKey(), option.getValue());
+ 			}
+ 		}
+-	}
++	}*/
+
+
+ 	@Override