Skip to content

Commit 024df55

Browse files
conorheffrondependabot[bot]
conorheffron
and
dependabot[bot]
authored
Release v9.0.0 (#541)
* Release v9.0.0 * Update package.json * Update package-lock.json * Update package-lock.json * Bump org.springdoc:springdoc-openapi-starter-webmvc-ui (#539) Bumps [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) from 2.8.14 to 3.0.0. - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](springdoc/springdoc-openapi@v2.8.14...v3.0.0) --- updated-dependencies: - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump spring.version from 3.5.7 to 4.0.0 (#538) Bumps `spring.version` from 3.5.7 to 4.0.0. Updates `org.springframework.boot:spring-boot` from 3.5.7 to 4.0.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) Updates `org.springframework.boot:spring-boot-starter-web` from 3.5.7 to 4.0.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) Updates `org.springframework.boot:spring-boot-starter-log4j2` from 3.5.7 to 4.0.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) Updates `org.springframework.boot:spring-boot-starter-tomcat` from 3.5.7 to 4.0.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) Updates `org.springframework.boot:spring-boot-starter-validation` from 3.5.7 to 4.0.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) Updates `org.springframework.boot:spring-boot-starter-actuator` from 3.5.7 to 4.0.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) Updates `org.springframework.boot:spring-boot-actuator-autoconfigure` from 3.5.7 to 4.0.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) Updates `org.springframework.boot:spring-boot-devtools` from 3.5.7 to 4.0.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) Updates `org.springframework.boot:spring-boot-starter-graphql` from 3.5.7 to 4.0.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) Updates `org.springframework.boot:spring-boot-starter-test` from 3.5.7 to 4.0.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.5.7 to 4.0.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.7...v4.0.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-starter-log4j2 dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-starter-tomcat dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-starter-validation dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-starter-actuator dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-actuator-autoconfigure dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-devtools dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-starter-graphql dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-version: 4.0.0 dependency-type: direct:development update-type: version-update:semver-major - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update README.md * Update SECURITY.md * Resolve conflicts upgrading to Spring Boot 4 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 60fe388 commit 024df55

14 files changed

Lines changed: 245 additions & 124 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
Personal website / portfolio [https://www.ironoc.net/](https://www.ironoc.net/)
3636

3737
## Tech Stack
38-
- Java 25 (LTS), Spring Boot 3, ReactJs 19, Maven 4, HTML5+CSS, Docker / Bash, AWS, minikube, & kubectl.
38+
- Java 25 (LTS), Spring Boot 4, ReactJs 19, Maven 4, HTML5+CSS, Docker / Bash, AWS, minikube, & kubectl.
3939

4040
##### Note: `iRonoc` is an active user of the `GitHub API` & `conorheffron` is a proud participant in the GitHub Developer Program.
4141
- The `iRonoc` PM tool is designed to streamline project management by automating project navigation & issue tracking.

‎SECURITY.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
| Version | Supported |
66
|----------| ------------------ |
7-
| 8.x.x | :white_check_mark: |
8-
| <= 7.x.x | :x: |
7+
| 9.x.x | :white_check_mark: |
8+
| <= 8.x.x | :x: |
99

1010
## Reporting a Vulnerability
1111

‎frontend/package-lock.json‎

Lines changed: 124 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@conorheffron/ironoc-frontend",
3-
"version": "8.0.11",
3+
"version": "9.0.0",
44
"private": false,
55
"license": "GPL-3.0-or-later",
66
"dependencies": {

‎pom.xml‎

Lines changed: 68 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>conorheffron</groupId>
77
<artifactId>ironoc</artifactId>
8-
<version>8.0.11</version>
8+
<version>9.0.0</version>
99
<packaging>war</packaging>
1010

1111
<distributionManagement>
@@ -25,14 +25,14 @@
2525
<maven.compiler.target>25</maven.compiler.target>
2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2727
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
28-
<spring.version>3.5.8</spring.version>
28+
<spring.version>4.0.0</spring.version>
2929
<frontend-maven-plugin.version>1.15.4</frontend-maven-plugin.version>
3030
<node.version>v24.11.0</node.version>
3131
<npm.version>11.6.2</npm.version>
3232
<kotlin.version>1.6.0</kotlin.version>
3333
<graphql.vers>14.0.0</graphql.vers>
3434
<selenium.vers>4.38.0</selenium.vers>
35-
<slf4j.vers>2.0.17</slf4j.vers>
35+
<slf4j.vers>2.20.0</slf4j.vers>
3636
<sonar.organization>conorheffron</sonar.organization>
3737
<mockito.version>5.20.0</mockito.version>
3838
</properties>
@@ -50,6 +50,11 @@
5050
<artifactId>spring-boot</artifactId>
5151
<version>${spring.version}</version>
5252
</dependency>
53+
<dependency>
54+
<groupId>org.springframework</groupId>
55+
<artifactId>spring-beans</artifactId>
56+
<version>7.0.1</version>
57+
</dependency>
5358
<dependency>
5459
<groupId>org.springframework.boot</groupId>
5560
<artifactId>spring-boot-starter-web</artifactId>
@@ -70,14 +75,36 @@
7075
<groupId>org.apache.logging.log4j</groupId>
7176
<artifactId>log4j-slf4j-impl</artifactId>
7277
</exclusion>
78+
<exclusion>
79+
<groupId>org.apache.logging.log4j</groupId>
80+
<artifactId>log4j-jul</artifactId>
81+
</exclusion>
7382
</exclusions>
7483
</dependency>
75-
<dependency>
76-
<groupId>org.springframework.boot</groupId>
77-
<artifactId>spring-boot-starter-tomcat</artifactId>
78-
<version>${spring.version}</version>
79-
<scope>provided</scope>
80-
</dependency>
84+
<dependency>
85+
<groupId>org.springframework.boot</groupId>
86+
<artifactId>spring-boot-starter-tomcat</artifactId>
87+
<version>${spring.version}</version>
88+
<exclusions>
89+
<exclusion>
90+
<groupId>org.springframework.boot</groupId>
91+
<artifactId>spring-boot-starter-logging</artifactId>
92+
</exclusion>
93+
</exclusions>
94+
<scope>provided</scope>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.springframework.boot</groupId>
98+
<artifactId>spring-boot-restclient</artifactId>
99+
<version>${spring.version}</version>
100+
<scope>provided</scope>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.springframework.boot</groupId>
104+
<artifactId>spring-boot-http-converter</artifactId>
105+
<version>${spring.version}</version>
106+
<scope>runtime</scope>
107+
</dependency>
81108
<dependency>
82109
<groupId>org.springframework.boot</groupId>
83110
<artifactId>spring-boot-starter-validation</artifactId>
@@ -109,13 +136,36 @@
109136
<scope>provided</scope>
110137
</dependency>
111138
<!-- SLF4J -->
112-
<dependency>
113-
<groupId>org.slf4j</groupId>
114-
<artifactId>slf4j-api</artifactId>
115-
<version>${slf4j.vers}</version>
116-
<scope>provided</scope>
117-
</dependency>
139+
<dependency>
140+
<groupId>org.slf4j</groupId>
141+
<artifactId>slf4j-reload4j</artifactId>
142+
<version>2.0.17</version>
143+
<scope>provided</scope>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.apache.logging.log4j</groupId>
147+
<artifactId>log4j-api</artifactId>
148+
<version>${slf4j.vers}</version>
149+
<scope>provided</scope>
150+
</dependency>
151+
<dependency>
152+
<groupId>org.apache.logging.log4j</groupId>
153+
<artifactId>log4j-core</artifactId>
154+
<version>${slf4j.vers}</version>
155+
<scope>provided</scope>
156+
</dependency>
157+
<dependency>
158+
<groupId>org.apache.logging.log4j</groupId>
159+
<artifactId>log4j-slf4j-impl</artifactId>
160+
<version>${slf4j.vers}</version>
161+
<scope>provided</scope>
162+
</dependency>
118163
<!-- GraphQL -->
164+
<dependency>
165+
<groupId>org.springframework.graphql</groupId>
166+
<artifactId>spring-graphql</artifactId>
167+
<version>2.0.0</version>
168+
</dependency>
119169
<dependency>
120170
<groupId>org.springframework.boot</groupId>
121171
<artifactId>spring-boot-starter-graphql</artifactId>
@@ -125,7 +175,7 @@
125175
<dependency>
126176
<groupId>com.graphql-java</groupId>
127177
<artifactId>java-dataloader</artifactId>
128-
<version>5.0.2</version>
178+
<version>6.0.0</version>
129179
<scope>provided</scope>
130180
</dependency>
131181
<dependency>
@@ -155,12 +205,6 @@
155205
<version>11.1.0</version>
156206
<scope>runtime</scope>
157207
</dependency>
158-
<dependency>
159-
<groupId>com.graphql-java-kickstart</groupId>
160-
<artifactId>graphql-spring-boot-starter-test</artifactId>
161-
<version>${graphql.vers}</version>
162-
<scope>test</scope>
163-
</dependency>
164208
<!-- Jackson for JSON processing -->
165209
<dependency>
166210
<groupId>com.fasterxml.jackson.core</groupId>
@@ -249,7 +293,7 @@
249293
<dependency>
250294
<groupId>net.bytebuddy</groupId>
251295
<artifactId>byte-buddy</artifactId>
252-
<version>1.17.8</version>
296+
<version>1.18.2</version>
253297
<scope>test</scope>
254298
</dependency>
255299
<!-- Selenium-->
@@ -299,7 +343,7 @@
299343
<dependency>
300344
<groupId>org.springdoc</groupId>
301345
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
302-
<version>2.8.14</version>
346+
<version>3.0.0</version>
303347
</dependency>
304348
<dependency>
305349
<groupId>io.swagger.core.v3</groupId>

‎src/main/java/net/ironoc/portfolio/config/IronocConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.boot.info.BuildProperties;
1212
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
13-
import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
13+
import org.springframework.boot.web.server.servlet.ConfigurableServletWebServerFactory;
1414
import org.springframework.context.annotation.Bean;
1515
import org.springframework.context.annotation.ComponentScan;
1616
import org.springframework.context.annotation.Configuration;

‎src/main/java/net/ironoc/portfolio/service/CoffeesService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import net.ironoc.portfolio.domain.CoffeeDomain;
88
import net.ironoc.portfolio.logger.AbstractLogger;
99
import org.springframework.beans.factory.annotation.Autowired;
10-
import org.springframework.boot.web.client.RestTemplateBuilder;
10+
import org.springframework.boot.restclient.RestTemplateBuilder;
1111
import org.springframework.http.ResponseEntity;
1212
import org.springframework.scheduling.annotation.Scheduled;
1313
import org.springframework.stereotype.Service;

‎src/main/java/net/ironoc/portfolio/service/GraphQLClientService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import net.ironoc.portfolio.logger.AbstractLogger;
99
import org.apache.commons.lang3.StringUtils;
1010
import org.springframework.beans.factory.annotation.Autowired;
11-
import org.springframework.boot.web.client.RestTemplateBuilder;
11+
import org.springframework.boot.restclient.RestTemplateBuilder;
1212
import org.springframework.core.io.Resource;
1313
import org.springframework.core.io.ResourceLoader;
1414
import org.springframework.http.HttpHeaders;

‎src/main/resources/application.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ spring:
7575
springdoc:
7676
api-docs:
7777
path: /api-docs
78+
enabled: true
7879
swagger-ui:
7980
path: /swagger-ui-ironoc.html
8081
operationsSorter: method
82+
enabled: true
8183

8284
server:
8385
forward-headers-strategy: framework

‎src/main/resources/graphiql/index.html‎

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,22 @@
1919
font-size: 4rem;
2020
}
2121
</style>
22-
<link rel="stylesheet" href="https://esm.sh/graphiql@5.0.0/dist/style.css"/>
23-
<link rel="stylesheet" href="https://esm.sh/@graphiql/plugin-explorer@5.0.0/dist/style.css"/>
22+
<link rel="stylesheet" href="https://esm.sh/graphiql@5.2.1/dist/style.css"/>
23+
<link rel="stylesheet" href="https://esm.sh/@graphiql/plugin-explorer@5.1.1/dist/style.css"/>
2424
<script type="importmap">
2525
{
2626
"imports": {
2727
"react": "https://esm.sh/react@19.1.0",
28-
"react/jsx-runtime": "https://esm.sh/react@19.1.0/jsx-runtime",
28+
"react/": "https://esm.sh/react@19.1.0/",
2929
"react-dom": "https://esm.sh/react-dom@19.1.0",
30-
"react-dom/client": "https://esm.sh/react-dom@19.1.0/client",
31-
"graphiql": "https://esm.sh/graphiql@5.0.0?standalone&external=react,react-dom,@graphiql/react,graphql",
32-
"@graphiql/plugin-explorer": "https://esm.sh/@graphiql/plugin-explorer@5.0.0?standalone&external=react,@graphiql/react,graphql",
33-
"@graphiql/react": "https://esm.sh/@graphiql/react@0.35.0?standalone&external=react,react-dom,graphql",
30+
"react-dom/": "https://esm.sh/react-dom@19.1.0/",
31+
"graphiql": "https://esm.sh/graphiql@5.2.1?standalone&external=react,react-dom,@graphiql/react,graphql",
32+
"graphiql/": "https://esm.sh/graphiql@5.2.1/",
33+
"@graphiql/plugin-explorer": "https://esm.sh/@graphiql/plugin-explorer@5.1.1?standalone&external=react,@graphiql/react,graphql",
34+
"@graphiql/react": "https://esm.sh/@graphiql/react@0.37.2?standalone&external=react,react-dom,graphql,@graphiql/toolkit,@emotion/is-prop-valid",
3435
"@graphiql/toolkit": "https://esm.sh/@graphiql/toolkit@0.11.3?standalone&external=graphql",
35-
"graphql": "https://esm.sh/graphql@16.11.0"
36+
"graphql": "https://esm.sh/graphql@16.11.0",
37+
"@emotion/is-prop-valid": "data:text/javascript,"
3638
}
3739
}
3840
</script>
@@ -42,33 +44,18 @@
4244
import { GraphiQL, HISTORY_PLUGIN } from 'graphiql';
4345
import { createGraphiQLFetcher } from '@graphiql/toolkit';
4446
import { explorerPlugin } from '@graphiql/plugin-explorer';
45-
46-
import createJSONWorker from 'https://esm.sh/monaco-editor/esm/vs/language/json/json.worker.js?worker';
47-
import createGraphQLWorker from 'https://esm.sh/monaco-graphql/esm/graphql.worker.js?worker';
48-
import createEditorWorker from 'https://esm.sh/monaco-editor/esm/vs/editor/editor.worker.js?worker';
49-
50-
globalThis.MonacoEnvironment = {
51-
getWorker(_workerId, label) {
52-
switch (label) {
53-
case 'json':
54-
return createJSONWorker();
55-
case 'graphql':
56-
return createGraphQLWorker();
57-
}
58-
return createEditorWorker();
59-
},
60-
};
47+
import 'graphiql/setup-workers/esm.sh';
6148

6249
const params = new URLSearchParams(window.location.search);
63-
const path = params.get("path") || "/graphql";
50+
const path = params.get('path') || '/graphql';
6451
const url = `${location.protocol}//${location.host}${path}`;
65-
const wsPath = params.get("wsPath") || "/graphql";
52+
const wsPath = params.get('wsPath') || '/graphql';
6653
const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
6754
const subscriptionUrl = `${wsProtocol}//${location.host}${wsPath}`;
6855
const gqlFetcher = createGraphiQLFetcher({'url': url, 'subscriptionUrl': subscriptionUrl});
6956
const plugins = [HISTORY_PLUGIN, explorerPlugin()];
7057
const xsrfToken = document.cookie.match(new RegExp('(?:^| )XSRF-TOKEN=([^;]+)'));
71-
const initialHeaders = xsrfToken ? `{ "X-XSRF-TOKEN" : "${ xsrfToken[1] }" }` : `{}`;
58+
const initialHeaders = xsrfToken ? `{ 'X-XSRF-TOKEN' : '${ xsrfToken[1] }' }` : undefined;
7259

7360
function App() {
7461
return React.createElement(GraphiQL, {

0 commit comments

Comments
 (0)