From 1ef241ddce311ef419952f71ceedfc5cd195ec30 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Sun, 3 Apr 2022 15:11:37 +0200 Subject: Update dependencies. Change-Id: Id97c8c7f160e67fbf9f79b00482ebd558727a38e --- pom.xml | 15 ++++++++++----- .../java/eu/mulk/mulkcms2/benki/posts/PostTarget.java | 7 ++++++- .../java/eu/mulk/mulkcms2/benki/posts/PostTargetPK.java | 3 +++ src/main/resources/application.properties | 2 +- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 0efeb19..4d3a15d 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,8 @@ true - 17 - 17 + 18 + 18 UTF-8 UTF-8 @@ -40,8 +40,8 @@ 1.6.1 5.10.0 1.14.3 - 1.6.10 - 4.8.0 + 1.6.20 + 4.9.1 42.3.3 1.18.0 @@ -114,6 +114,12 @@ ${findbugs-jsr305.version} provided + + org.jetbrains.kotlin + kotlin-annotations-jvm + ${kotlin-annotations.version} + provided + @@ -266,7 +272,6 @@ org.jetbrains.kotlin kotlin-annotations-jvm - ${kotlin-annotations.version} provided diff --git a/src/main/java/eu/mulk/mulkcms2/benki/posts/PostTarget.java b/src/main/java/eu/mulk/mulkcms2/benki/posts/PostTarget.java index 112ca3e..c3e58c5 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/posts/PostTarget.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/posts/PostTarget.java @@ -25,6 +25,11 @@ public class PostTarget extends PanacheEntityBase { public int targetId; @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "target", referencedColumnName = "id", nullable = false) + @JoinColumn( + name = "target", + referencedColumnName = "id", + nullable = false, + insertable = false, + updatable = false) public Role target; } diff --git a/src/main/java/eu/mulk/mulkcms2/benki/posts/PostTargetPK.java b/src/main/java/eu/mulk/mulkcms2/benki/posts/PostTargetPK.java index e439ec9..f6347b2 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/posts/PostTargetPK.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/posts/PostTargetPK.java @@ -6,7 +6,10 @@ import javax.persistence.Id; public class PostTargetPK implements Serializable { + @Column(name = "message", nullable = false) private int message; + + @Column(name = "target", nullable = false) private int targetId; @Column(name = "message", nullable = false) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ee95952..9bdd4f4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -85,7 +85,7 @@ quarkus.container-image.group = mulk quarkus.container-image.name = mulkcms2 quarkus.container-image.registry = docker.benkard.de -quarkus.jib.base-jvm-image = azul/zulu-openjdk-alpine:16-jre +quarkus.jib.base-jvm-image = container-registry.oracle.com/java/openjdk:latest #quarkus.jib.jvm-arguments = -XX:+UseShenandoahGC,-XX:ShenandoahGCHeuristics=compact quarkus.jib.jvm-arguments = -XX:G1PeriodicGCInterval=300000,-XX:G1PeriodicGCSystemLoadThreshold=0 -- cgit v1.2.3