Skip to content

Commit

Permalink
Merge ums/main into v14-main
Browse files Browse the repository at this point in the history
Conflicts:
	pom.xml
	react-client/package.json
	react-client/yarn.lock
  • Loading branch information
SurfaceS committed Sep 9, 2023
1 parent c16fe4d commit 88837bf
Show file tree
Hide file tree
Showing 3 changed files with 132 additions and 132 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
Check the org.slf4j:slf4j-api version of the other libraries before upgrading
-->
<slf4j-api-version>2.0.7</slf4j-api-version>
<slf4j-api-version>2.0.9</slf4j-api-version>

<!--
ch.qos.logback:logback-classic and logback-core is shared with
Expand Down
22 changes: 11 additions & 11 deletions react-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"proxy": "http://localhost:9001",
"dependencies": {
"@emotion/react": "11.11.1",
"@mantine/core": "6.0.19",
"@mantine/dropzone": "6.0.19",
"@mantine/form": "6.0.19",
"@mantine/hooks": "6.0.19",
"@mantine/modals": "6.0.19",
"@mantine/notifications": "6.0.19",
"@mantine/prism": "6.0.19",
"@mantine/core": "6.0.20",
"@mantine/dropzone": "6.0.20",
"@mantine/form": "6.0.20",
"@mantine/hooks": "6.0.20",
"@mantine/modals": "6.0.20",
"@mantine/notifications": "6.0.20",
"@mantine/prism": "6.0.20",
"@microsoft/fetch-event-source": "2.0.1",
"axios": "1.5.0",
"jwt-decode": "3.1.2",
Expand Down Expand Up @@ -58,13 +58,13 @@
"@testing-library/react": "14.0.0",
"@testing-library/user-event": "14.4.3",
"@types/jest": "29.5.4",
"@types/lodash": "4.14.197",
"@types/node": "18.17.13",
"@types/lodash": "4.14.198",
"@types/node": "18.17.15",
"@types/react": "18.2.21",
"@types/react-color": "3.0.6",
"@types/react-dom": "18.2.7",
"@typescript-eslint/eslint-plugin": "6.5.0",
"@typescript-eslint/parser": "6.5.0",
"@typescript-eslint/eslint-plugin": "6.6.0",
"@typescript-eslint/parser": "6.6.0",
"eslint": "8.48.0",
"eslint-plugin-react": "7.33.2",
"react-scripts": "5.0.1"
Expand Down
Loading

0 comments on commit 88837bf

Please sign in to comment.