debian/changelog

-axis (1.4-26) UNRELEASED; urgency=medium
+axis (1.4-26) unstable; urgency=medium
 
   * Team upload.
+
+  [ Markus Koschany ]
   * Fix FTBFS with Java 9. (Closes: #893098)
-    TODO: Implement missing SOAP methods.
 
- -- Markus Koschany <apo@debian.org>  Tue, 20 Mar 2018 23:11:20 +0100
+  [ Emmanuel Bourg ]
+  * Removed Damien Raude-Morvan from the uploaders (Closes: #889464)
+  * Build with the DH sequencer instead of CDBS
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 07 Jun 2018 13:58:57 +0200
 
 axis (1.4-25) unstable; urgency=medium
 

debian/clean

+build/

debian/compat

-10
+11

debian/control

@@ -4,14 +4,12 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders:
  Torsten Werner <twerner@debian.org>,
- Damien Raude-Morvan <drazzib@debian.org>,
  Jakub Adam <jakub.adam@ktknet.cz>,
  Emmanuel Bourg <ebourg@apache.org>
 Build-Depends:
  ant-optional,
  bnd (>= 2.1.0),
- cdbs,
- debhelper (>= 10),
+ debhelper (>= 11~),
  default-jdk,
  libcommons-discovery-java,
  libcommons-httpclient-java,
@@ -20,9 +18,9 @@ Build-Depends:
  libservlet3.1-java,
  libwsdl4j-java,
  maven-repo-helper
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/axis.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/axis.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/axis.git
+Vcs-Browser: https://salsa.debian.org/java-team/axis
 Homepage: http://ws.apache.org/axis/
 
 Package: libaxis-java

debian/libaxis-java-doc.install

+build/api/   /usr/share/doc/libaxis-java/

debian/libaxis-java.poms

-debian/poms/ant.xml
-debian/poms/axis.xml
-debian/poms/jaxrpc.xml
-debian/poms/saaj.xml
-
+debian/poms/ant.xml    --has-package-version --artifact=build/lib/axis-ant.jar
+debian/poms/axis.xml   --has-package-version --artifact=build/bnd/axis.jar
+debian/poms/jaxrpc.xml --has-package-version --artifact=build/bnd/jaxrpc.jar
+debian/poms/saaj.xml   --has-package-version --artifact=build/bnd/saaj.jar

debian/patches/java9-compatibility.patch

+Description: Fixes the compatibility with Java 9
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -98,6 +98,7 @@
+       source="${source}"
+       target="${target}"
+       classpathref="classpath">
++      <exclude name="**/enum/**/*" />
+       <exclude name="**/old/**/*" />
+       <exclude name="**/bak/**"/>
+       <exclude name="**/org/apache/axis/components/net/JDK14*.java" unless="jdk14.jsse.present"/>
+--- a/src/org/apache/axis/types/UnsignedInt.java
++++ b/src/org/apache/axis/types/UnsignedInt.java
+@@ -25,7 +25,7 @@
+  * @author Chris Haddad <chaddad@cobia.net>
+  * @see <a href="http://www.w3.org/TR/xmlschema-2/#unsignedInt">XML Schema 3.3.22</a>
+  */
+-public class UnsignedInt extends java.lang.Number implements java.lang.Comparable {
++public class UnsignedInt extends java.lang.Number implements java.lang.Comparable<UnsignedInt> {
+ 
+     protected Long lValue = new Long(0);
+ 
+@@ -105,9 +105,9 @@
+     }
+ 
+     // implement java.lang.comparable interface
+-    public int compareTo(Object obj) {
++    public int compareTo(UnsignedInt obj) {
+       if (lValue != null)
+-        return lValue.compareTo(obj);
++        return lValue.compareTo(obj.lValue);
+       else
+         if (equals(obj) == true)
+             return 0;  // null == null
+--- a/src/org/apache/axis/types/UnsignedLong.java
++++ b/src/org/apache/axis/types/UnsignedLong.java
+@@ -26,7 +26,7 @@
+  * @see <a href="http://www.w3.org/TR/xmlschema-2/#unsignedLong">XML Schema 3.3.21</a>
+  */
+ public class UnsignedLong extends java.lang.Number
+-        implements java.lang.Comparable {
++        implements java.lang.Comparable<UnsignedLong> {
+ 
+     protected BigInteger lValue = BigInteger.ZERO;
+     private static BigInteger MAX = new BigInteger("18446744073709551615"); // max unsigned long
+@@ -99,9 +99,9 @@
+     }
+ 
+     // implement java.lang.comparable interface
+-    public int compareTo(Object obj) {
++    public int compareTo(UnsignedLong obj) {
+         if (lValue != null)
+-            return lValue.compareTo(obj);
++            return lValue.compareTo(obj.lValue);
+         else if (equals(obj) == true)
+             return 0;  // null == null
+         else
+--- a/tools/org/apache/axis/tools/ant/foreach/ParamSet.java
++++ b/tools/org/apache/axis/tools/ant/foreach/ParamSet.java
+@@ -83,9 +83,9 @@
+         and then <item>s. The ordering of the buildfile is
+         not guaranteed. */
+         Vector values = new Vector();
+-        Enumeration enum = filesets.elements();
+-        while (enum.hasMoreElements()) {
+-            FileSet fileSet = (FileSet) enum.nextElement();
++        Enumeration enumeration = filesets.elements();
++        while (enumeration.hasMoreElements()) {
++            FileSet fileSet = (FileSet) enumeration.nextElement();
+             File base = fileSet.getDir(project);
+             DirectoryScanner scanner = fileSet.getDirectoryScanner(project);
+             if (TYPE_DIR != type) {
+@@ -103,9 +103,9 @@
+                 }
+             }
+         }
+-        enum = items.elements();
+-        while (enum.hasMoreElements()) {
+-            ParamItem item = (ParamItem) enum.nextElement();
++        enumeration = items.elements();
++        while (enumeration.hasMoreElements()) {
++            ParamItem item = (ParamItem) enumeration.nextElement();
+             values.addElement(item.getValue());
+         }
+         return values.elements();

debian/patches/java9.patch

-From: Markus Koschany <apo@debian.org>
-Date: Tue, 20 Mar 2018 22:54:45 +0100
-Subject: java9
-
----
- src/org/apache/axis/enum/Scope.java        | 25 -------------------------
- src/org/apache/axis/enum/Style.java        | 29 -----------------------------
- src/org/apache/axis/enum/Use.java          | 25 -------------------------
- src/org/apache/axis/enumeration/Scope.java | 25 +++++++++++++++++++++++++
- src/org/apache/axis/enumeration/Style.java | 29 +++++++++++++++++++++++++++++
- src/org/apache/axis/enumeration/Use.java   | 25 +++++++++++++++++++++++++
- 6 files changed, 79 insertions(+), 79 deletions(-)
- delete mode 100644 src/org/apache/axis/enum/Scope.java
- delete mode 100644 src/org/apache/axis/enum/Style.java
- delete mode 100644 src/org/apache/axis/enum/Use.java
- create mode 100644 src/org/apache/axis/enumeration/Scope.java
- create mode 100644 src/org/apache/axis/enumeration/Style.java
- create mode 100644 src/org/apache/axis/enumeration/Use.java
-
-diff --git a/src/org/apache/axis/enum/Scope.java b/src/org/apache/axis/enum/Scope.java
-deleted file mode 100644
-index f9e8e60..0000000
---- a/src/org/apache/axis/enum/Scope.java
-+++ /dev/null
-@@ -1,25 +0,0 @@
--/*
-- * Copyright 2001-2004 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.
-- */
--
--package org.apache.axis.enum;
--
--/**
-- * Simple wrapper around org.apache.axis.constants.Scope
-- * @author dims@yahoo.com
-- * @deprecated please use org.apache.axis.constants.Scope
-- */
--public class Scope extends org.apache.axis.constants.Scope {
--}
-diff --git a/src/org/apache/axis/enum/Style.java b/src/org/apache/axis/enum/Style.java
-deleted file mode 100644
-index 6fadf42..0000000
---- a/src/org/apache/axis/enum/Style.java
-+++ /dev/null
-@@ -1,29 +0,0 @@
--/*
-- * Copyright 2001-2004 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.
-- */
--
--package org.apache.axis.enum;
--
--import org.apache.axis.deployment.wsdd.WSDDConstants;
--
--import javax.xml.namespace.QName;
--
--/**
-- * Simple wrapper around org.apache.axis.constants.Style
-- * @author dims@yahoo.com
-- * @deprecated please use org.apache.axis.constants.Scope
-- */
--public class Style extends org.apache.axis.constants.Style {
--}
-diff --git a/src/org/apache/axis/enum/Use.java b/src/org/apache/axis/enum/Use.java
-deleted file mode 100644
-index caf8aa9..0000000
---- a/src/org/apache/axis/enum/Use.java
-+++ /dev/null
-@@ -1,25 +0,0 @@
--/*
-- * Copyright 2001-2004 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.
-- */
--
--package org.apache.axis.enum;
--
--/**
-- * Simple wrapper around org.apache.axis.constants.Use
-- * @author dims@yahoo.com
-- * @deprecated please use org.apache.axis.constants.Scope
-- */
--public class Use extends org.apache.axis.constants.Use {
--};
-diff --git a/src/org/apache/axis/enumeration/Scope.java b/src/org/apache/axis/enumeration/Scope.java
-new file mode 100644
-index 0000000..d45ca24
---- /dev/null
-+++ b/src/org/apache/axis/enumeration/Scope.java
-@@ -0,0 +1,25 @@
-+/*
-+ * Copyright 2001-2004 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.
-+ */
-+
-+package org.apache.axis.enumeration;
-+
-+/**
-+ * Simple wrapper around org.apache.axis.constants.Scope
-+ * @author dims@yahoo.com
-+ * @deprecated please use org.apache.axis.constants.Scope
-+ */
-+public class Scope extends org.apache.axis.constants.Scope {
-+}
-diff --git a/src/org/apache/axis/enumeration/Style.java b/src/org/apache/axis/enumeration/Style.java
-new file mode 100644
-index 0000000..086b3bf
---- /dev/null
-+++ b/src/org/apache/axis/enumeration/Style.java
-@@ -0,0 +1,29 @@
-+/*
-+ * Copyright 2001-2004 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.
-+ */
-+
-+package org.apache.axis.enumeration;
-+
-+import org.apache.axis.deployment.wsdd.WSDDConstants;
-+
-+import javax.xml.namespace.QName;
-+
-+/**
-+ * Simple wrapper around org.apache.axis.constants.Style
-+ * @author dims@yahoo.com
-+ * @deprecated please use org.apache.axis.constants.Scope
-+ */
-+public class Style extends org.apache.axis.constants.Style {
-+}
-diff --git a/src/org/apache/axis/enumeration/Use.java b/src/org/apache/axis/enumeration/Use.java
-new file mode 100644
-index 0000000..503f0be
---- /dev/null
-+++ b/src/org/apache/axis/enumeration/Use.java
-@@ -0,0 +1,25 @@
-+/*
-+ * Copyright 2001-2004 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.
-+ */
-+
-+package org.apache.axis.enumeration;
-+
-+/**
-+ * Simple wrapper around org.apache.axis.constants.Use
-+ * @author dims@yahoo.com
-+ * @deprecated please use org.apache.axis.constants.Scope
-+ */
-+public class Use extends org.apache.axis.constants.Use {
-+};

debian/patches/series

@@ -5,4 +5,4 @@ javadoc.diff
 CVE-2014-3596.patch
 ant-compatibility.patch
 javadoc-encoding.patch
-java9.patch
+java9-compatibility.patch

debian/rules

 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar wsdl4j commons-logging commons-discovery commons-httpclient javax.mail servlet-api-3.1 xmlParserAPIs xercesImpl
-
-DEB_ANT_BUILD_TARGET := compile javadocs
-
-DEB_INSTALL_CHANGELOGS_ALL := changelog.html
+export CLASSPATH=/usr/share/java/commons-logging.jar    \
+                :/usr/share/java/commons-discovery.jar  \
+                :/usr/share/java/commons-httpclient.jar \
+                :/usr/share/java/javax.mail.jar         \
+                :/usr/share/java/servlet-api-3.1.jar    \
+                :/usr/share/java/wsdl4j.jar             \
+                :/usr/share/java/xmlParserAPIs.jar      \
+                :/usr/share/java/xercesImpl.jar
+
+%:
+	dh $@ --with maven-repo-helper
+
+override_dh_auto_build:
+	dh_auto_build -- -Dcompile.debug=true compile javadocs -debug
+	mv build/javadocs build/api
 
-common-post-build-indep::
-	for BNDFILE in debian/*.bnd; do \
+	mkdir -p build/bnd/
+	for BNDFILE in debian/bnd/*.bnd; do \
 		JARPATH=build/lib/`basename $$BNDFILE .bnd`.jar; \
-		bnd wrap --properties $$BNDFILE --output debian/tmp/`basename $$BNDFILE .bnd`.jar $$JARPATH; \
+		bnd wrap --properties $$BNDFILE --output build/bnd/`basename $$BNDFILE .bnd`.jar $$JARPATH; \
 	done
-
-install/libaxis-java::
-	mh_installpoms -plibaxis-java -e$(DEB_UPSTREAM_VERSION)
-	mh_installjar -plibaxis-java -l debian/poms/axis.xml debian/tmp/axis.jar
-	mh_installjar -plibaxis-java -l debian/poms/saaj.xml debian/tmp/saaj.jar
-	mh_installjar -plibaxis-java -l debian/poms/jaxrpc.xml debian/tmp/jaxrpc.jar
-	mh_installjar -plibaxis-java -l debian/poms/ant.xml build/lib/axis-ant.jar
-
-install/libaxis-java-doc::
-	mv build/javadocs build/api
-	dh_install -plibaxis-java-doc build/api/ /usr/share/doc/libaxis-java/
-
-clean::
-	-rm -rf debian/tmp
-	-rm -rf build/api
-	mh_clean
-
-get-orig-source::
-	uscan --force-download --rename