Update magnolia to 6.3.0 (breaking requires jdk17)

merkle-open · Sep 9, 2024 · 05d03fe · 05d03fe
1 parent 9a6a9dc
commit 05d03fe
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 45 deletions.
diff --git a/custom-definitions/pom.xml b/custom-definitions/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.namics.oss.magnolia</groupId>
         <artifactId>magnolia-definition-builders-parent</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>custom-definition-builders</artifactId>
@@ -34,6 +34,10 @@
             <groupId>info.magnolia.dam</groupId>
             <artifactId>magnolia-dam-templating</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
 
         <!-- TESTING DEPENDENCIES -->
         <dependency>

diff --git a/...main/java/com/merkle/oss/magnolia/definition/custom/richtext/ExtendedRichTextFactory.java b/...main/java/com/merkle/oss/magnolia/definition/custom/richtext/ExtendedRichTextFactory.java
@@ -6,6 +6,7 @@
 import info.magnolia.i18nsystem.SimpleTranslator;
 import info.magnolia.ui.dialog.DialogDefinitionRegistry;
 import info.magnolia.ui.framework.ioc.UiComponentProvider;
+import info.magnolia.ui.vaadin.ckeditor.CKEditor5Config;
 import info.magnolia.ui.vaadin.ckeditor.MagnoliaCKEditorConfig;
 
 import java.util.Collections;
@@ -31,9 +32,10 @@ public ExtendedRichTextFactory(
 			final SimpleTranslator i18n,
 			final DialogDefinitionRegistry dialogDefinitionRegistry,
 			final I18nizer i18nizer,
-			final AssetProviderRegistry assetProviderRegistry
+			final AssetProviderRegistry assetProviderRegistry,
+			final CKEditor5Config CKEditor5Config
 	) {
-		super(definition, componentProvider, i18n, dialogDefinitionRegistry, i18nizer, assetProviderRegistry);
+		super(definition, componentProvider, i18n, dialogDefinitionRegistry, i18nizer, assetProviderRegistry, CKEditor5Config);
 	}
 
 	@Override

diff --git a/key-generator/pom.xml b/key-generator/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.namics.oss.magnolia</groupId>
         <artifactId>magnolia-definition-builders-parent</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>magnolia-definition-keyGenerators</artifactId>
@@ -20,6 +20,10 @@
             <groupId>info.magnolia.ui</groupId>
             <artifactId>magnolia-ui-framework-compatibility</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
 
         <!-- TESTING DEPENDENCIES -->
         <dependency>

diff --git a/magnolia-builders/pom.xml b/magnolia-builders/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.namics.oss.magnolia</groupId>
         <artifactId>magnolia-definition-builders-parent</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>magnolia-definition-builders</artifactId>
@@ -41,6 +41,10 @@
             <artifactId>magnolia-pages-app</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
 
         <!-- TESTING DEPENDENCIES -->
         <dependency>

diff --git a/...va/com/merkle/oss/magnolia/definition/builder/action/AbstractActionDefinitionBuilder.java b/...va/com/merkle/oss/magnolia/definition/builder/action/AbstractActionDefinitionBuilder.java
@@ -16,8 +16,6 @@ public class AbstractActionDefinitionBuilder<D extends ConfiguredActionDefinitio
     @Nullable
     private String icon;
     @Nullable
-    private String i18nBasename;
-    @Nullable
     private Class<? extends Action> implementationClass;
     @Nullable
     private String successMessage;
@@ -33,7 +31,6 @@ public AbstractActionDefinitionBuilder(final D definition) {
         Optional.ofNullable(definition.getLabel()).ifPresent(this::label);
         Optional.ofNullable(definition.getDescription()).ifPresent(this::description);
         Optional.ofNullable(definition.getIcon()).ifPresent(this::icon);
-        Optional.ofNullable(definition.getI18nBasename()).ifPresent(this::i18nBasename);
         Optional.ofNullable(definition.getImplementationClass()).ifPresent(this::implementationClass);
         Optional.ofNullable(definition.getSuccessMessage()).ifPresent(this::successMessage);
         Optional.ofNullable(definition.getFailureMessage()).ifPresent(this::failureMessage);
@@ -53,10 +50,6 @@ public B icon(final String icon) {
         this.icon = icon;
         return self();
     }
-    public B i18nBasename(final String i18nBasename) {
-        this.i18nBasename = i18nBasename;
-        return self();
-    }
     public B implementationClass(final Class<? extends Action> implementationClass) {
         this.implementationClass = implementationClass;
         return self();
@@ -88,7 +81,6 @@ protected void populate(final D definition, final String name) {
         Optional.ofNullable(label).ifPresent(definition::setLabel);
         Optional.ofNullable(description).ifPresent(definition::setDescription);
         Optional.ofNullable(icon).ifPresent(definition::setIcon);
-        Optional.ofNullable(i18nBasename).ifPresent(definition::setI18nBasename);
         Optional.ofNullable(implementationClass).ifPresent(definition::setImplementationClass);
         Optional.ofNullable(successMessage).ifPresent(definition::setSuccessMessage);
         Optional.ofNullable(failureMessage).ifPresent(definition::setFailureMessage);

diff --git a/...om/merkle/oss/magnolia/definition/builder/availability/AvailabilityDefinitionBuilder.java b/...om/merkle/oss/magnolia/definition/builder/availability/AvailabilityDefinitionBuilder.java
@@ -8,7 +8,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

diff --git a/...le/oss/magnolia/definition/builder/contentapp/column/AbstractColumnDefinitionBuilder.java b/...le/oss/magnolia/definition/builder/contentapp/column/AbstractColumnDefinitionBuilder.java
@@ -33,8 +33,6 @@ public class AbstractColumnDefinitionBuilder<T, D extends ConfiguredColumnDefini
     @Nullable
     private FieldDefinition<?> filterComponent;
     @Nullable
-    private Class<? extends DescriptionGenerator<T>> descriptionGenerator;
-    @Nullable
     private Boolean sortable;
     @Nullable
     private String label;
@@ -52,7 +50,6 @@ public AbstractColumnDefinitionBuilder(final D definition) {
         minimumWidthFromContent(definition.isMinimumWidthFromContent());
         editable(definition.isEditable());
         Optional.ofNullable(definition.getFilterComponent()).ifPresent(this::filterComponent);
-        Optional.ofNullable(definition.getDescriptionGenerator()).ifPresent(this::descriptionGenerator);
         sortable(definition.isSortable());
         Optional.ofNullable(definition.getLabel()).ifPresent(this::label);
     }
@@ -102,11 +99,6 @@ public B filterComponent(final FieldDefinition<?> filterComponent) {
         return self();
     }
 
-    public B descriptionGenerator(final Class<? extends DescriptionGenerator<T>> descriptionGenerator) {
-        this.descriptionGenerator = descriptionGenerator;
-        return self();
-    }
-
     public B sortable(final boolean sortable) {
         this.sortable = sortable;
         return self();
@@ -139,7 +131,6 @@ protected void populate(final D definition, final String name) {
         Optional.ofNullable(minimumWidthFromContent).ifPresent(definition::setMinimumWidthFromContent);
         Optional.ofNullable(editable).ifPresent(definition::setEditable);
         Optional.ofNullable(filterComponent).ifPresent(definition::setFilterComponent);
-        Optional.ofNullable(descriptionGenerator).ifPresent(definition::setDescriptionGenerator);
         Optional.ofNullable(sortable).ifPresent(definition::setSortable);
         Optional.ofNullable(label).ifPresent(definition::setLabel);
     }

diff --git a/...ava/com/merkle/oss/magnolia/definition/builder/simple/LinkFieldDefinitionBuilderTest.java b/...ava/com/merkle/oss/magnolia/definition/builder/simple/LinkFieldDefinitionBuilderTest.java
@@ -24,7 +24,7 @@ <T> void testBuilder() {
 		super.assertLinkField(new LinkFieldDefinitionBuilder<T>(), (name, builder) -> builder.build(name, dataSourceDefinition));
 
 		final LinkFieldDefinition<T> emptyDefinition = new LinkFieldDefinitionBuilder<T>().build("comboBox", dataSourceDefinition);
-		assertEquals("ui-framework-jcr:chooser", emptyDefinition.getChooserId());
+		assertEquals("ui-framework-core:chooser", emptyDefinition.getChooserId());
 		assertTrue(emptyDefinition.isEditable());
 		assertEquals(LinkFieldFactory.class, emptyDefinition.getFactoryClass());
 		assertEquals(LinkFieldBinder.class, emptyDefinition.getFieldBinderClass());

diff --git a/...com/merkle/oss/magnolia/definition/builder/simple/RichTextFieldDefinitionBuilderTest.java b/...com/merkle/oss/magnolia/definition/builder/simple/RichTextFieldDefinitionBuilderTest.java
@@ -42,7 +42,7 @@ void testBuilder() {
 		assertEquals(String.class, emptyDefinition.getType());
 		assertEquals(DamRichTextFieldFactory.class, emptyDefinition.getFactoryClass());
 		assertEquals(0, emptyDefinition.getValidators().size());
-		assertEquals(2, emptyDefinition.getLinkFieldDefinitions().size());
-		assertNotNull(emptyDefinition.getLinkFieldDefinitions().get(RepositoryConstants.WEBSITE));
+		assertEquals(1, emptyDefinition.getLinkFieldDefinitions().size());
+		assertNotNull(emptyDefinition.getLinkFieldDefinitions().get("dam"));
 	}
 }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.namics.oss.magnolia</groupId>
 	<artifactId>magnolia-definition-builders-parent</artifactId>
-	<version>1.1.3-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>${project.artifactId}</name>
@@ -36,26 +36,26 @@
 	<properties>
 		<!-- (check for new versions:  mvn versions:display-property-updates )-->
 
-		<magnolia.version>6.2.44</magnolia.version>
+		<magnolia.version>6.3.0</magnolia.version>
 		<magnolia.workflow.version>6.0.8</magnolia.workflow.version>
-		<magnolia.dam.version>3.0.31</magnolia.dam.version>
-		<magnolia.pages.version>6.2.34</magnolia.pages.version>
-		<merkle.powernode.version>2.0.7</merkle.powernode.version>
+		<merkle.powernode.version>2.0.9</merkle.powernode.version>
 		<java.poet.version>1.12.1</java.poet.version>
+		<jsr305.nullable.version>3.0.2</jsr305.nullable.version>
+
 		<!--Test dependency versions-->
-		<junit.version>5.10.2</junit.version>
-		<mockito.version>5.11.0</mockito.version>
+		<junit.version>5.11.0</junit.version>
+		<mockito.version>5.13.0</mockito.version>
 
 		<!-- Maven Plugins -->
 		<mvn.compiler.plugin.version>3.13.0</mvn.compiler.plugin.version>
 		<mvn.source.plugin.version>3.3.1</mvn.source.plugin.version>
-		<mvn.surefire.plugin.version>3.2.5</mvn.surefire.plugin.version>
+		<mvn.surefire.plugin.version>3.5.0</mvn.surefire.plugin.version>
 		<mvn.javadoc.version>3.5.0</mvn.javadoc.version>
 		<mvn.gpg.plugin.version>3.0.1</mvn.gpg.plugin.version>
 		<mvn.nexus-staging.plugin.version>1.6.13</mvn.nexus-staging.plugin.version>
 		<mvn.plugin.version>3.9.0</mvn.plugin.version>
 
-		<javaVersion>11</javaVersion>
+		<javaVersion>17</javaVersion>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -69,21 +69,16 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>info.magnolia.dam</groupId>
-				<artifactId>magnolia-dam-app</artifactId>
-				<version>${magnolia.dam.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>info.magnolia.pages</groupId>
-				<artifactId>magnolia-pages-app</artifactId>
-				<version>${magnolia.pages.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>com.namics.oss.magnolia</groupId>
 				<artifactId>magnolia-powernode</artifactId>
 				<version>${merkle.powernode.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.google.code.findbugs</groupId>
+				<artifactId>jsr305</artifactId>
+				<version>${jsr305.nullable.version}</version>
+			</dependency>
 
 			<!-- TESTING DEPENDENCIES -->
 			<dependency>