Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
PenghaiZhang committed Aug 15, 2024
2 parents cb83e72 + f7a57b1 commit 1e4252a
Show file tree
Hide file tree
Showing 13 changed files with 139 additions and 139 deletions.
40 changes: 20 additions & 20 deletions Source/Plugins/Core/com.equella.core/swaggerui/package-lock.json

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

2 changes: 1 addition & 1 deletion Source/Server/equellaserver/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.24.0",
"org.apache.commons" % "commons-compress" % "1.26.2",
"org.apache.curator" % "curator-client" % curatorVersion,
"org.apache.curator" % "curator-framework" % curatorVersion,
"org.apache.curator" % "curator-recipes" % curatorVersion,
Expand Down
14 changes: 7 additions & 7 deletions autotest/IntegTester/front-end/package-lock.json

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

2 changes: 1 addition & 1 deletion autotest/IntegTester/front-end/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"react-dom": "18.3.1"
},
"devDependencies": {
"@types/react": "18.3.1",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@types/md5": "2.3.5",
"mkdirp": "3.0.1",
Expand Down
2 changes: 1 addition & 1 deletion autotest/Tests/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ libraryDependencies ++= Seq(
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
"javax.jws" % "javax.jws-api" % "1.1",
"org.apache.commons" % "commons-lang3" % "3.13.0",
"org.apache.commons" % "commons-lang3" % "3.14.0",
"org.seleniumhq.selenium" % "selenium-java" % "3.141.59",
"org.easytesting" % "fest-util" % "1.2.5",
"org.easytesting" % "fest-swing" % "1.2.1",
Expand Down
28 changes: 14 additions & 14 deletions oeq-ts-rest-api/gen-io-ts/package-lock.json

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

4 changes: 2 additions & 2 deletions oeq-ts-rest-api/gen-io-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"gen": "ts-node src/index.ts --source ../src --dest ../src/gen && eslint --fix ../src"
},
"devDependencies": {
"@types/node": "18.19.31",
"@types/node": "18.19.39",
"@types/yargs": "17.0.32",
"ts-morph": "19.0.0",
"ts-node": "10.9.2",
"typescript": "5.4.5",
"yargs": "17.7.2",
"fp-ts": "2.16.5",
"fp-ts": "2.16.8",
"io-ts": "2.2.21",
"newtype-ts": "0.3.5",
"monocle-ts": "2.3.13",
Expand Down
42 changes: 21 additions & 21 deletions oeq-ts-rest-api/package-lock.json

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

6 changes: 3 additions & 3 deletions oeq-ts-rest-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"dependencies": {
"axios": "1.6.8",
"axios-cookiejar-support": "^4.0.0",
"fp-ts": "2.16.5",
"fp-ts": "2.16.8",
"io-ts": "2.2.21",
"io-ts-types": "0.5.19",
"lodash": "^4.17.21",
Expand All @@ -42,8 +42,8 @@
},
"devDependencies": {
"@types/jest": "29.5.12",
"@types/lodash": "4.17.1",
"@types/node": "18.19.31",
"@types/lodash": "4.17.6",
"@types/node": "18.19.39",
"@types/tough-cookie": "^4.0.0",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
Expand Down
28 changes: 14 additions & 14 deletions package-lock.json

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

Loading

0 comments on commit 1e4252a

Please sign in to comment.