Skip to content

Commit

Permalink
Merge branch 'fix/OPHKIOS-91_further-deps-upgrades' into merge-VKT-up…
Browse files Browse the repository at this point in the history
…dates-v2
  • Loading branch information
pkoivisto committed Sep 11, 2024
2 parents 2554b41 + 9e2ef00 commit bbbc4b1
Show file tree
Hide file tree
Showing 8 changed files with 225 additions and 142 deletions.
8 changes: 4 additions & 4 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
<plugin.prettier.goal>write</plugin.prettier.goal>

<!-- openai v2 https://springdoc.org/#migrating-from-springdoc-v1 -->
<springdoc-openapi.version>2.5.0</springdoc-openapi.version>
<springdoc-openapi.version>2.6.0</springdoc-openapi.version>
<!-- latest version for Java 17 https://github.com/lukas-krecan/ShedLock#versions -->
<shedlock.version>4.47.0</shedlock.version>
<shedlock.version>4.48.0</shedlock.version>
<poi.version>5.3.0</poi.version>
<liquibase.version>4.27.0</liquibase.version>
<liquibase.version>4.29.1</liquibase.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -139,7 +139,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.17.2</version>
<version>1.18.1</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
Expand Down
8 changes: 4 additions & 4 deletions backend/vkt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependency>
<groupId>com.github.jhonnymertz</groupId>
<artifactId>java-wkhtmltopdf-wrapper</artifactId>
<version>1.2.0-RELEASE</version>
<version>1.3.1-RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.session</groupId>
Expand All @@ -41,17 +41,17 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.15.3</version>
<version>2.17.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>6.5.0</version>
<version>6.7.0</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns-native-macos</artifactId>
<version>4.1.100.Final</version>
<version>4.1.112.Final</version>
<classifier>osx-aarch_64</classifier>
<scope>runtime</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"i18next-browser-languagedetector": "^7.1.0",
"js-cookie": "^3.0.5",
"normalize.css": "^8.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-i18next": "^13.3.1",
"react-redux": "^8.1.3",
"react-router-dom": "6.13.0",
"react-router-dom": "6.26.1",
"redux-saga": "^1.2.3"
},
"devDependencies": {
Expand Down Expand Up @@ -106,7 +106,7 @@
"stylelint-webpack-plugin": "^4.1.1",
"ts-unused-exports": "^10.0.1",
"typescript": "^5.2.2",
"webpack": "^5.89.0",
"webpack": "^5.94.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
},
Expand Down
5 changes: 5 additions & 0 deletions frontend/packages/shared/CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Released]

## [1.11.0] - 2024-09-11

### Changed
- Updated react-router-dom, causing changes to useNavigationBlocker

## [1.10.8] - 2024-08-26

### Changed
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/shared/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opetushallitus/kieli-ja-kaantajatutkinnot.shared",
"version": "1.10.8",
"version": "1.11.0",
"description": "Shared Frontend Package",
"exports": {
"./components": "./src/components/index.tsx",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCallback, useEffect } from 'react';
import { Location, unstable_useBlocker as useBlocker } from 'react-router-dom';
import { Location, useBlocker } from 'react-router-dom';

export const useNavigationProtection = (
when: boolean,
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/vkt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
},
"dependencies": {
"reduxjs-toolkit-persist": "^7.2.1",
"shared": "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.10.8"
"shared": "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.0"
}
}
Loading

0 comments on commit bbbc4b1

Please sign in to comment.