michel/psalmenweb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to Java 17

Browse Source
This commit is contained in:
Michel ten Voorde
2025-07-15 22:35:01 +02:00
parent a104e33376
commit ab5bddf1e0
10 changed files with 68 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Psalmenweb-nieuw/Dockerfile Normal file
View File

@@ -0,0 +1,19 @@
# Use OpenJDK 17 as the base image
FROM openjdk:17-jdk-slim
# Set the working directory in the container
WORKDIR /app
# Copy the JAR file into the container
# Replace 'your-app.jar' with your actual JAR file name
COPY target/*.jar app.jar
# Expose port 8090
EXPOSE 8090
# Create a non-root user for security
RUN addgroup --system spring && adduser --system spring --ingroup spring
USER spring:spring
# Run the application
ENTRYPOINT ["java", "-jar", "app.jar"]

31
Psalmenweb-nieuw/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.4.RELEASE</version> <version>3.5.3</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>org.tenvoorde</groupId> <groupId>org.tenvoorde</groupId>
@@ -15,7 +15,7 @@
<name>psalmenweb</name> <name>psalmenweb</name>
<properties> <properties>
<java.version>11</java.version> <java.version>17</java.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -65,8 +65,9 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>com.mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-j</artifactId>
<version>9.3.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.tomcat.embed</groupId> <groupId>org.apache.tomcat.embed</groupId>
@@ -74,11 +75,15 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<version>3.0.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@@ -87,15 +92,11 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.3.3.RELEASE</version>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.cargo</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId> <artifactId>cargo-maven3-plugin</artifactId>
<version>1.8.1</version> <version>1.10.20</version>
<configuration> <configuration>
<container> <container>
<containerId>tomcat9x</containerId> <containerId>tomcat9x</containerId>

2
Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/controllers/BijbelController.java
View File

@@ -1,5 +1,6 @@
package org.tenvoorde.psalmenweb.controllers; package org.tenvoorde.psalmenweb.controllers;
import jakarta.servlet.ServletRequest;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@@ -12,7 +13,6 @@ import org.tenvoorde.psalmenweb.dao.VertalingDao;
import org.tenvoorde.psalmenweb.domain.BijbelBoek; import org.tenvoorde.psalmenweb.domain.BijbelBoek;
import org.tenvoorde.psalmenweb.domain.Bijbelvers; import org.tenvoorde.psalmenweb.domain.Bijbelvers;
import javax.servlet.ServletRequest;
import java.util.List; import java.util.List;
@Controller @Controller

9
Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/BijbelBoek.java
View File

@@ -1,18 +1,21 @@
package org.tenvoorde.psalmenweb.domain; package org.tenvoorde.psalmenweb.domain;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import javax.persistence.*;
@Getter @Setter @ToString @Getter @Setter @ToString
@Entity @Entity
@Table(name = "BOEK", schema="psalmenweb") @Table(name = "BOEK", schema="psalmenweb")
public class BijbelBoek { public class BijbelBoek {
@Id @Id
@GeneratedValue // @GeneratedValue
@Column(name = "ID") @Column(name = "ID")
private int id; private int id;

8
Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Bijbelvers.java
View File

@@ -1,10 +1,14 @@
package org.tenvoorde.psalmenweb.domain; package org.tenvoorde.psalmenweb.domain;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
@Getter @Setter @ToString @Getter @Setter @ToString
@@ -15,7 +19,7 @@ public class Bijbelvers implements Serializable {
private static final long serialVersionUID = 4765101556890177766L; private static final long serialVersionUID = 4765101556890177766L;
@Id @Id
@GeneratedValue // @GeneratedValue
@Column(name = "ID") @Column(name = "ID")
private int id; private int id;

8
Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/CatechismusVraag.java
View File

@@ -1,10 +1,14 @@
package org.tenvoorde.psalmenweb.domain; package org.tenvoorde.psalmenweb.domain;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
@Getter @Setter @ToString @Getter @Setter @ToString
@@ -15,7 +19,7 @@ public class CatechismusVraag implements Serializable {
private static final long serialVersionUID = 4234966319088621876L; private static final long serialVersionUID = 4234966319088621876L;
@Id @Id
@GeneratedValue // @GeneratedValue
@Column(name = "ID") @Column(name = "ID")
private int id; private int id;

8
Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Psalmregel.java
View File

@@ -1,10 +1,14 @@
package org.tenvoorde.psalmenweb.domain; package org.tenvoorde.psalmenweb.domain;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
@Getter @Setter @ToString @Getter @Setter @ToString
@@ -15,7 +19,7 @@ public class Psalmregel implements Serializable {
private static final long serialVersionUID = 4765101556890177766L; private static final long serialVersionUID = 4765101556890177766L;
@Id @Id
@GeneratedValue // @GeneratedValue
@Column(name = "ID") @Column(name = "ID")
private int id; private int id;

8
Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Vertaling.java
View File

@@ -1,13 +1,17 @@
package org.tenvoorde.psalmenweb.domain; package org.tenvoorde.psalmenweb.domain;
import javax.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity @Entity
@Table(name = "VERTALING", schema = "psalmenweb") @Table(name = "VERTALING", schema = "psalmenweb")
public class Vertaling { public class Vertaling {
@Id @Id
@GeneratedValue // @GeneratedValue
@Column(name = "ID") @Column(name = "ID")
private int id; private int id;

1
Psalmenweb-nieuw/src/main/resources/application.properties
View File

@@ -9,3 +9,4 @@ spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect
spring.mvc.view.prefix=/WEB-INF/views/ spring.mvc.view.prefix=/WEB-INF/views/
spring.mvc.view.suffix=.jsp spring.mvc.view.suffix=.jsp
server.port=8090

2
Psalmenweb-nieuw/src/main/webapp/WEB-INF/views/bijbel.jsp
View File

@@ -1,5 +1,5 @@
<%@ page session="false"%> <%@ page session="false"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html> <html>
<head> <head>
<title>${boek.boek} <c:if test="${boek.hoofdstukken > 1}">${hoofdstuk} </c:if>(${vertaling.afkorting})</title> <title>${boek.boek} <c:if test="${boek.hoofdstukken > 1}">${hoofdstuk} </c:if>(${vertaling.afkorting})</title>