[Git][java-team/libxml-security-java][master] 14 commits: Add more test dependencies.
Markus Koschany (@apo)
gitlab at salsa.debian.org
Sun Nov 14 13:41:27 GMT 2021
Markus Koschany pushed to branch master at Debian Java Maintainers / libxml-security-java
Commits:
be304c61 by Markus Koschany at 2021-11-14T12:39:04+01:00
Add more test dependencies.
- - - - -
7ad8175e by Markus Koschany at 2021-11-14T12:42:56+01:00
Re-enable the test suite again.
- - - - -
418ca741 by Markus Koschany at 2021-11-14T12:48:28+01:00
Maven rule for jetty9
- - - - -
c6a69c1c by Markus Koschany at 2021-11-14T12:49:04+01:00
Maven rule for hamcrest
- - - - -
d6ffdf56 by Markus Koschany at 2021-11-14T12:52:03+01:00
Update maven rules for jetty9
- - - - -
b96fd874 by Markus Koschany at 2021-11-14T13:01:10+01:00
B-D on libtomcat9-java for tests.
- - - - -
b64f5df3 by Markus Koschany at 2021-11-14T13:05:43+01:00
Fix some ignoreRules
- - - - -
b23269bf by Markus Koschany at 2021-11-14T13:07:24+01:00
Ignore org.gaul:modernizer-maven-plugin:1.5.0:
- - - - -
70f49ca0 by Markus Koschany at 2021-11-14T13:11:48+01:00
B-D on libxmlunit-java but jakarta-xml-bind.
- - - - -
97e81fea by Markus Koschany at 2021-11-14T13:16:47+01:00
Ignore the benchmark tests
- - - - -
6797f5bc by Markus Koschany at 2021-11-14T13:31:59+01:00
Add remove-XMLUtilsPerformanceTest.java.patch
- - - - -
9719719a by Markus Koschany at 2021-11-14T14:07:36+01:00
Ignore test failure because of file not found exceptions.
- - - - -
6889d92b by Markus Koschany at 2021-11-14T14:07:58+01:00
Remove libtomcat9-java from B-D.
- - - - -
188997d4 by Markus Koschany at 2021-11-14T14:09:04+01:00
Update changelog
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/maven.ignoreRules
- debian/maven.properties
- debian/maven.rules
- + debian/patches/exclude-tests.patch
- + debian/patches/remove-XMLUtilsPerformanceTest.java.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -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 <apo at debian.org> Sun, 14 Nov 2021 14:08:08 +0100
+
libxml-security-java (2.1.7-1) unstable; urgency=high
* Team upload.
=====================================
debian/control
=====================================
@@ -15,7 +15,9 @@ Build-Depends:
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 @@ Build-Depends:
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
=====================================
debian/maven.ignoreRules
=====================================
@@ -20,9 +20,8 @@ org.apache.maven.plugins maven-release-plugin * * * *
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 * * * *
=====================================
debian/maven.properties
=====================================
@@ -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
=====================================
debian/maven.rules
=====================================
@@ -23,3 +23,7 @@ commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
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/ * *
=====================================
debian/patches/exclude-tests.patch
=====================================
@@ -0,0 +1,23 @@
+From: Markus Koschany <apo at debian.org>
+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 @@
+ <excludes>
+ <exclude>**/PerformanceMemoryTest.java</exclude>
+ <exclude>**/PerformanceTimingTest.java</exclude>
++ <exclude>**/XMLUtilsPerformanceTest.java</exclude>
+ </excludes>
+ <argLine>-Xmx2000m --add-opens java.base/java.lang.reflect=ALL-UNNAMED</argLine>
+ <systemPropertyVariables>
=====================================
debian/patches/remove-XMLUtilsPerformanceTest.java.patch
=====================================
@@ -0,0 +1,77 @@
+From: Markus Koschany <apo at debian.org>
+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("<xml>123</xml>"));
+- 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("<xml>123</xml>"));
+- documentBuilder.parse(inputSource);
+- }
+-
+-}
=====================================
debian/patches/series
=====================================
@@ -1 +1,3 @@
no-errorprone.patch
+exclude-tests.patch
+remove-XMLUtilsPerformanceTest.java.patch
View it on GitLab: https://salsa.debian.org/java-team/libxml-security-java/-/compare/1f3f872c6de2be0914889efecbdbd4b9c190af03...188997d4546bb4236c7812cbe8158885f9ca3f10
--
View it on GitLab: https://salsa.debian.org/java-team/libxml-security-java/-/compare/1f3f872c6de2be0914889efecbdbd4b9c190af03...188997d4546bb4236c7812cbe8158885f9ca3f10
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/20211114/484ef155/attachment.htm>
More information about the pkg-java-commits
mailing list