Andreas Tille · Andreas Tille · Andreas Tille · Andreas Tille · Andreas Tille · Andreas Tille
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,7 +5,7 @@
 # (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
+#     https://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,

--- a/.github/autolabeler.yml
+++ b/.github/autolabeler.yml
@@ -6,7 +6,7 @@
 # (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
+#    https://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,

--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ test-output
 /lang/java/compiler/nb-configuration.xml
 /lang/java/compiler/nbproject/
 **/.vscode/**/*
+.factorypath
+
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@
 # "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
+#   https://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
@@ -22,19 +22,21 @@ sudo: required
 services:
  - docker

-language: generic
+matrix:
+  include:
+  - language: generic
+    env:
+      JAVA=8

+  - language: generic
    env:
-  - JAVA=8
-  - JAVA=11
+      JAVA=11

-before_install:
-  - sudo apt-get -q update
-  - sudo apt-get -q install --no-install-recommends -y curl git gnupg-agent locales pinentry-curses pkg-config rsync software-properties-common
-  - sudo apt-get -q clean
-  - sudo rm -rf /var/lib/apt/lists/*
-  - curl -L https://www-us.apache.org/dist/yetus/0.8.0/yetus-0.8.0-bin.tar.gz | tar xvz -C /tmp/
+  - os: windows
+    language: bash

-script:
-  - sed 's/java:8-jdk/java:'${JAVA}'-jdk/' share/docker/Dockerfile
-  - /tmp/yetus-0.8.0/bin/test-patch --plugins=buildtest --user-plugins=share/precommit/ --run-tests --empty-patch --docker --dockerfile=share/docker/Dockerfile --dirty-workspace --verbose=true
+before_install: "if [ -x ./.travis/before_install.sh   ] ; then ./.travis/before_install.sh ; fi"
+install:        "if [ -x ./.travis/install.sh          ] ; then ./.travis/install.sh        ; fi"
+before_script:  "if [ -x ./.travis/before_script.sh    ] ; then ./.travis/before_script.sh  ; fi"
+script:         "if [ -x ./.travis/script.sh           ] ; then ./.travis/script.sh         ; fi"
+after_script:   "if [ -x ./.travis/after_script.sh     ] ; then ./.travis/after_script.sh   ; fi"
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
+#!/bin/bash
+
+# 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
+#
+#     https://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.
+
+set -e
+
+case "$TRAVIS_OS_NAME" in
+"linux")
+    sudo apt-get -q update
+    sudo apt-get -q install --no-install-recommends -y curl git gnupg-agent locales pinentry-curses pkg-config rsync software-properties-common
+    sudo apt-get -q clean
+    sudo rm -rf /var/lib/apt/lists/*
+    curl -L https://www-us.apache.org/dist/yetus/0.8.0/yetus-0.8.0-bin.tar.gz | tar xvz -C /tmp/
+    ;;
+"windows")
+    choco install dotnetcore-sdk --version 2.2.300
+    ;;
+*)
+    echo "Invalid PLATFORM"
+    exit 1
+    ;;
+esac
--- a/.travis/script.sh
+++ b/.travis/script.sh
+#!/bin/bash
+
+# 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
+#
+#     https://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.
+
+set -e
+
+case "$TRAVIS_OS_NAME" in
+"linux")
+    sed -i.bak "s/openjdk:8/openjdk:${JAVA}/" share/docker/Dockerfile
+    /tmp/yetus-0.8.0/bin/test-patch --plugins=buildtest --java-home=/usr/local/openjdk-"${JAVA}" --user-plugins=share/precommit/ --run-tests --empty-patch --docker --dockerfile=share/docker/Dockerfile --dirty-workspace --verbose=true
+    ;;
+"windows")
+    ./lang/csharp/build.sh test
+    ;;
+*)
+    echo "Invalid PLATFORM"
+    exit 1
+    ;;
+esac
--- a/BUILD.md
+++ b/BUILD.md
@@ -10,7 +10,7 @@ The following packages must be installed before Avro can be built:
 - Python 3: 3.5 or greater
 - C: gcc, cmake, asciidoc, source-highlight
 - C++: cmake 3.7.2 or greater, g++, flex, bison, libboost-dev
- - C#: mono-devel mono-gmcs nunit
+ - C#: .NET Core 2.2 SDK
 - JavaScript: Node 6.x+, nodejs, npm
 - Ruby: Ruby 2.3.3 or greater, ruby-dev, gem, rake, echoe, yajl-ruby
 - Perl: Perl 5.24.1 or greater, gmake, Module::Install,

--- a/LICENSE.txt
+++ b/LICENSE.txt

                                 Apache License
                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

@@ -193,7 +193,7 @@
   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
+       https://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,
@@ -235,7 +235,7 @@ Some files include an additional copyright notice:
 ----------------------------------------------------------------------
 License for msinttypes.h and msstdint.h used in the C implementation:
 Source from:
-http://code.google.com/p/msinttypes/downloads/detail?name=msinttypes-r26.zip
+https://code.google.com/p/msinttypes/downloads/detail?name=msinttypes-r26.zip

 Copyright (c) 2006-2008 Alexander Chemeris

@@ -401,7 +401,7 @@ File: Castle.Core.dll
 Copyright (c) 2004-2015 Castle Project

 License: Apache License version 2.0 (see above)
-URL: http://opensource.org/licenses/Apache-2.0
+URL: https://opensource.org/licenses/Apache-2.0

 ----------------------------------------------------------------------
 License for the log4net binary included with the C# implementation:
@@ -527,17 +527,17 @@ All rights reserved.
 License for g.Raphael 0.4.1 used by the Java IPC implementation:

 Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
-Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
+Licensed under the MIT (https://www.opensource.org/licenses/mit-license.php) license.

 ----------------------------------------------------------------------
 License for jQuery v1.4.2 used by the Java IPC implementation:

 Copyright 2010, John Resig
 Dual licensed under the MIT or GPL Version 2 licenses.
-http://jquery.org/license
+https://jquery.org/license

 jQuery includes Sizzle.js
-http://sizzlejs.com/
+https://sizzlejs.com/
 Copyright 2010, The Dojo Foundation
 Released under the MIT, BSD, and GPL Licenses.


--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -2,7 +2,7 @@ Apache Avro
 Copyright 2010-2019 The Apache Software Foundation

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

 NUnit license acknowledgement:

@@ -24,7 +24,7 @@ is:
 | (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
+|     https://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,
@@ -35,7 +35,7 @@ is:
 The Odiago NOTICE at the time of the contribution:

 | This product includes software developed by Odiago, Inc.
-| (http://www.wibidata.com).
+| (https://www.wibidata.com).

 Apache Ivy includes the following in its NOTICE file:

@@ -43,7 +43,7 @@ Apache Ivy includes the following in its NOTICE file:
 | Copyright 2007-2010 The Apache Software Foundation
 |
 | This product includes software developed by
-| The Apache Software Foundation (http://www.apache.org/).
+| The Apache Software Foundation (https://www.apache.org/).
 |
 | Portions of Ivy were originally developed by
 | Jayasoft SARL (http://www.jayasoft.fr/)
@@ -62,4 +62,4 @@ Apache Log4Net includes the following in its NOTICE file:
 | Copyright 2004-2015 The Apache Software Foundation
 |
 | This product includes software developed at
-| The Apache Software Foundation (http://www.apache.org/).
+| The Apache Software Foundation (https://www.apache.org/).
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Apache Avro™ is a data serialization system.

 Learn more about Avro, please visit our website at:

-  http://avro.apache.org/
+  https://avro.apache.org/

 To contribute to Avro, please read:


--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,7 @@
 # (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
+#     https://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,
@@ -23,7 +23,7 @@ VERSION=`cat share/VERSION.txt`
 DOCKER_XTRA_ARGS=""

 function usage {
-  echo "Usage: $0 {test|dist|sign|clean|docker [--args \"docker-args\"]|rat|githooks|docker-test}"
+  echo "Usage: $0 {test|dist|sign|clean|veryclean|docker [--args \"docker-args\"]|rat|githooks|docker-test}"
  exit 1
 }

@@ -63,6 +63,7 @@ do
      (cd lang/py; ant interop-data-generate)
      (cd lang/c; ./build.sh interop-data-generate)
      #(cd lang/c++; make interop-data-generate)
+      (cd lang/csharp; ./build.sh interop-data-generate)
      (cd lang/ruby; rake generate_interop)
      (cd lang/php; ./build.sh interop-data-generate)

@@ -71,6 +72,7 @@ do
      (cd lang/py; ant interop-data-test)
      (cd lang/c; ./build.sh interop-data-test)
      #(cd lang/c++; make interop-data-test)
+      (cd lang/csharp; ./build.sh interop-data-test)
      (cd lang/ruby; rake interop)
      (cd lang/php; ./build.sh test-interop)

@@ -197,6 +199,7 @@ do

      (cd lang/perl; ./build.sh clean)
      ;;
+
    veryclean)
      rm -rf build dist
      (cd doc; ant clean)
@@ -230,8 +233,8 @@ do
      (cd lang/php; ./build.sh clean)

      (cd lang/perl; ./build.sh clean)
+
      rm -rf lang/c++/build
-      rm -rf lang/c++/test?.df
      rm -rf lang/js/node_modules
      rm -rf lang/perl/inc/
      rm -rf lang/ruby/.gem/

--- a/debian/changelog
+++ b/debian/changelog
+python-avro (1.9.1+dfsg-1) unstable; urgency=medium
+
+  * Team upload.
+  * Drop Python2 package (simplify packaging by restricting to Python3 only)
+    Closes: #937592
+  * Standards-Version: 4.4.1
+  * Remove trailing whitespace in debian/changelog
+  * debian/copyright: use spaces rather than tabs to start continuation
+    lines.
+  * Remove obsolete field Name from debian/upstream/metadata (already
+    present in machine-readable debian/copyright).
+
+ -- Andreas Tille <tille@debian.org>  Wed, 18 Dec 2019 08:51:18 +0100
+
 python-avro (1.9.0+dfsg-1) unstable; urgency=medium

  * Team upload.

--- a/debian/control
+++ b/debian/control
@@ -5,36 +5,14 @@ Section: python
 Testsuite: autopkgtest-pkg-python
 Priority: optional
 Build-Depends: debhelper-compat (= 12),
-               default-jdk,
-               ant,
               dh-python,
-               python-all,
-               python-setuptools,
-               python-simplejson,
               python3-all,
               python3-setuptools
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/med-team/python-avro
 Vcs-Git: https://salsa.debian.org/med-team/python-avro.git
 Homepage: https://avro.apache.org

-Package: python-avro
-Architecture: all
-Depends: ${misc:Depends},
-         ${python:Depends}
-Description: Apache Avro serialization system (Python 2 library)
- Apache Avro is a data serialization system providing
-  * Rich data structures.
-  * A compact, fast, binary data format.
-  * A container file, to store persistent data.
-  * Remote procedure call (RPC).
-  * Simple integration with dynamic languages. Code generation is not
-    required to read or write data files nor to use or implement RPC protocols.
-    Code generation as an optional optimization, only worth implementing for
-    statically typed languages.
- .
- This package installs the implementation as a Python 2 library.
-
 Package: python3-avro
 Architecture: all
 Depends: ${misc:Depends},

--- a/debian/copyright
+++ b/debian/copyright
--- a/debian/patches/external-dependencies.patch
+++ b/debian/patches/external-dependencies.patch
@@ -2,8 +2,8 @@ Description: Ignore bundled dependencies
 Author: Afif Elghraoui <afif@ghraoui.name>
 Forwarded: not-needed
 Last-Update: 2015-10-24
--- python-avro.orig/lang/py/build.xml
-+++ python-avro/lang/py/build.xml
+--- a/lang/py/build.xml
+++ b/lang/py/build.xml
 @@ -33,12 +33,8 @@
   <!-- Python implementation directories -->
   <property name="build.dir" value="${basedir}/build"/>
@@ -40,7 +40,7 @@ Last-Update: 2015-10-24
 -  </target>
 -
 -  <target name="ivy-download" unless="ivy.jar.found" >
-    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" dest="${ivy.jar}" usetimestamp="true" />
+-    <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" dest="${ivy.jar}" usetimestamp="true" />
   </target>
 
   <target name="build"

--- a/debian/rules
+++ b/debian/rules
@@ -10,44 +10,14 @@ export PYBUILD_NAME = avro
 export LC_ALL=C.UTF-8
 export JAVA_HOME=/usr/lib/jvm/default-java

-# The original sources have to be preprocessed by ant before we
-# we can use them to actually build
-export PYBUILD_BEFORE_CONFIGURE_python2 = ant build
-py2srcdir=lang/py
-py2blddir=lang/py/build
-
-py2dir=$(py2blddir)
-
-clean: py2dir=$(py2srcdir)
 %:
-	PYBUILD_DISABLE_python3=1               \
-	dh $@                                   \
-		--with python2                  \
-		--buildsystem=pybuild           \
-		--sourcedirectory=$(py2dir)     \
-		--no-package=python3-avro
-	PYBUILD_DISABLE_python2=1               \
 	dh $@                                   \
 		--with python3                  \
 		--buildsystem=pybuild           \
-		--sourcedirectory=lang/py3      \
-		--no-package=python-avro
-
-# This is necessary because there's no "dh configure" to allow us
-# to simply set a target-specific variable like was done for "clean"
-override_dh_auto_configure:
-	PYBUILD_DISABLE_python3=1               \
-	dh_auto_configure                       \
-		--sourcedirectory=$(py2srcdir)  \
-		--package=python-avro
-	PYBUILD_DISABLE_python2=1               \
-	dh_auto_configure                       \
-		--sourcedirectory=lang/py3      \
-		--package=python3-avro
+		--sourcedirectory=lang/py3

 override_dh_install:
 # Only keep /usr/bin/avro that is provided by the python3 package
-	rm -f debian/python-avro/usr/bin/avro
 	find debian/ -name "*LICENSE*" -delete
 	dh_install


--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
-Name: avro
--- a/doc/LICENSE
+++ b/doc/LICENSE

                                 Apache License
                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

@@ -193,7 +193,7 @@
   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
+       https://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,
@@ -234,10 +234,10 @@ License for jQuery v1.7.1 used in the C# documentation

 Copyright 2010-2011, John Resig
 Dual licensed under the MIT or GPL Version 2 licenses.
-http://jquery.org/license
+https://jquery.org/license

 jQuery includes Sizzle.js
-http://sizzlejs.com/
+https://sizzlejs.com/
 Copyright 2010-2011, The Dojo Foundation
 Released under the MIT, BSD, and GPL Licenses.

@@ -310,7 +310,7 @@ For a copy of the MIT license text, see above.
 License for Apache Forrest (skin), included in the Avro documentation:

 Copyright: 2009-2015 The Apache Software Foundation
-License: http://www.apache.org/licenses/LICENSE-2.0 (see above)
+License: https://www.apache.org/licenses/LICENSE-2.0 (see above)

 ----------------------------------------------------------------------
 License for Doxygen-generated documentation for the C++ and C# implementations:

--- a/doc/NOTICE
+++ b/doc/NOTICE
@@ -2,7 +2,7 @@ Apache Avro
 Copyright 2010-2015 The Apache Software Foundation

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

 Based upon the representations of upstream licensors, it is understood that
 portions of the mapreduce API included in the Java implementation are licensed
@@ -18,7 +18,7 @@ is:
 | (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
+|     https://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,
@@ -29,7 +29,7 @@ is:
 The Odiago NOTICE at the time of the contribution:

 | This product includes software developed by Odiago, Inc.
-| (http://www.wibidata.com).
+| (https://www.wibidata.com).

 The documentation contains the default Apache Forrest skin.
 Apache Forrest includes the following in its NOTICE file:
@@ -38,7 +38,7 @@ Apache Forrest includes the following in its NOTICE file:
 | Copyright 2002-2007 The Apache Software Foundation.
 |
 | This product includes software developed at
-| The Apache Software Foundation (http://www.apache.org/).
+| The Apache Software Foundation (https://www.apache.org/).
 |
 | See also the file LICENSE.txt
 |
@@ -56,25 +56,25 @@ Apache Forrest includes the following in its NOTICE file:
 | http://www.krysalis.org/
 |
 | This product includes software developed by Andy Clark.
-| http://people.apache.org/~andyc/neko/
+| https://people.apache.org/~andyc/neko/
 |
 | This product includes software developed by the ExoLab Project
-| http://www.exolab.org/
+| https://www.exolab.org/
 |
 | This product includes software developed by TouchGraph LLC
-| http://www.touchgraph.com/
+| https://www.touchgraph.com/
 |
 | This product includes software developed by Marc De Scheemaecker
 | http://nanoxml.cyberelf.be/
 |
 | This product includes software developed by the ANTLR project
-| http://www.antlr.org/
+| https://www.antlr.org/
 |
 | This product includes software developed by Chaperon
 | http://chaperon.sourceforge.net/
 |
 | This product includes software developed by Sal Mangano (included in the XSLT Cookbook published by O'Reilly)
-| http://www.oreilly.com/catalog/xsltckbk/
+| https://www.oreilly.com/catalog/xsltckbk/
 |
 | This product includes software developed by The Werken Company.
 | http://jaxen.werken.com/

--- a/doc/build.xml
+++ b/doc/build.xml
@@ -8,7 +8,7 @@
  - "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
+  -   https://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