This is an automated email from the ASF dual-hosted git repository.
fokko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/main by this push:
new 97c8ba829 AVRO-3936: Clean up NOTICE file (#2729)
97c8ba829 is described below
commit 97c8ba829b4d264844bbd92588b9c562ed6efeee
Author: Fokko Driesprong <[email protected]>
AuthorDate: Mon Feb 12 08:27:04 2024 +0100
AVRO-3936: Clean up NOTICE file (#2729)
Ivy is not used anymore. A long time ago
it was used on the Python side:
https://github.com/apache/avro/blob/4f6eb207b1df2ff438d952e383041021f0275705/lang/py/build.xml
---
LICENSE.txt | 10 ----------
NOTICE.txt | 19 -------------------
build.sh | 1 -
3 files changed, 30 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index 7e159a69b..42761f6f8 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -295,16 +295,6 @@ Copyright (C) 2006 Toni Ronkko
| ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
| OTHER DEALINGS IN THE SOFTWARE.
-----------------------------------------------------------------------
-License for ivy-2.2.0.jar used in the python implementation:
-
-Apache License version 2.0 (see above)
-
-----------------------------------------------------------------------
-License for pyAntTasks-1.3.jar used in the python implementation:
-
-Apache License version 2.0 (see above)
-
----------------------------------------------------------------------
License for NUnit binary included with the C# implementation:
File: nunit.framework.dll
diff --git a/NOTICE.txt b/NOTICE.txt
index 737629b09..41fa8b76b 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -37,25 +37,6 @@ The Odiago NOTICE at the time of the contribution:
| This product includes software developed by Odiago, Inc.
| (https://www.wibidata.com).
-Apache Ivy includes the following in its NOTICE file:
-
-| Apache Ivy
-| Copyright 2007-2010 The Apache Software Foundation
-|
-| This product includes software developed by
-| The Apache Software Foundation (https://www.apache.org/).
-|
-| Portions of Ivy were originally developed by
-| Jayasoft SARL (http://www.jayasoft.fr/)
-| and are licensed to the Apache Software Foundation under the
-| "Software Grant License Agreement"
-|
-| SSH and SFTP support is provided by the JCraft JSch package,
-| which is open source software, available under
-| the terms of a BSD style license.
-| The original software and related information is available
-| at http://www.jcraft.com/jsch/.
-
Apache Log4Net includes the following in its NOTICE file:
| Apache log4net
diff --git a/build.sh b/build.sh
index db444448b..98e894b00 100755
--- a/build.sh
+++ b/build.sh
@@ -283,7 +283,6 @@ do
rm -rf lang/perl/inc/
rm -rf lang/ruby/.gem/
rm -rf lang/ruby/Gemfile.lock
- rm -rf lang/py/lib/ivy-2.2.0.jar
rm -rf lang/csharp/src/apache/ipc.test/bin/
rm -rf lang/csharp/src/apache/ipc.test/obj
;;
