This is an automated email from the ASF dual-hosted git repository. dongjoon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push: new 726ef8aa66ea Revert "[SPARK-48230][BUILD] Remove unused `jodd-core`" 726ef8aa66ea is described below commit 726ef8aa66ea6e56b739f3b16f99e457a0febb81 Author: Dongjoon Hyun <dh...@apple.com> AuthorDate: Fri May 10 15:34:12 2024 -0700 Revert "[SPARK-48230][BUILD] Remove unused `jodd-core`" This reverts commit d8151186d79459fbde27a01bd97328e73548c55a. --- LICENSE-binary | 1 + dev/deps/spark-deps-hadoop-3-hive-2.3 | 1 + licenses-binary/LICENSE-jodd.txt | 24 ++++++++++++++++++++++++ pom.xml | 6 ++++++ sql/hive/pom.xml | 4 ++++ 5 files changed, 36 insertions(+) diff --git a/LICENSE-binary b/LICENSE-binary index 034215f0ab15..40271c9924bc 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -436,6 +436,7 @@ com.esotericsoftware:reflectasm org.codehaus.janino:commons-compiler org.codehaus.janino:janino jline:jline +org.jodd:jodd-core com.github.wendykierp:JTransforms pl.edu.icm:JLargeArrays diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 29997815e5bc..392bacd73277 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -143,6 +143,7 @@ jline/2.14.6//jline-2.14.6.jar jline/3.24.1//jline-3.24.1.jar jna/5.13.0//jna-5.13.0.jar joda-time/2.12.7//joda-time-2.12.7.jar +jodd-core/3.5.2//jodd-core-3.5.2.jar jpam/1.1//jpam-1.1.jar json/1.8//json-1.8.jar json4s-ast_2.13/4.0.7//json4s-ast_2.13-4.0.7.jar diff --git a/licenses-binary/LICENSE-jodd.txt b/licenses-binary/LICENSE-jodd.txt new file mode 100644 index 000000000000..cc6b458adb38 --- /dev/null +++ b/licenses-binary/LICENSE-jodd.txt @@ -0,0 +1,24 @@ +Copyright (c) 2003-present, Jodd Team (https://jodd.org) +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +2. 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. + +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 HOLDER 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 PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/pom.xml b/pom.xml index a98efe8aed1e..56a34cedde51 100644 --- a/pom.xml +++ b/pom.xml @@ -201,6 +201,7 @@ <janino.version>3.1.9</janino.version> <jersey.version>3.0.12</jersey.version> <joda.version>2.12.7</joda.version> + <jodd.version>3.5.2</jodd.version> <jsr305.version>3.0.0</jsr305.version> <jaxb.version>2.2.11</jaxb.version> <libthrift.version>0.16.0</libthrift.version> @@ -2782,6 +2783,11 @@ <artifactId>joda-time</artifactId> <version>${joda.version}</version> </dependency> + <dependency> + <groupId>org.jodd</groupId> + <artifactId>jodd-core</artifactId> + <version>${jodd.version}</version> + </dependency> <dependency> <groupId>org.datanucleus</groupId> <artifactId>datanucleus-core</artifactId> diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 5e9fc256e7e6..3895d9dc5a63 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -152,6 +152,10 @@ <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> </dependency> + <dependency> + <groupId>org.jodd</groupId> + <artifactId>jodd-core</artifactId> + </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org