[Git][java-team/axis][master] 7 commits: Standards-Version updated to 4.1.4
Emmanuel Bourg
gitlab at salsa.debian.org
Thu Jun 7 13:06:50 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / axis
Commits:
c5833ea7 by Emmanuel Bourg at 2018-06-07T12:07:10+02:00
Standards-Version updated to 4.1.4
- - - - -
b7f1befa by Emmanuel Bourg at 2018-06-07T12:07:10+02:00
Switch to debhelper level 11
- - - - -
e5790d96 by Emmanuel Bourg at 2018-06-07T12:07:10+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
2471ce9d by Emmanuel Bourg at 2018-06-07T12:26:57+02:00
Completed the Java 9 patch
- - - - -
418dcf4c by Emmanuel Bourg at 2018-06-07T13:57:17+02:00
Build with the DH sequencer instead of CDBS
- - - - -
30a3bcb4 by Emmanuel Bourg at 2018-06-07T13:58:36+02:00
Removed Damien Raude-Morvan from the uploaders (Closes: #889464)
- - - - -
90a212be by Emmanuel Bourg at 2018-06-07T13:59:05+02:00
Upload to unstable
- - - - -
14 changed files:
- debian/axis.bnd → debian/bnd/axis.bnd
- debian/jaxrpc.bnd → debian/bnd/jaxrpc.bnd
- debian/saaj.bnd → debian/bnd/saaj.bnd
- debian/changelog
- + debian/clean
- debian/compat
- debian/control
- + debian/libaxis-java-doc.install
- debian/libaxis-java.links
- debian/libaxis-java.poms
- + debian/patches/java9-compatibility.patch
- − debian/patches/java9.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/axis.bnd → debian/bnd/axis.bnd
=====================================
=====================================
debian/jaxrpc.bnd → debian/bnd/jaxrpc.bnd
=====================================
=====================================
debian/saaj.bnd → debian/bnd/saaj.bnd
=====================================
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-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 at 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 at apache.org> Thu, 07 Jun 2018 13:58:57 +0200
axis (1.4-25) unstable; urgency=medium
=====================================
debian/clean
=====================================
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+build/
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,12 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders:
Torsten Werner <twerner at debian.org>,
- Damien Raude-Morvan <drazzib at debian.org>,
Jakub Adam <jakub.adam at ktknet.cz>,
Emmanuel Bourg <ebourg at 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
=====================================
--- /dev/null
+++ b/debian/libaxis-java-doc.install
@@ -0,0 +1 @@
+build/api/ /usr/share/doc/libaxis-java/
=====================================
debian/libaxis-java.links
=====================================
--- a/debian/libaxis-java.links
+++ b/debian/libaxis-java.links
@@ -1,3 +1,3 @@
-/usr/share/java/axis-ant.jar /usr/share/ant/lib/axis-ant.jar
+/usr/share/java/axis-ant.jar /usr/share/ant/lib/axis-ant.jar
/usr/share/java/axis-jaxrpc.jar /usr/share/java/jaxrpc.jar
-/usr/share/java/axis-saaj.jar /usr/share/java/saaj.jar
+/usr/share/java/axis-saaj.jar /usr/share/java/saaj.jar
=====================================
debian/libaxis-java.poms
=====================================
--- a/debian/libaxis-java.poms
+++ b/debian/libaxis-java.poms
@@ -1,5 +1,4 @@
-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
=====================================
--- /dev/null
+++ b/debian/patches/java9-compatibility.patch
@@ -0,0 +1,87 @@
+Description: Fixes the compatibility with Java 9
+Author: Emmanuel Bourg <ebourg at 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 at 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 deleted
=====================================
--- a/debian/patches/java9.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From: Markus Koschany <apo at 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 at 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 at 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 at 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 at 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 at 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 at yahoo.com
-+ * @deprecated please use org.apache.axis.constants.Scope
-+ */
-+public class Use extends org.apache.axis.constants.Use {
-+};
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/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
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,36 +1,23 @@
#!/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
View it on GitLab: https://salsa.debian.org/java-team/axis/compare/86526ba0292858f8b81aa2a6c824534166d909e3...90a212be87e1987e4b69166afd4b2d8dd54a679d
--
View it on GitLab: https://salsa.debian.org/java-team/axis/compare/86526ba0292858f8b81aa2a6c824534166d909e3...90a212be87e1987e4b69166afd4b2d8dd54a679d
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/20180607/76050f85/attachment.html>
More information about the pkg-java-commits
mailing list