This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 2.1.X
in repository https://gitbox.apache.org/repos/asf/mina.git
The following commit(s) were added to refs/heads/2.1.X by this push:
new 050b3db1e Updated the slf4j and jzlib licenses, removed the ognl one,
removed the jdom dependency, moved some dependencies to scope test
050b3db1e is described below
commit 050b3db1e07ab8058a910acb000371c96d633e4c
Author: emmanuel lecharny <elecha...@apache.org>
AuthorDate: Wed Sep 20 15:21:26 2023 +0200
Updated the slf4j and jzlib licenses, removed the ognl one, removed the
jdom dependency, moved some dependencies to scope test
---
LICENSE.jzlib.txt | 2 +-
LICENSE.ognl.txt | 10 ----------
LICENSE.slf4j.txt | 41 ++++++++++++++++++-----------------------
mina-legal/pom.xml | 6 ------
pom.xml | 9 +--------
5 files changed, 20 insertions(+), 48 deletions(-)
diff --git a/LICENSE.jzlib.txt b/LICENSE.jzlib.txt
index cdce5007d..6859c59de 100644
--- a/LICENSE.jzlib.txt
+++ b/LICENSE.jzlib.txt
@@ -2,7 +2,7 @@ JZlib 0.0.* were released under the GNU LGPL license. Later,
we have switched
over to a BSD-style license.
------------------------------------------------------------------------------
-Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
+Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/LICENSE.ognl.txt b/LICENSE.ognl.txt
deleted file mode 100644
index 947f642c7..000000000
--- a/LICENSE.ognl.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-OGNL is the creation of Luke Blanshard and Drew Davidson.
-
-Copyright © 1997-2003, Drew Davidson and Luke Blanshard. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer. Redistributions in binary form
must reproduce the above copyright notice, this list of conditions and the
following disclaimer in the documentation and/or other materials provided with
the distribution. Neither the name of the Drew Davidson nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior [...]
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFI [...]
-
diff --git a/LICENSE.slf4j.txt b/LICENSE.slf4j.txt
index e663b1d7f..a51675a21 100644
--- a/LICENSE.slf4j.txt
+++ b/LICENSE.slf4j.txt
@@ -1,28 +1,23 @@
-Copyright (c) 2004-2007 QOS.ch
+Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
diff --git a/mina-legal/pom.xml b/mina-legal/pom.xml
index ecfe84071..2014ecdd2 100644
--- a/mina-legal/pom.xml
+++ b/mina-legal/pom.xml
@@ -34,12 +34,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <optional>true</optional>
- </dependency>
-
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index c443215a4..ee982edd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,6 @@
<!-- Jars -->
<version.easymock>2.5.2</version.easymock>
<version.jboss.javassist>3.8.0.GA</version.jboss.javassist>
- <version.jdom>1.0</version.jdom>
<version.jmock>1.2.0</version.jmock>
<version.junit>4.13.2</version.junit>
<version.jzlib>1.1.3</version.jzlib>
@@ -286,18 +285,12 @@
<version>${version.jboss.javassist}</version>
</dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>${version.jdom}</version>
- <optional>true</optional>
- </dependency>
-
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>${version.jmock}</version>
<optional>true</optional>
+ <scope>test</scope>
</dependency>
<dependency>
