.gitignore

+/.classpath
+/.project
+/target/

NOTICE

 Apache Santuario - XML Security for Java
-Copyright 1999-2014 The Apache Software Foundation
+Copyright 1999-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

contrib/santuario-release.sh

-#!/bin/sh
-#
-# Copyright (c) The Apache Software Foundation.
-#
-#  Licensed 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.
-#
-if [ -z "${SANTUARIO_SRC_ROOT}" ]
-then
-    echo "Assuming Santuario source tree is the CWD..."
-    SANTUARIO_SRC_ROOT=`pwd`
-fi
-if [ -z "${SANTUARIO_VERSION}" ]
-then
-    SANTUARIO_VERSION=SNAPSHOT
-    echo "Setting SANTUARIO_VERSION to ${SANTUARIO_VERSION}"
-fi
-if [ -z "${SANTUARIO_STAGE_ROOT}" ]
-then
-    SANTUARIO_STAGE_ROOT=/tmp/$(id -u -nr)/stage_santuario/${SANTUARIO_VERSION}
-    echo "Setting SANTUARIO_STAGE_ROOT to ${SANTUARIO_STAGE_ROOT}"
-fi
-#
-# set up the staging area
-#
-rm -rf ${SANTUARIO_STAGE_ROOT}
-mkdir -p ${SANTUARIO_STAGE_ROOT}/dist
-mkdir -p ${SANTUARIO_STAGE_ROOT}/maven/org/apache/santuario/xmlsec/${SANTUARIO_VERSION}
-#
-# Build and stage through maven; copy the Jartifact built by Maven to the dist
-#
-cd ${SANTUARIO_SRC_ROOT}
-mvn clean || exit 1
-#mvn -Prelease install || exit 1
-#cp -r ${M2_REPO}/org/apache/santuario/xmlsec/${SANTUARIO_VERSION} ${SANTUARIO_STAGE_ROOT}/maven/org/apache/santuario/xmlsec
-#
-# Build and stage the distribution using ant
-#
-ant clean compile
-ant build.jar
-cp -r ${M2_REPO}/org/apache/santuario/xmlsec/${SANTUARIO_VERSION}/xmlsec-${SANTUARIO_VERSION}.jar build
-ant dist || exit 1
-cp -r build/*.zip ${SANTUARIO_STAGE_ROOT}/dist
-
-#
-# Sign and hash the release bits
-#
-cd ${SANTUARIO_STAGE_ROOT}/dist
-for i in *
-do
-    gpg --detach-sign --armor $i
-    gpg --verify $i.asc
-done
-for i in *.zip
-do
-    md5sum $i > $i.md5
-done
-cd ${SANTUARIO_STAGE_ROOT}/maven/org/apache/santuario/xmlsec/${SANTUARIO_VERSION}
-for i in *
-do
-    gpg --detach-sign --armor $i
-    gpg --verify $i.asc
-done
-for i in *.jar *.pom
-do
-    md5sum $i > $i.md5
-done
-
-

debian/changelog

+libxml-security-java (2.0.10-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - New build dependency on libmaven-jaxb2-plugin-java
+    - New dependency on libwoodstox-java
+  * Build with Java 8 compatibility
+  * Standards-Version updated to 4.1.5
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+  * Use a secure URL in debian/watch and debian/orig-tar.sh
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 25 Jul 2018 10:46:30 +0200
+
 libxml-security-java (1.5.8-2) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -2,35 +2,37 @@ Source: libxml-security-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun@debian.org>,
+Uploaders:
+ Varun Hiremath <varun@debian.org>,
  Torsten Werner <twerner@debian.org>,
  Emmanuel Bourg <ebourg@apache.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11~),
  default-jdk,
- maven-debian-helper (>= 1.4),
- javahelper
-Build-Depends-Indep:
- libmaven-dependency-plugin-java,
- libcommons-logging-java,
- libjaxp1.3-java,
- libxalan2-java,
- libxerces2-java,
- junit4,
  default-jdk-doc,
+ javahelper,
+ junit4,
+ libbcprov-java,
+ libcommons-logging-java,
  libcommons-logging-java-doc,
- libxalan2-java-doc,
+ libjaxp1.3-java,
  libmaven-bundle-plugin-java,
+ libmaven-dependency-plugin-java,
  libmaven-javadoc-plugin-java,
- libbcprov-java
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libxml-security-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libxml-security-java.git
+ libmaven-jaxb2-plugin-java (>= 0.14.0),
+ libwoodstox-java,
+ libxalan2-java,
+ libxalan2-java-doc,
+ libxerces2-java,
+ maven-debian-helper (>= 1.4)
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/libxml-security-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libxml-security-java
 Homepage: http://santuario.apache.org
 
 Package: libxml-security-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
 Suggests: libxml-security-java-doc
 Description: Apache Santuario -- XML Security for Java
@@ -42,7 +44,7 @@ Description: Apache Santuario -- XML Security for Java
 Package: libxml-security-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
 Recommends: ${maven:DocOptionalDepends}
 Suggests: libxml-security-java
 Description: Documentation for Apache Santuario

debian/libxml-security-java-doc.install

 target/apidocs/* usr/share/doc/libxml-security-java/api
-

debian/maven.ignoreRules

@@ -14,4 +14,11 @@
 # from the POM
 #   junit junit jar s/3\\..*/3.x/
 
+org.apache.maven.plugins maven-enforcer-plugin * * * *
+org.apache.maven.plugins maven-pmd-plugin * * * *
 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 * * * *

debian/maven.properties

@@ -3,3 +3,5 @@
 
 # See also #852930
 maven.test.skip=true
+
+maven.compiler.release=8

debian/maven.rules

@@ -22,3 +22,4 @@ org.apache.santuario xmlsec bundle s/.*/debian/ * *
 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/ * *

debian/orig-tar.sh

@@ -5,6 +5,6 @@ TAR=../libxml-security-java_$VERSION.orig.tar.xz
 DIR=libxml-security-java-$VERSION
 TAG="xmlsec-$VERSION"
 
-svn export http://svn.apache.org/repos/asf/santuario/xml-security-java/tags/${TAG}/ $DIR
+svn export https://svn.apache.org/repos/asf/santuario/xml-security-java/tags/${TAG}/ $DIR
 tar -c -J -f $TAR --exclude '*.jar' --exclude 'rfc*.txt' $DIR
 rm -rf $DIR ../$TAG

debian/rules

@@ -2,6 +2,3 @@
 
 %:
 	dh $@ --buildsystem=maven --with javahelper
-
-get-orig-source:
-	uscan --download-current-version --force-download --no-symlink

debian/watch

 version=3
-
-http://svn.apache.org/repos/asf/santuario/xml-security-java/tags/ (?:xmlsec-)?(\d[\d.]*)/ \
+https://svn.apache.org/repos/asf/santuario/xml-security-java/tags/ (?:xmlsec-)?(\d[\d.]*)/ \
     debian debian/orig-tar.sh

etc/santuario-pmd-ruleset.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<ruleset name="santuario-pmd" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+  <description>
+  A PMD ruleset for Apache Santuario
+  </description>
+
+  <rule ref="rulesets/java/basic.xml">
+     <exclude name="AvoidUsingHardCodedIP" />
+  </rule>
+  <rule ref="rulesets/java/unusedcode.xml"/>
+  <rule ref="rulesets/java/imports.xml"/>
+  <rule ref="rulesets/java/braces.xml"/>
+  <rule ref="rulesets/java/empty.xml">
+      <exclude name="EmptyCatchBlock" />
+  </rule>
+  <rule ref="rulesets/java/migrating.xml">
+     <exclude name="JUnit4TestShouldUseAfterAnnotation" /> 
+     <exclude name="JUnit4TestShouldUseTestAnnotation" /> 
+     <exclude name="JUnitUseExpected" /> 
+  </rule>
+  <rule ref="rulesets/java/unnecessary.xml"/>
+
+</ruleset>

libs/.cvsignore

-jce*.jar
-bc*.jar

libs/commons-logging.LICENSE.txt

-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.

libs/commons-logging.NOTICE.txt

-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-