Skip to content

Commit

Permalink
updated python version dep; added logging classes
Browse files Browse the repository at this point in the history
  • Loading branch information
sllynn committed Nov 19, 2024
1 parent 6b049f8 commit f0cadec
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 52 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 21 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,23 @@
<version>2.4.0</version>
<scope>provided</scope>
</dependency>
<!-- log4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<!-- runtime scope is appropriate, but causes SBT build problems -->
</dependency>
<!--geo dependencies-->
<dependency>
<groupId>com.uber</groupId>
Expand Down Expand Up @@ -254,9 +271,10 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<scala.version>2.12.10</scala.version>
<scala.version>2.12.18</scala.version>
<scala.compat.version>2.12</scala.compat.version>
<spark.version>3.5.0</spark.version>
<slf4j.version>2.0.7</slf4j.version>
<mosaic.version>0.4.4</mosaic.version>
</properties>
<build>
Expand Down Expand Up @@ -289,9 +307,10 @@
<!-- local testing `mvn test -PskipScoverage -DskipTests=false -Dsuite=...` -->
<id>skipScoverage</id>
<properties>
<scala.version>2.12.10</scala.version>
<scala.version>2.12.18</scala.version>
<scala.compat.version>2.12</scala.compat.version>
<spark.version>3.5.0</spark.version>
<slf4j.version>2.0.7</slf4j.version>
<mosaic.version>0.4.4</mosaic.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand Down
40 changes: 0 additions & 40 deletions src/main/resources/log4j.properties

This file was deleted.

0 comments on commit f0cadec

Please sign in to comment.