diff --git a/cms-api/pom.xml b/cms-api/pom.xml index 12929dd67..4f38e26ce 100644 --- a/cms-api/pom.xml +++ b/cms-api/pom.xml @@ -44,10 +44,5 @@ com.google.inject guice - - com.google.auto.service - auto-service - true - diff --git a/cms-api/src/test/java/com/condation/cms/api/query/QueryGatewayTest.java b/cms-api/src/test/java/com/condation/cms/api/query/QueryGatewayTest.java index 043a6eeb7..622c7f671 100644 --- a/cms-api/src/test/java/com/condation/cms/api/query/QueryGatewayTest.java +++ b/cms-api/src/test/java/com/condation/cms/api/query/QueryGatewayTest.java @@ -23,11 +23,6 @@ */ -import com.condation.cms.api.query.Query; -import com.condation.cms.api.query.QueryGateway; -import com.condation.cms.api.query.QueryHandler; -import com.condation.cms.api.query.QueryProvider; -import com.google.auto.service.AutoService; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -69,25 +64,5 @@ public String handle(CustomQuery query) { return "hello " + query.name(); } - } - - @AutoService(QueryProvider.class) - public static class SecondQueryProvider implements QueryProvider { - - @Override - public Class> queryClass() { - return SecondQuery.class; - } - - @Override - public QueryHandler handler() { - return (query) -> { - return "hello " + query.name(); - }; - } - - public static record SecondQuery(String name) implements Query { - - } - } + } } diff --git a/cms-api/src/test/java/com/condation/cms/api/query/SecondQueryProvider.java b/cms-api/src/test/java/com/condation/cms/api/query/SecondQueryProvider.java new file mode 100644 index 000000000..dfcc8af04 --- /dev/null +++ b/cms-api/src/test/java/com/condation/cms/api/query/SecondQueryProvider.java @@ -0,0 +1,45 @@ +package com.condation.cms.api.query; + +/*- + * #%L + * cms-api + * %% + * Copyright (C) 2023 - 2024 CondationCMS + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * . + * #L% + */ + +/** + * + * @author t.marx + */ +public class SecondQueryProvider implements QueryProvider { + + @Override + public Class> queryClass() { + return SecondQuery.class; + } + + @Override + public QueryHandler handler() { + return query -> { + return "hello " + query.name(); + }; + } + public static record SecondQuery (String name) implements Query { + } + +} diff --git a/cms-api/src/test/resources/META-INF/services/com.condation.cms.api.query.QueryProvider b/cms-api/src/test/resources/META-INF/services/com.condation.cms.api.query.QueryProvider new file mode 100644 index 000000000..4dce5e82c --- /dev/null +++ b/cms-api/src/test/resources/META-INF/services/com.condation.cms.api.query.QueryProvider @@ -0,0 +1 @@ +com.condation.cms.api.query.SecondQueryProvider \ No newline at end of file diff --git a/cms-content/pom.xml b/cms-content/pom.xml index 842206609..90a7ec985 100644 --- a/cms-content/pom.xml +++ b/cms-content/pom.xml @@ -30,7 +30,6 @@ com.github.slugify slugify - 3.0.7 org.jsoup diff --git a/cms-core/pom.xml b/cms-core/pom.xml index 9a1d100b1..e553a3114 100644 --- a/cms-core/pom.xml +++ b/cms-core/pom.xml @@ -26,7 +26,6 @@ org.quartz-scheduler quartz - 2.3.2 com.zaxxer diff --git a/cms-git/pom.xml b/cms-git/pom.xml index 8ff39c9ec..d5f4acb12 100644 --- a/cms-git/pom.xml +++ b/cms-git/pom.xml @@ -12,7 +12,6 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0.202409031743-r org.projectlombok @@ -26,7 +25,6 @@ org.quartz-scheduler quartz - 2.3.2 com.zaxxer diff --git a/cms-media/pom.xml b/cms-media/pom.xml index b85e32c35..05f7d3390 100644 --- a/cms-media/pom.xml +++ b/cms-media/pom.xml @@ -26,7 +26,6 @@ net.coobird thumbnailator - 0.4.20 diff --git a/cms-server/pom.xml b/cms-server/pom.xml index 8abd041e6..6730ac6dd 100644 --- a/cms-server/pom.xml +++ b/cms-server/pom.xml @@ -138,16 +138,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 - - - - org.projectlombok - lombok - 1.18.34 - - - @@ -160,7 +150,6 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 @@ -174,7 +163,6 @@ org.apache.maven.plugins maven-assembly-plugin - 3.7.1 src/assembly/executable.xml diff --git a/modules-framework/api/pom.xml b/modules-framework/api/pom.xml index 63888c081..705ef7e32 100644 --- a/modules-framework/api/pom.xml +++ b/modules-framework/api/pom.xml @@ -13,12 +13,10 @@ com.google.code.gson gson - 2.11.0 com.google.auto.service auto-service - 1.1.1 true diff --git a/pom.xml b/pom.xml index 9a9817c14..14ec6645e 100644 --- a/pom.xml +++ b/pom.xml @@ -111,6 +111,26 @@ ${project.version} + + com.github.slugify + slugify + 3.0.7 + + + org.quartz-scheduler + quartz + 2.3.2 + + + org.eclipse.jgit + org.eclipse.jgit + 7.0.0.202409031743-r + + + net.coobird + thumbnailator + 0.4.20 + com.github.usefulness webp-imageio @@ -268,6 +288,11 @@ auto-service 1.1.1 + + com.google.code.gson + gson + 2.11.0 + @@ -300,12 +325,55 @@ + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + + + org.projectlombok + lombok + 1.18.34 + + + com.google.auto.service + auto-service + 1.1.1 + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 + + + org.apache.maven.plugins + maven-assembly-plugin + 3.7.1 + + + org.codehaus.mojo + license-maven-plugin + 2.4.0 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.5.0 + + + org.codehaus.mojo license-maven-plugin - 2.4.0 false gpl_v3 @@ -379,15 +447,6 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.5.0 - - -