Skip to content

Commit

Permalink
#165: Update dependencies (#166)
Browse files Browse the repository at this point in the history
  • Loading branch information
kaklakariada authored Mar 12, 2024
1 parent 0ee5855 commit 46efae6
Show file tree
Hide file tree
Showing 61 changed files with 1,157 additions and 951 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/broken_links_checker.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions .github/workflows/ci-build-next-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: CI Build next Java

on:
push:
branches:
- main
branches: ["main"]
pull_request:

jobs:
Expand All @@ -18,18 +17,18 @@ jobs:
with:
fetch-depth: 1
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.20"
id: go
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 17
cache: "maven"
- name: Cache go modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
Expand All @@ -41,8 +40,7 @@ jobs:
- name: Run tests and build with Maven
run: |
mvn --batch-mode --update-snapshots clean package -DtrimStackTrace=false \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
mvn --batch-mode --update-snapshots clean package -DtrimStackTrace=false -Djava.version=17
- name: Publish Test Report
uses: scacap/action-surefire-report@v1
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
Expand Down
24 changes: 13 additions & 11 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,22 @@ jobs:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.20"
id: go

- name: Set up JDK 11
uses: actions/setup-java@v3
- name: Set up JDKs
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
java-version: |
11
17
cache: "maven"

- name: Cache go modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
Expand All @@ -48,7 +50,7 @@ jobs:
id: npm-cache-dir
run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
- name: Cache npm modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.npm-cache-dir.outputs.dir }}
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -57,7 +59,7 @@ jobs:
- name: Install Poetry
run: pipx install poetry
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.8"
cache: "poetry"
Expand Down Expand Up @@ -155,7 +157,7 @@ jobs:
- name: Check out code
uses: actions/checkout@v4
- name: Cache OpenFastTrace
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: oft-${{ hashFiles('ci/trace-requirements.sh') }}
Expand All @@ -174,9 +176,9 @@ jobs:
- name: Check out code
uses: actions/checkout@v4
- name: Run golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v4
with:
version: v1.54.2
version: v1.56.2
args: --timeout=15m

build-python-udf:
Expand All @@ -189,7 +191,7 @@ jobs:
uses: actions/checkout@v4
- name: Install Poetry
run: pipx install poetry
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.8"
cache: "poetry"
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/dependencies_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
- name: Set up JDKs
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
java-version: |
11
17
cache: "maven"
- name: Install to local maven repo
# This avoids this error:
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/project-keeper-verify.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions .github/workflows/project-keeper.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions .github/workflows/release_droid_prepare_original_checksum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,21 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Set up JDK 11
uses: actions/setup-java@v3
- name: Set up JDKs
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
java-version: |
11
17
cache: "maven"
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.20"
id: go
- name: Cache go modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/release_droid_print_quick_checksum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,21 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Set up JDK 11
uses: actions/setup-java@v3
- name: Set up JDKs
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
java-version: |
11
17
cache: "maven"
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.20"
id: go
- name: Cache go modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/release_droid_release_on_maven_central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ jobs:
with:
fetch-depth: 0
- name: Set up Maven Central Repository
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
java-version: |
11
17
cache: "maven"
server-id: ossrh
server-username: MAVEN_USERNAME
Expand All @@ -24,12 +26,12 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.20"
id: go
- name: Cache go modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/release_droid_upload_github_release_assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,21 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v3
- name: Set up JDKs
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
java-version: |
11
17
cache: "maven"
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.20"
id: go
- name: Cache go modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
Expand Down
4 changes: 3 additions & 1 deletion .project-keeper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ sources:
path: registry-upload/package.json
- type: npm
path: pkg/parameterValidator/package.json
version: 0.5.7
version: 0.5.8
linkReplacements:
- "Unknown|https://github.com/DATA-DOG/go-sqlmock/blob/master/LICENSE"
- "https://github.com/swagger-api/swagger-core/modules/swagger-annotations|https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-annotations"
- "jquery.org/license|https://jquery.org/license/"
- "https://github.com/swagger-api/swagger-codegen/modules/swagger-codegen-maven-plugin|https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen-maven-plugin"
excludes:
# We use the PK shell script instead of the Maven plugin
- "W-PK-CORE-151: Pom file '.*/pom.xml' contains no reference to project-keeper-maven-plugin."
5 changes: 3 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
},
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.organizeImports": true,
"source.generate.finalModifiers": true
"source.organizeImports": "explicit",
"source.generate.finalModifiers": "explicit",
"source.fixAll": "explicit"
},
"java.saveActions.organizeImports": true,
"java.sources.organizeImports.starThreshold": 3,
Expand Down
2 changes: 1 addition & 1 deletion ci/trace-requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -o errexit
set -o nounset
set -o pipefail

oft_version="3.7.0"
oft_version="3.8.0"

base_dir="$( cd "$(dirname "$0")/.." >/dev/null 2>&1 ; pwd -P )"
readonly base_dir
Expand Down
3 changes: 2 additions & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"bytes"
"errors"
"flag"
"fmt"
"os"
Expand Down Expand Up @@ -40,7 +41,7 @@ func main() {

func startServer(pathToExtensionFolder string, serverAddress string, addCauseToInternalServerError bool) error {
if pathToExtensionFolder == "" {
return fmt.Errorf("please specify extension registry with parameter '-extensionRegistryURL'")
return errors.New("please specify extension registry with parameter '-extensionRegistryURL'")
}
log.Printf("Starting extension manager with extension folder %q", pathToExtensionFolder)
controller, err := extensionController.CreateWithValidatedConfig(extensionController.ExtensionManagerConfig{
Expand Down
Loading

0 comments on commit 46efae6

Please sign in to comment.