Skip to content

Commit

Permalink
Upgrade dependencies (#220)
Browse files Browse the repository at this point in the history
  • Loading branch information
EnricoMi authored Dec 22, 2023
1 parent fddec08 commit 6129a69
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 29 deletions.
6 changes: 3 additions & 3 deletions .github/actions/build-whl/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ runs:
shell: bash

- name: Fetch Binaries Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Binaries-${{ inputs.spark-compat-version }}-${{ inputs.scala-compat-version }}
path: .
Expand All @@ -48,7 +48,7 @@ runs:
key: ${{ runner.os }}-pip-whl-${{ inputs.python-version }}-${{ inputs.spark-version }}

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ inputs.python-version }}

Expand All @@ -71,7 +71,7 @@ runs:
shell: bash

- name: Upload whl
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Whl (Spark ${{ inputs.spark-compat-version }} Scala ${{ inputs.scala-compat-version }})
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ runs:
restore-keys: ${{ runner.os }}-mvn-build-${{ inputs.spark-version }}-${{ inputs.scala-version }}-

- name: Setup JDK ${{ inputs.java-compat-version }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ inputs.java-compat-version }}
distribution: 'zulu'
Expand All @@ -51,7 +51,7 @@ runs:
shell: bash

- name: Upload Binaries
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Binaries-${{ inputs.spark-compat-version }}-${{ inputs.scala-compat-version }}
path: |
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/check-compat/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ runs:
shell: bash

- name: Fetch Binaries Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Binaries-${{ inputs.spark-compat-version }}-${{ inputs.scala-compat-version }}
path: .
Expand All @@ -44,7 +44,7 @@ runs:
${{ runner.os }}-mvn-build-${{ inputs.spark-version }}-${{ inputs.scala-version }}-
- name: Setup JDK 1.8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'zulu'
Expand Down Expand Up @@ -77,10 +77,10 @@ runs:
shell: bash

- name: Upload Report
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always() && steps.exists.outcome == 'success'
with:
name: Compat-Report
name: Compat-Report-${{ inputs.spark-compat-version }}
path: compat_reports/spark-extension/*

branding:
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/test-jvm/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ runs:
shell: bash

- name: Fetch Binaries Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Binaries-${{ inputs.spark-compat-version }}-${{ inputs.scala-compat-version }}
path: .
Expand Down Expand Up @@ -65,7 +65,7 @@ runs:
restore-keys: ${{ runner.os }}-mvn-build-${{ inputs.spark-version }}-${{ inputs.scala-version }}-

- name: Setup JDK ${{ inputs.java-compat-version }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ inputs.java-compat-version }}
distribution: 'zulu'
Expand All @@ -90,7 +90,7 @@ runs:

- name: Upload Unit Test Results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: JVM Test Results (Spark ${{ inputs.spark-version }} Scala ${{ inputs.scala-version }})
path: |
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/test-python/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ runs:
shell: bash

- name: Fetch Binaries Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Binaries-${{ inputs.spark-compat-version }}-${{ inputs.scala-compat-version }}
path: .
Expand All @@ -48,7 +48,7 @@ runs:
restore-keys: ${{ runner.os }}-mvn-build-${{ inputs.spark-version }}-${{ inputs.scala-version }}-

- name: Setup JDK 1.8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'zulu'
Expand All @@ -61,7 +61,7 @@ runs:
restore-keys: ${{ runner.os }}-pip-test-${{ inputs.python-version }}-

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ inputs.python-version }}

Expand Down Expand Up @@ -130,7 +130,7 @@ runs:

- name: Upload Test Results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Python Test Results (Spark ${{ inputs.spark-version }} Scala ${{ inputs.scala-version }} Python ${{ inputs.python-version }})
path: test-results/*.xml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-jvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build
uses: ./.github/actions/build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build
uses: ./.github/actions/build-whl
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Check
uses: ./.github/actions/check-compat
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-jvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Test
uses: ./.github/actions/test-jvm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Test
uses: ./.github/actions/test-python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Test
uses: ./.github/actions/test-jvm
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<developers>
<developer>
<id>EnricoMi</id>
<name>Enico Minack</name>
<name>Enrico Minack</name>
<email>github@enrico.minack.dev</email>
</developer>
</developers>
Expand Down Expand Up @@ -93,7 +93,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.compat.version}</artifactId>
<version>3.3.0-SNAP3</version>
<version>3.3.0-SNAP4</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -150,7 +150,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand All @@ -168,7 +168,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.1.0</version>
<version>1.2.1</version>
<executions>
<execution>
<phase>generate-resources</phase>
Expand Down Expand Up @@ -235,7 +235,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.2</version>
<configuration>
<skipTests>false</skipTests>
</configuration>
Expand Down Expand Up @@ -319,7 +319,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.2</version>
</plugin>
</plugins>
</reporting>
Expand Down

0 comments on commit 6129a69

Please sign in to comment.