Merge remote-tracking branch 'github/develop' into develop

openequella · Sep 25, 2023 · 3fd5152 · 3fd5152
2 parents 0c74a9a + dcddea5
commit 3fd5152
Show file tree

Hide file tree

Showing 15 changed files with 102 additions and 102 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,7 +22,7 @@ jobs:
   build_and_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: NPM Cache
         uses: actions/cache@v3
@@ -133,7 +133,7 @@ jobs:
     steps:
       # Using v1 (rather than v2) through-out this workflow due to issue:
       # https://github.com/actions/checkout/issues/237
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: NPM Cache
         uses: actions/cache@v3
@@ -182,7 +182,7 @@ jobs:
   build_import_export_tool:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 11
         uses: actions/setup-java@v3
@@ -250,7 +250,7 @@ jobs:
           distribution: adopt
           java-version: 11
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup node
         uses: actions/setup-node@v3
@@ -360,7 +360,7 @@ jobs:
       AUTOTEST_CONFIG: autotest/github-actions.conf
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install OS dependencies
         run: |

diff --git a/Source/Server/equellaserver/build.sbt b/Source/Server/equellaserver/build.sbt
@@ -22,7 +22,7 @@ val TomcatVersion     = "9.0.80"
 val axis2Version      = "1.8.2"
 val circeVersion      = "0.14.5"
 val curatorVersion    = "5.5.0"
-val cxfVersion        = "3.6.1"
+val cxfVersion        = "3.6.2"
 val fs2Version        = "2.5.11"
 val guiceVersion      = "5.1.0"
 val jsassVersion      = "5.10.5"
@@ -137,7 +137,7 @@ libraryDependencies ++= Seq(
   "org.apache.axis2"   % "axis2-adb"                % axis2Version,
   "org.apache.axis2"   % "axis2-transport-http"     % axis2Version,
   "org.apache.axis2"   % "axis2-transport-local"    % axis2Version,
-  "org.apache.commons" % "commons-compress"         % "1.23.0",
+  "org.apache.commons" % "commons-compress"         % "1.24.0",
   "org.apache.curator" % "curator-client"           % curatorVersion,
   "org.apache.curator" % "curator-framework"        % curatorVersion,
   "org.apache.curator" % "curator-recipes"          % curatorVersion,

diff --git a/autotest/IntegTester/build.sbt b/autotest/IntegTester/build.sbt
@@ -9,7 +9,7 @@ val CirceVersion  = "0.12.1"
 val Http4sVersion = "0.21.8"
 val jsoupVersion  = "1.16.1"
 
-scalaVersion := "2.13.11"
+scalaVersion := "2.13.12"
 
 excludeDependencies ++= Seq("org.typelevel" % "scala-library")
 

diff --git a/autotest/Tests/build.sbt b/autotest/Tests/build.sbt
@@ -9,7 +9,7 @@ inConfig(Serial)(Defaults.testTasks)
 val circeVersion  = "0.12.1"
 val http4sVersion = "0.21.8"
 val catsVersion   = "2.10.0"
-val cxfVersion    = "3.6.1"
+val cxfVersion    = "3.6.2"
 
 addCompilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full)
 

diff --git a/oeq-ts-rest-api/gen-io-ts/package-lock.json b/oeq-ts-rest-api/gen-io-ts/package-lock.json
diff --git a/oeq-ts-rest-api/gen-io-ts/package.json b/oeq-ts-rest-api/gen-io-ts/package.json
@@ -8,7 +8,7 @@
     "gen": "ts-node src/index.ts --source ../src --dest ../src/gen  && eslint --fix ../src"
   },
   "devDependencies": {
-    "@types/node": "18.17.14",
+    "@types/node": "18.17.15",
     "@types/yargs": "17.0.24",
     "ts-morph": "19.0.0",
     "ts-node": "10.9.1",

diff --git a/oeq-ts-rest-api/package-lock.json b/oeq-ts-rest-api/package-lock.json
diff --git a/oeq-ts-rest-api/package.json b/oeq-ts-rest-api/package.json
@@ -44,12 +44,12 @@
   "devDependencies": {
     "@types/jest": "29.5.4",
     "@types/lodash": "4.14.198",
-    "@types/node": "18.17.14",
+    "@types/node": "18.17.15",
     "@types/tough-cookie": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "5.62.0",
     "@typescript-eslint/parser": "5.62.0",
     "core-js": "3.32.2",
-    "eslint": "8.48.0",
+    "eslint": "8.49.0",
     "eslint-plugin-unused-imports": "2.0.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-jest": "27.2.3",
@@ -58,7 +58,7 @@
     "jest": "29.6.4",
     "jest-config": "29.6.4",
     "prettier": "2.8.8",
-    "rollup": "3.29.0",
+    "rollup": "3.29.1",
     "rollup-plugin-typescript2": "0.35.0",
     "ts-jest": "29.1.1",
     "tslib": "2.6.2",