Skip to content

Update JDK to 25 & pom.xml #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nielsm5 merged 5 commits into from
Mar 5, 2026
Merged

Update JDK to 25 & pom.xml #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7edd17
Update JDK to 25 & pom.xml
Matthbo Mar 4, 2026
709d4b6
Fixed formatting
Matthbo Mar 4, 2026
7553bf9
Add run configurations
Matthbo Mar 4, 2026
5f99b0d
Add hydrate fallback to keep react-router happy
Matthbo Mar 4, 2026
e95f773
Update docker image properties in pom
Matthbo Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .run/FlowApplication Cloud.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="FlowApplication Cloud" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<option name="ACTIVE_PROFILES" value="cloud" />
<module name="flow" />
<option name="SPRING_BOOT_MAIN_CLASS" value="org.frankframework.flow.FlowApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
10 changes: 10 additions & 0 deletions .run/FlowApplication Local.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="FlowApplication Local" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<option name="ACTIVE_PROFILES" value="local" />
<module name="flow" />
<option name="SPRING_BOOT_MAIN_CLASS" value="org.frankframework.flow.FlowApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
9 changes: 9 additions & 0 deletions .run/frontend _ start.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="frontend &gt; start" type="js.build_tools.npm" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/src/main/frontend/package.json" />
<command value="start" />
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
</component>
133 changes: 73 additions & 60 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,24 @@
<organizationUrl>https://frankframework.org</organizationUrl>
</developer>
<developer>
<name>Stijn Potters</name>
<email>stijn.potters@frankframework.org</email>
<organization>Frank!Framework</organization>
<organizationUrl>https://frankframework.org</organizationUrl>
</developer>
<name>Stijn Potters</name>
<email>stijn.potters@frankframework.org</email>
<organization>Frank!Framework</organization>
<organizationUrl>https://frankframework.org</organizationUrl>
</developer>
<developer>
<name>Sergi Philipsen</name>
<email>sergi@frankframework.org</email>
<organization>Frank!Framework</organization>
<organizationUrl>https://frankframework.org</organizationUrl>
</developer>
<developer>
<name>Vivy Booman</name>
<email>vivy@frankframework.org</email>
<organization>Frank!Framework</organization>
<organizationUrl>https://frankframework.org</organizationUrl>
</developer>

Copy link
Contributor

@stijnpotters1 stijnpotters1 Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Daan mist :P

Copy link
Member Author

@Matthbo Matthbo Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, staat boven jou

</developers>

<properties>
Expand All @@ -63,11 +76,11 @@
</sonar.coverage.jacoco.xmlReportPaths>

<junit.excludedTags/>
<junit.includedTags/>
<junit.includedTags/>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>25</maven.compiler.source>
<maven.compiler.target>25</maven.compiler.target>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -143,10 +156,10 @@
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>io.github.wimdeblauwe</groupId>
<artifactId>testcontainers-cypress</artifactId>
Expand Down Expand Up @@ -195,6 +208,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>${java.version}</release>
<source>${java.version}</source>
<target>${java.version}</target>
<annotationProcessorPaths>
Expand All @@ -204,7 +218,6 @@
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
<compilerArgs>--enable-preview</compilerArgs>
</configuration>
</plugin>

Expand All @@ -218,8 +231,8 @@
<include>src/main/java/**/*.java</include>
<include>src/test/java/**/*.java</include>
</includes>
<importOrder />
<removeUnusedImports />
<importOrder/>
<removeUnusedImports/>
<toggleOffOn/>
<trimTrailingWhitespace/>
<endWithNewline/>
Expand Down Expand Up @@ -377,50 +390,50 @@
</build>

<profiles>
<profile>
<id>docker</id>
<properties>
<config.image.repository>ghcr.io/frankframework</config.image.repository>
<config.image.name>webapp-template</config.image.name>
<config.image.tag>${config.image.name}</config.image.tag>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>prepare-package</id>
<phase>package</phase>
<configuration>
<target>
<exec executable="docker" failonerror="true">
<arg value="build"/>
<arg value="-f"/>
<arg value="docker/Dockerfile"/>
<arg value="--no-cache"/>
<arg value="-t"/>
<arg value="${config.image.tag}:latest"/>
<arg value="-t"/>
<arg value="${config.image.tag}:${revision}"/>
<arg value="-t"/>
<arg value="${config.image.repository}/${config.image.tag}:latest"/>
<arg value="-t"/>
<arg value="${config.image.repository}/${config.image.tag}:${revision}"/>
<arg value="."/>
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profile>
<id>docker</id>
<properties>
<config.image.repository>ghcr.io/frankframework</config.image.repository>
<config.image.name>${config.image.name}</config.image.name>
<config.image.tag>${config.image.tag}</config.image.tag>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>prepare-package</id>
<phase>package</phase>
<configuration>
<target>
<exec executable="docker" failonerror="true">
<arg value="build"/>
<arg value="-f"/>
<arg value="docker/Dockerfile"/>
<arg value="--no-cache"/>
<arg value="-t"/>
<arg value="${config.image.tag}:latest"/>
<arg value="-t"/>
<arg value="${config.image.tag}:${revision}"/>
<arg value="-t"/>
<arg value="${config.image.repository}/${config.image.tag}:latest"/>
<arg value="-t"/>
<arg value="${config.image.repository}/${config.image.tag}:${revision}"/>
<arg value="."/>
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
10 changes: 9 additions & 1 deletion src/main/frontend/app/root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { useEffect } from 'react'
import { isRouteErrorResponse, Links, Meta, Outlet, Scripts, ScrollRestoration } from 'react-router'
import { useTheme } from '~/hooks/use-theme'
import type { Route } from './+types/root'
import 'allotment/dist/style.css'
import './app.css'
import { useTheme } from '~/hooks/use-theme'
import { Toast } from './components/toast'

export const links: Route.LinksFunction = () => [
Expand Down Expand Up @@ -94,3 +94,11 @@ export function ErrorBoundary({ error }: Readonly<Route.ErrorBoundaryProps>) {
</main>
)
}

export function HydrateFallback() {
return (
<div className="flex h-screen w-full animate-pulse items-center justify-center text-slate-400">
Initializing Flow...
</div>
)
}
Loading