diff options
| -rw-r--r-- | pom.xml | 15 | ||||
| -rw-r--r-- | src/main/java/eu/mulk/mulkcms2/benki/posts/PostTarget.java | 7 | ||||
| -rw-r--r-- | src/main/java/eu/mulk/mulkcms2/benki/posts/PostTargetPK.java | 3 | ||||
| -rw-r--r-- | src/main/resources/application.properties | 2 |
4 files changed, 20 insertions, 7 deletions
@@ -12,8 +12,8 @@ <properties> <maven.compiler.parameters>true</maven.compiler.parameters> - <maven.compiler.source>17</maven.compiler.source> - <maven.compiler.target>17</maven.compiler.target> + <maven.compiler.source>18</maven.compiler.source> + <maven.compiler.target>18</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -40,8 +40,8 @@ <jakarta-jacc-api.version>1.6.1</jakarta-jacc-api.version> <jna.version>5.10.0</jna.version> <jsoup.version>1.14.3</jsoup.version> - <kotlin-annotations.version>1.6.10</kotlin-annotations.version> - <liquibase.version>4.8.0</liquibase.version> + <kotlin-annotations.version>1.6.20</kotlin-annotations.version> + <liquibase.version>4.9.1</liquibase.version> <postgresql.version>42.3.3</postgresql.version> <rome.version>1.18.0</rome.version> </properties> @@ -114,6 +114,12 @@ <version>${findbugs-jsr305.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-annotations-jvm</artifactId> + <version>${kotlin-annotations.version}</version> + <scope>provided</scope> + </dependency> </dependencies> </dependencyManagement> @@ -266,7 +272,6 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-annotations-jvm</artifactId> - <version>${kotlin-annotations.version}</version> <scope>provided</scope> </dependency> 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 |