From 69c5d4a71f9dab2b272d73740212b0b81724cd32 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 18 Feb 2023 16:30:45 +0100 Subject: [PATCH] Added missing dependency for PhaseImExporter --- ccm-cms/package-lock.json | 4 ++-- ccm-cms/package.json | 2 +- .../main/java/org/librecms/lifecycle/PhaseImExporter.java | 7 ++++++- .../src/main/java/org/libreccm/security/JwtProvider.java | 1 - 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ccm-cms/package-lock.json b/ccm-cms/package-lock.json index 67d81871a..17402fd86 100644 --- a/ccm-cms/package-lock.json +++ b/ccm-cms/package-lock.json @@ -1,12 +1,12 @@ { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2023-02-16T191702", + "version": "7.0.0-SNAPSHOT.2023-02-18T145938", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2023-02-16T191702", + "version": "7.0.0-SNAPSHOT.2023-02-18T145938", "license": "LGPL-3.0-or-later", "dependencies": { "@tiptap/core": "^2.0.0-beta.127", diff --git a/ccm-cms/package.json b/ccm-cms/package.json index 196c0fe25..497974e4f 100644 --- a/ccm-cms/package.json +++ b/ccm-cms/package.json @@ -1,6 +1,6 @@ { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2023-02-16T191702", + "version": "7.0.0-SNAPSHOT.2023-02-18T145938", "description": "JavaScript stuff for ccm-cms", "main": "target/generated-resources/assets/@content-sections/cms-admin.js", "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts", diff --git a/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseImExporter.java b/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseImExporter.java index 2a9289d80..e26421b14 100644 --- a/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseImExporter.java +++ b/ccm-cms/src/main/java/org/librecms/lifecycle/PhaseImExporter.java @@ -23,6 +23,7 @@ import org.libreccm.imexport.Processes; import java.util.Objects; import java.util.Optional; +import java.util.Set; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; @@ -43,7 +44,11 @@ public class PhaseImExporter @PostConstruct @Override protected void init() { - // Nothing + addRequiredEntities( + Set.of( + PhaseDefinition.class + ) + ); } @Override diff --git a/ccm-core/src/main/java/org/libreccm/security/JwtProvider.java b/ccm-core/src/main/java/org/libreccm/security/JwtProvider.java index f00378bc4..346f01d83 100644 --- a/ccm-core/src/main/java/org/libreccm/security/JwtProvider.java +++ b/ccm-core/src/main/java/org/libreccm/security/JwtProvider.java @@ -43,7 +43,6 @@ import java.util.Random; import javax.crypto.spec.SecretKeySpec; import javax.json.Json; import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; import javax.json.JsonReader; import javax.transaction.Transactional; import javax.ws.rs.POST;