diff -Nru libxml-security-java-2.1.7/debian/changelog libxml-security-java-2.1.7/debian/changelog --- libxml-security-java-2.1.7/debian/changelog 2021-09-23 21:29:16.000000000 +0000 +++ libxml-security-java-2.1.7/debian/changelog 2021-11-14 13:08:08.000000000 +0000 @@ -1,3 +1,11 @@ +libxml-security-java (2.1.7-2) unstable; urgency=medium + + * Team upload. + * Re-enable the test suite again. Ignore test failures because of file not + found exceptions. Those files have been removed because of DFSG reasons. + + -- Markus Koschany Sun, 14 Nov 2021 14:08:08 +0100 + libxml-security-java (2.1.7-1) unstable; urgency=high * Team upload. diff -Nru libxml-security-java-2.1.7/debian/control libxml-security-java-2.1.7/debian/control --- libxml-security-java-2.1.7/debian/control 2021-09-23 21:29:16.000000000 +0000 +++ libxml-security-java-2.1.7/debian/control 2021-11-14 13:08:08.000000000 +0000 @@ -15,7 +15,9 @@ libbcprov-java, libcommons-logging-java, libcommons-logging-java-doc, + libhamcrest-java, libjaxp1.3-java, + libjetty9-java, libmaven-bundle-plugin-java, libmaven-dependency-plugin-java, libmaven-javadoc-plugin-java, @@ -24,6 +26,7 @@ libxalan2-java, libxalan2-java-doc, libxerces2-java, + libxmlunit-java, maven-debian-helper (>= 1.4) Standards-Version: 4.6.0 Vcs-Git: https://salsa.debian.org/java-team/libxml-security-java.git diff -Nru libxml-security-java-2.1.7/debian/maven.ignoreRules libxml-security-java-2.1.7/debian/maven.ignoreRules --- libxml-security-java-2.1.7/debian/maven.ignoreRules 2021-09-23 21:29:16.000000000 +0000 +++ libxml-security-java-2.1.7/debian/maven.ignoreRules 2021-11-14 13:08:08.000000000 +0000 @@ -20,9 +20,8 @@ org.apache.maven.plugins maven-source-plugin * * * * org.codehaus.mojo animal-sniffer-maven-plugin * * * * org.codehaus.mojo clirr-maven-plugin * * * * -org.eclipse.jetty jetty-* * * * * -xmlunit xmlunit * * * * -org.hamcrest hamcrest * * * * com.carrotsearch junit-benchmarks * * * * -jakarta.xml.bind jakarta.xml.bind-api * * * * com.google.errorprone error_prone_core * * * * +org.gaul modernizer-maven-plugin * * * * +jakarta.xml.bind jakarta.xml.bind-api * * * * +com.carrotsearch junit-benchmarks * * * * diff -Nru libxml-security-java-2.1.7/debian/maven.properties libxml-security-java-2.1.7/debian/maven.properties --- libxml-security-java-2.1.7/debian/maven.properties 2021-09-23 21:29:16.000000000 +0000 +++ libxml-security-java-2.1.7/debian/maven.properties 2021-11-14 13:08:08.000000000 +0000 @@ -1,7 +1,10 @@ # Include here properties to pass to Maven during the build. # For example: -# See also #852930 -maven.test.skip=true +maven.test.skip=false + +# We removed some test files because of DFSG reasons. File not found +# exceptions. +maven.test.failure.ignore = true maven.compiler.release=8 diff -Nru libxml-security-java-2.1.7/debian/maven.rules libxml-security-java-2.1.7/debian/maven.rules --- libxml-security-java-2.1.7/debian/maven.rules 2021-09-23 21:29:16.000000000 +0000 +++ libxml-security-java-2.1.7/debian/maven.rules 2021-11-14 13:08:08.000000000 +0000 @@ -23,3 +23,7 @@ log4j log4j * s/1\.2\..*/1.2.x/ * * org.bouncycastle s/bcprov-jdk15on/bcprov/ * s/.*/debian/ * * org.jvnet.jaxb2.maven2 s/maven-jaxb2-plugin/maven-jaxb23-plugin/ maven-plugin s/0.12.3/0.14.0/ * * +org.eclipse.jetty jetty-server * s/.*/9.x/ * * +org.eclipse.jetty jetty-servlet * s/.*/9.x/ * * +org.eclipse.jetty jetty-servlets * s/.*/9.x/ * * +org.hamcrest s/hamcrest/hamcrest-all/ jar s/.*/debian/ * * diff -Nru libxml-security-java-2.1.7/debian/patches/exclude-tests.patch libxml-security-java-2.1.7/debian/patches/exclude-tests.patch --- libxml-security-java-2.1.7/debian/patches/exclude-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ libxml-security-java-2.1.7/debian/patches/exclude-tests.patch 2021-11-14 13:08:08.000000000 +0000 @@ -0,0 +1,23 @@ +From: Markus Koschany +Date: Sun, 14 Nov 2021 13:16:05 +0100 +Subject: exclude tests + +Exclude tests because of missing dependencies. + +Forwarded: not-needed +--- + pom.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pom.xml b/pom.xml +index a71e885..3947c44 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -437,6 +437,7 @@ + + **/PerformanceMemoryTest.java + **/PerformanceTimingTest.java ++ **/XMLUtilsPerformanceTest.java + + -Xmx2000m --add-opens java.base/java.lang.reflect=ALL-UNNAMED + diff -Nru libxml-security-java-2.1.7/debian/patches/remove-XMLUtilsPerformanceTest.java.patch libxml-security-java-2.1.7/debian/patches/remove-XMLUtilsPerformanceTest.java.patch --- libxml-security-java-2.1.7/debian/patches/remove-XMLUtilsPerformanceTest.java.patch 1970-01-01 00:00:00.000000000 +0000 +++ libxml-security-java-2.1.7/debian/patches/remove-XMLUtilsPerformanceTest.java.patch 2021-11-14 13:08:08.000000000 +0000 @@ -0,0 +1,77 @@ +From: Markus Koschany +Date: Sun, 14 Nov 2021 13:31:09 +0100 +Subject: remove XMLUtilsPerformanceTest.java + +Remove XMLUtilsPerformanceTest.java because of missing dependencies. + +Forwarded: not-needed +--- + .../test/dom/utils/XMLUtilsPerformanceTest.java | 59 ---------------------- + 1 file changed, 59 deletions(-) + delete mode 100644 src/test/java/org/apache/xml/security/test/dom/utils/XMLUtilsPerformanceTest.java + +diff --git a/src/test/java/org/apache/xml/security/test/dom/utils/XMLUtilsPerformanceTest.java b/src/test/java/org/apache/xml/security/test/dom/utils/XMLUtilsPerformanceTest.java +deleted file mode 100644 +index 021d09e..0000000 +--- a/src/test/java/org/apache/xml/security/test/dom/utils/XMLUtilsPerformanceTest.java ++++ /dev/null +@@ -1,59 +0,0 @@ +-/** +- * Licensed to the Apache Software Foundation (ASF) under one +- * or more contributor license agreements. See the NOTICE file +- * distributed with this work for additional information +- * regarding copyright ownership. The ASF licenses this file +- * 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 +- * KIND, either express or implied. See the License for the +- * specific language governing permissions and limitations +- * under the License. +- */ +-package org.apache.xml.security.test.dom.utils; +- +-import java.io.StringReader; +- +-import javax.xml.XMLConstants; +-import javax.xml.parsers.DocumentBuilder; +-import javax.xml.parsers.DocumentBuilderFactory; +- +-import org.apache.xml.security.utils.XMLUtils; +-import org.junit.Test; +-import org.xml.sax.InputSource; +- +-import com.carrotsearch.junitbenchmarks.AbstractBenchmark; +-import com.carrotsearch.junitbenchmarks.BenchmarkOptions; +- +-/** +- * Some benchmark tests for the caching logic in XMLUtils +- */ +-public class XMLUtilsPerformanceTest extends AbstractBenchmark { +- +- @BenchmarkOptions(callgc = false, benchmarkRounds = 100000, warmupRounds = 100) +- @Test +- public void testXMLUtils() throws Exception { +- InputSource inputSource = new InputSource(new StringReader("123")); +- XMLUtils.read(inputSource, false); +- } +- +- @BenchmarkOptions(callgc = false, benchmarkRounds = 100000, warmupRounds = 100) +- @Test +- public void testCreateDocumentBuilder() throws Exception { +- DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance(); +- dfactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE); +- dfactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); +- dfactory.setNamespaceAware(true); +- DocumentBuilder documentBuilder = dfactory.newDocumentBuilder(); +- +- InputSource inputSource = new InputSource(new StringReader("123")); +- documentBuilder.parse(inputSource); +- } +- +-} diff -Nru libxml-security-java-2.1.7/debian/patches/series libxml-security-java-2.1.7/debian/patches/series --- libxml-security-java-2.1.7/debian/patches/series 2021-09-23 21:29:16.000000000 +0000 +++ libxml-security-java-2.1.7/debian/patches/series 2021-11-14 13:08:08.000000000 +0000 @@ -1 +1,3 @@ no-errorprone.patch +exclude-tests.patch +remove-XMLUtilsPerformanceTest.java.patch