diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml index 02fc22b1b..213203a7f 100644 --- a/.github/workflows/build_main.yml +++ b/.github/workflows/build_main.yml @@ -16,11 +16,11 @@ jobs: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} strategy: matrix: - python: [ 3.10.12 ] + python: [ 3.11.0 ] numpy: [ 1.22.4 ] gdal: [ 3.4.1 ] spark: [ 3.5.0 ] - R: [ 4.2.2 ] + R: [ 4.3.2 ] steps: - name: checkout code uses: actions/checkout@v2 diff --git a/.github/workflows/build_python.yml b/.github/workflows/build_python.yml index 1ed8ae3ff..0a884fa5e 100644 --- a/.github/workflows/build_python.yml +++ b/.github/workflows/build_python.yml @@ -12,11 +12,11 @@ jobs: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} strategy: matrix: - python: [ 3.10.12 ] + python: [ 3.11.0 ] numpy: [ 1.22.4 ] gdal: [ 3.4.1 ] spark: [ 3.5.0 ] - R: [ 4.2.2 ] + R: [ 4.3.2 ] steps: - name: checkout code uses: actions/checkout@v2 diff --git a/.github/workflows/build_r.yml b/.github/workflows/build_r.yml index 25fc202e9..dfd512b43 100644 --- a/.github/workflows/build_r.yml +++ b/.github/workflows/build_r.yml @@ -13,11 +13,11 @@ jobs: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} strategy: matrix: - python: [ 3.10.12 ] + python: [ 3.11.0 ] numpy: [ 1.22.4 ] gdal: [ 3.4.1 ] spark: [ 3.5.0 ] - R: [ 4.2.2 ] + R: [ 4.3.2 ] steps: - name: checkout code uses: actions/checkout@v2 diff --git a/.github/workflows/build_scala.yml b/.github/workflows/build_scala.yml index 91a11c9e1..e815b9dc6 100644 --- a/.github/workflows/build_scala.yml +++ b/.github/workflows/build_scala.yml @@ -11,11 +11,11 @@ jobs: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} strategy: matrix: - python: [ 3.10.12 ] + python: [ 3.11.0 ] numpy: [ 1.22.4 ] gdal: [ 3.4.1 ] spark: [ 3.5.0 ] - R: [ 4.2.2 ] + R: [ 4.3.2 ] steps: - name: checkout code uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f134937f5..f3c2d9666 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,11 +15,11 @@ jobs: contents: write strategy: matrix: - python: [ 3.10.12 ] + python: [ 3.11.0 ] numpy: [ 1.22.4 ] gdal: [ 3.4.1 ] spark: [ 3.5.0 ] - R: [ 4.2.2 ] + R: [ 4.3.2 ] steps: - name: checkout code uses: actions/checkout@v2 diff --git a/pom.xml b/pom.xml index 958fee802..69a79991f 100644 --- a/pom.xml +++ b/pom.xml @@ -87,6 +87,23 @@ 2.4.0 provided + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + com.uber @@ -254,9 +271,10 @@ true - 2.12.10 + 2.12.18 2.12 3.5.0 + 2.0.7 0.4.4 @@ -289,9 +307,10 @@ skipScoverage - 2.12.10 + 2.12.18 2.12 3.5.0 + 2.0.7 0.4.4 1.8 1.8 diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties deleted file mode 100644 index 900e724a8..000000000 --- a/src/main/resources/log4j.properties +++ /dev/null @@ -1,40 +0,0 @@ - -# 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 tpInputOf 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. -# - -# Set everything to be logged to the console -log4j.rootCategory=WARN, console -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n - -# Set the default spark-shell log level to WARN. When running the spark-shell, the -# log level for this class is used to overwrite the root logger's log level, so that -# the user can have different defaults for the shell and regular Spark apps. -log4j.logger.org.apache.spark.repl.Main=WARN - -# Settings to quiet third party logs that are too verbose -log4j.logger.org.spark_project.jetty=WARN -log4j.logger.org.spark_project.jetty.util.component.AbstractLifeCycle=ERROR -log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO -log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO -log4j.logger.org.apache.parquet=ERROR -log4j.logger.parquet=ERROR - -# SPARK-9183: Settings to avoid annoying messages when looking up nonexistent UDFs in SparkSQL with Hive support -log4j.logger.org.apache.hadoop.hive.metastore.RetryingHMSHandler=FATAL -log4j.logger.org.apache.hadoop.hive.ql.exec.FunctionRegistry=ERROR