diff --git a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
index b622311966..c67ab90570 100644
--- a/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.lib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.lib
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.lib
-Bundle-Version: 17.3.1.qualifier
+Bundle-Version: 17.3.2.qualifier
 Bundle-Vendor: Avaloq Group AG
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext,
diff --git a/com.avaloq.tools.ddk.check.lib/pom.xml b/com.avaloq.tools.ddk.check.lib/pom.xml
index a9364aaaf6..4d5984740e 100644
--- a/com.avaloq.tools.ddk.check.lib/pom.xml
+++ b/com.avaloq.tools.ddk.check.lib/pom.xml
@@ -6,7 +6,7 @@
     <version>18.0.1-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
-  <version>17.3.1-SNAPSHOT</version>
+  <version>17.3.2-SNAPSHOT</version>
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>com.avaloq.tools.ddk.check.lib</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/internal/Index.java b/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/internal/Index.java
index 71e0c694f9..adb363f5e2 100644
--- a/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/internal/Index.java
+++ b/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/internal/Index.java
@@ -41,7 +41,7 @@ public final class Index implements IIndex {
   @Inject
   private IQualifiedNameConverter nameConverter;
 
-  protected Index() {
+  Index() {
     // Prevent explicit instantiations. To be used via injection.
   }
 
@@ -78,9 +78,8 @@ private static final class Query implements IIndex.Query {
      *          to use
      * @param type
      *          to look for
-     * @return a query object
      */
-    protected Query(final IDomain.Mapper mapper, final IQualifiedNameConverter nameConverter, final EClass type) {
+    private Query(final IDomain.Mapper mapper, final IQualifiedNameConverter nameConverter, final EClass type) {
       this.realQuery = ContainerQuery.newBuilder(mapper, type);
       this.nameConverter = nameConverter;
     }
@@ -155,7 +154,7 @@ private static final class Entry implements IIndex.Entry {
      * @param internalDescription
      *          to wrap
      */
-    protected Entry(final EObject context, final IQualifiedNameConverter nameConverter, final IEObjectDescription internalDescription) {
+    private Entry(final EObject context, final IQualifiedNameConverter nameConverter, final IEObjectDescription internalDescription) {
       this.context = context;
       this.nameConverter = nameConverter;
       this.delegate = internalDescription;
diff --git a/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/internal/PerResourceCache.java b/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/internal/PerResourceCache.java
index 96b561b329..e29ca18eb3 100644
--- a/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/internal/PerResourceCache.java
+++ b/com.avaloq.tools.ddk.check.lib/src/com/avaloq/tools/ddk/check/lib/internal/PerResourceCache.java
@@ -28,7 +28,7 @@
 @Singleton
 public final class PerResourceCache implements IResourceCache {
 
-  protected PerResourceCache() {
+  PerResourceCache() {
     // Prevent explicit instantiations. All classes from this library shall be injected in check catalogs.
   }
 
diff --git a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
index 44feccba4c..f758ec05cb 100644
--- a/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.check.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.check.ui;singleton:=true
-Bundle-Version: 17.3.2.qualifier
+Bundle-Version: 17.3.3.qualifier
 Bundle-Vendor: Avaloq Group AG
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Activator: com.avaloq.tools.ddk.check.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.check.ui/pom.xml b/com.avaloq.tools.ddk.check.ui/pom.xml
index 11674c31c6..3dfe11a365 100644
--- a/com.avaloq.tools.ddk.check.ui/pom.xml
+++ b/com.avaloq.tools.ddk.check.ui/pom.xml
@@ -6,7 +6,7 @@
     <version>18.0.1-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
-  <version>17.3.2-SNAPSHOT</version>
+  <version>17.3.3-SNAPSHOT</version>
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>com.avaloq.tools.ddk.check.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckExtensionGenerator.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckExtensionGenerator.java
index 5765ccebf4..6c3a0b97af 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckExtensionGenerator.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckExtensionGenerator.java
@@ -230,7 +230,7 @@ public void checkLoad(final Node node) {
      * A {@code PluginElement} that can be loaded from an xml file.
      */
     @SuppressWarnings("PMD.PublicMemberInNonPublicType") // Public methods needed for subclass access in other packages
-    protected class CheckPluginElement extends PluginElement {
+    class CheckPluginElement extends PluginElement {
 
       private static final long serialVersionUID = 1L;
 
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckMarkerHelpExtensionHelper.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckMarkerHelpExtensionHelper.java
index 055aeee329..a0aa5d2bcc 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckMarkerHelpExtensionHelper.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/util/CheckMarkerHelpExtensionHelper.java
@@ -138,6 +138,7 @@ public String apply(final XIssueExpression input) {
   }
 
   @Override
+  @SuppressWarnings("PMD.UnusedReturnValue") // Preserve the existing exception-based existence check.
   public boolean isExtensionUpdateRequired(final CheckCatalog catalog, final IPluginExtension extension, final Iterable<IPluginElement> elements) {
     // TODO should check if this check is too expensive; consider rewriting contents instead
     if (!super.isExtensionUpdateRequired(catalog, extension, elements)) {
diff --git a/com.avaloq.tools.ddk.checkcfg.ide/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ide/META-INF/MANIFEST.MF
index 117b1e0a94..ef52de704c 100644
--- a/com.avaloq.tools.ddk.checkcfg.ide/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ide
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ide;singleton:=true
-Bundle-Version: 17.3.1.qualifier
+Bundle-Version: 17.3.2.qualifier
 Bundle-Vendor: Avaloq Group AG
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.checkcfg.ide/pom.xml b/com.avaloq.tools.ddk.checkcfg.ide/pom.xml
index cc1c2e8309..d5ad5bd70e 100644
--- a/com.avaloq.tools.ddk.checkcfg.ide/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ide/pom.xml
@@ -6,7 +6,7 @@
     <version>18.0.1-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
-  <version>17.3.1-SNAPSHOT</version>
+  <version>17.3.2-SNAPSHOT</version>
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>com.avaloq.tools.ddk.checkcfg.ide</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.avaloq.tools.ddk.checkcfg.ide/src/com/avaloq/tools/ddk/checkcfg/ide/contentassist/CheckCfgIdeContentProposalProvider.java b/com.avaloq.tools.ddk.checkcfg.ide/src/com/avaloq/tools/ddk/checkcfg/ide/contentassist/CheckCfgIdeContentProposalProvider.java
index d00f43bc58..1f462ea6b1 100644
--- a/com.avaloq.tools.ddk.checkcfg.ide/src/com/avaloq/tools/ddk/checkcfg/ide/contentassist/CheckCfgIdeContentProposalProvider.java
+++ b/com.avaloq.tools.ddk.checkcfg.ide/src/com/avaloq/tools/ddk/checkcfg/ide/contentassist/CheckCfgIdeContentProposalProvider.java
@@ -304,6 +304,7 @@ private void addCatalogConfigurations(final ContentAssistContext context, final
    *          the catalog
    * @return true, if is catalog configured
    */
+  @SuppressWarnings("PMD.UnusedReturnValue") // Preserve the existing exception-based existence check.
   private boolean isCatalogConfigured(final CheckConfiguration conf, final CheckCatalog catalog) {
     try {
       Iterables.find(conf.getLegacyCatalogConfigurations(), new Predicate<ConfiguredCatalog>() {
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
index c4c1289212..e0b61fd83b 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.checkcfg.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.checkcfg.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.checkcfg.ui;singleton:=true
-Bundle-Version: 17.3.2.qualifier
+Bundle-Version: 17.3.3.qualifier
 Bundle-Vendor: Avaloq Group AG
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Activator: com.avaloq.tools.ddk.checkcfg.ui.internal.Activator
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
index 2866c723dd..aaa413047c 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui/pom.xml
@@ -6,7 +6,7 @@
     <version>18.0.1-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
-  <version>17.3.2-SNAPSHOT</version>
+  <version>17.3.3-SNAPSHOT</version>
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>com.avaloq.tools.ddk.checkcfg.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateProposalProvider.java b/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateProposalProvider.java
index c480f2c693..ff2420fc9b 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateProposalProvider.java
+++ b/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateProposalProvider.java
@@ -175,6 +175,7 @@ private void addCatalogConfigurations(final TemplateContext templateContext, fin
    *          the catalog
    * @return true, if is catalog configured
    */
+  @SuppressWarnings("PMD.UnusedReturnValue") // Preserve the existing exception-based existence check.
   private boolean isCatalogConfigured(final CheckConfiguration conf, final CheckCatalog catalog) {
     try {
       Iterables.find(conf.getLegacyCatalogConfigurations(), new Predicate<ConfiguredCatalog>() {
diff --git a/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/CoreSwtbotTools.java b/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/CoreSwtbotTools.java
index 1d323b9b55..21e04fe658 100644
--- a/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/CoreSwtbotTools.java
+++ b/com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/CoreSwtbotTools.java
@@ -344,7 +344,7 @@ public static List<SWTBotTableItem> tableItems(final SWTWorkbenchBot bot, final
     Assert.isNotNull(bot, ARGUMENT_BOT);
     Assert.isNotNull(table, ARGUMENT_TABLE);
     waitForTableItem(bot, table);
-    List<SWTBotTableItem> items = null;
+    List<SWTBotTableItem> items = new ArrayList<SWTBotTableItem>();
     for (int i = 0; i < table.rowCount(); i++) {
       items = new ArrayList<SWTBotTableItem>(Arrays.asList(table.getTableItem(i)));
     }
diff --git a/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/GeneratorUtil.java b/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/GeneratorUtil.java
index 0a32edf62b..10e0f8eb02 100644
--- a/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/GeneratorUtil.java
+++ b/com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/GeneratorUtil.java
@@ -35,6 +35,7 @@
  * These utility methods make of for shortcomings in the xtext generator framework and will hopefully find an adequate replacement
  * inside xtext.
  */
+@SuppressWarnings("PMD.InstantiableUtilityClass") // Preserve subclass compatibility for this exported API.
 public class GeneratorUtil {
 
   public static final String ISO_8859_1 = "ISO-8859-1"; //$NON-NLS-1$
diff --git a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
index f39bd1bbc7..0ee1a5a151 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test.core
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test.core;singleton:=true
-Bundle-Version: 17.3.2.qualifier
+Bundle-Version: 17.3.3.qualifier
 Bundle-Vendor: Avaloq Group AG
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: com.avaloq.tools.ddk.xtext,
diff --git a/com.avaloq.tools.ddk.xtext.test.core/pom.xml b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
index 55ad4fe33f..1be990f197 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test.core/pom.xml
@@ -6,7 +6,7 @@
     <version>18.0.1-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
-  <version>17.3.2-SNAPSHOT</version>
+  <version>17.3.3-SNAPSHOT</version>
 
   <artifactId>com.avaloq.tools.ddk.xtext.test.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jvmmodel/InferredJvmModelUtil.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jvmmodel/InferredJvmModelUtil.java
index e4ecc07db2..64171f0bca 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jvmmodel/InferredJvmModelUtil.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jvmmodel/InferredJvmModelUtil.java
@@ -27,6 +27,7 @@
 /**
  * Utility methods for inferred JVM models.
  */
+@SuppressWarnings("PMD.InstantiableUtilityClass") // Preserve subclass compatibility for this exported API.
 public class InferredJvmModelUtil {
 
   /**
diff --git a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
index 84309a03f9..47dbd33084 100644
--- a/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.test
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.test;singleton:=true
-Bundle-Version: 17.3.1.qualifier
+Bundle-Version: 17.3.2.qualifier
 Bundle-Vendor: Avaloq Group AG
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.test/pom.xml b/com.avaloq.tools.ddk.xtext.test/pom.xml
index 31b650d989..6bb317409a 100644
--- a/com.avaloq.tools.ddk.xtext.test/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.test/pom.xml
@@ -6,7 +6,7 @@
     <version>18.0.1-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
-  <version>17.3.1-SNAPSHOT</version>
+  <version>17.3.2-SNAPSHOT</version>
 
   <artifactId>com.avaloq.tools.ddk.xtext.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProviderTest.java b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProviderTest.java
index 959680bf93..1b8f16be92 100644
--- a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProviderTest.java
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/resource/AbstractSelectorFragmentProviderTest.java
@@ -121,19 +121,19 @@ public boolean appendFragmentSegment(final EObject object, final StringBuilder b
       return super.appendFragmentSegment(object, builder);
     }
 
-    protected boolean appendFragmentSegment(final Grammar obj, final StringBuilder builder) {
+    private boolean appendFragmentSegment(final Grammar obj, final StringBuilder builder) {
       return computeSelectorFragmentSegment(obj, XtextPackage.Literals.GRAMMAR__NAME, true, builder);
     }
 
-    protected boolean appendFragmentSegment(final AbstractRule obj, final StringBuilder builder) {
+    private boolean appendFragmentSegment(final AbstractRule obj, final StringBuilder builder) {
       return computeSelectorFragmentSegment(obj, XtextPackage.Literals.ABSTRACT_RULE__NAME, false, builder);
     }
 
-    protected boolean appendFragmentSegment(final AbstractElement obj, final StringBuilder builder) {
+    private boolean appendFragmentSegment(final AbstractElement obj, final StringBuilder builder) {
       return computeSelectorFragmentSegment(obj, XtextPackage.Literals.ABSTRACT_ELEMENT__CARDINALITY, false, builder);
     }
 
-    protected boolean appendFragmentSegment(final Keyword obj, final StringBuilder builder) {
+    private boolean appendFragmentSegment(final Keyword obj, final StringBuilder builder) {
       return computeSelectorFragmentSegment(obj, XtextPackage.Literals.KEYWORD__VALUE, false, builder);
     }
 
diff --git a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
index 08a4be5142..609ac52451 100644
--- a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.avaloq.tools.ddk.xtext.ui
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui;singleton:=true
-Bundle-Version: 17.3.2.qualifier
+Bundle-Version: 17.3.3.qualifier
 Bundle-Vendor: Avaloq Group AG
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
diff --git a/com.avaloq.tools.ddk.xtext.ui/pom.xml b/com.avaloq.tools.ddk.xtext.ui/pom.xml
index f421c0c8eb..c0672c7749 100644
--- a/com.avaloq.tools.ddk.xtext.ui/pom.xml
+++ b/com.avaloq.tools.ddk.xtext.ui/pom.xml
@@ -6,7 +6,7 @@
     <version>18.0.1-SNAPSHOT</version>
     <relativePath>../ddk-parent</relativePath>
   </parent>
-  <version>17.3.2-SNAPSHOT</version>
+  <version>17.3.3-SNAPSHOT</version>
   <groupId>com.avaloq.tools.ddk</groupId>
   <artifactId>com.avaloq.tools.ddk.xtext.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/AbstractValidElementBase.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/AbstractValidElementBase.java
index ee8ef70886..e041eef5e0 100644
--- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/AbstractValidElementBase.java
+++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/AbstractValidElementBase.java
@@ -57,19 +57,15 @@ protected AbstractValidElementBase(final IConfigurationElement configurationElem
    * @return the child elements of this element
    */
   public AbstractValidElementBase[] getChildElements() {
-    AbstractValidElementBase[] childElements = null;
-    if (childElements == null) {
-      IConfigurationElement[] ce = getConfigurationElement().getChildren();
-      List<AbstractValidElementBase> elements = new ArrayList<AbstractValidElementBase>();
-      for (IConfigurationElement element : ce) {
-        AbstractValidElementBase e = createChildElement(element);
-        if (e != null) {
-          elements.add(e);
-        }
+    IConfigurationElement[] ce = getConfigurationElement().getChildren();
+    List<AbstractValidElementBase> elements = new ArrayList<AbstractValidElementBase>();
+    for (IConfigurationElement element : ce) {
+      AbstractValidElementBase e = createChildElement(element);
+      if (e != null) {
+        elements.add(e);
       }
-      childElements = elements.toArray(new AbstractValidElementBase[elements.size()]);
     }
-    return childElements;
+    return elements.toArray(new AbstractValidElementBase[elements.size()]);
   }
 
   /**
diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/CategoryElement.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/CategoryElement.java
index 169a48f75d..7dcd7c778a 100644
--- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/CategoryElement.java
+++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/CategoryElement.java
@@ -27,7 +27,7 @@ public final class CategoryElement extends AbstractValidElementBase {
   private final String label;
   private final String description;
 
-  protected CategoryElement(final IConfigurationElement ce) {
+  CategoryElement(final IConfigurationElement ce) {
     super(ce);
     name = getAttribute(ce, NAME, false);
     label = getAttribute(ce, LABEL, false);
diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/RuleElement.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/RuleElement.java
index 27dac29ca0..781e034727 100644
--- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/RuleElement.java
+++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/RuleElement.java
@@ -31,7 +31,7 @@ public final class RuleElement extends AbstractValidElementBase {
   private final String severity;
   private final String evaluationMode;
 
-  protected RuleElement(final IConfigurationElement ce) {
+  RuleElement(final IConfigurationElement ce) {
     super(ce);
     final String bOptional = getAttribute(ce, OPTIONAL, false);
     optional = bOptional == null ? null : Boolean.valueOf(bOptional);
diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/ValidElement.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/ValidElement.java
index 756bd0ad62..aa2872511d 100644
--- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/ValidElement.java
+++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/ValidElement.java
@@ -25,7 +25,7 @@ public final class ValidElement extends AbstractValidElementBase {
 
   private final String language;
 
-  protected ValidElement(final IConfigurationElement ce) {
+  ValidElement(final IConfigurationElement ce) {
     super(ce);
     language = getAttribute(ce, LANGUAGE, false);
   }
diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/ValidExtension.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/ValidExtension.java
index 3cb0cfe5d0..5f26fb2e51 100644
--- a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/ValidExtension.java
+++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/validation/ValidExtension.java
@@ -55,19 +55,14 @@ public String getExtensionId() {
    * @return the top-level elements of this extension point
    */
   public ValidElement[] getTopLevelElements() {
-    ValidElement[] topLevelElements = null;
-    if (topLevelElements == null) {
-      IConfigurationElement[] configurationElements = extension.getConfigurationElements();
-      List<ValidElement> elements = new ArrayList<ValidElement>();
-      for (IConfigurationElement ce : configurationElements) {
-        if (XML_TOP_ELEMENT_NAME.equals(ce.getName())) {
-          ValidElement e = new ValidElement(ce);
-          elements.add(e);
-        }
+    IConfigurationElement[] configurationElements = extension.getConfigurationElements();
+    List<ValidElement> elements = new ArrayList<ValidElement>();
+    for (IConfigurationElement ce : configurationElements) {
+      if (XML_TOP_ELEMENT_NAME.equals(ce.getName())) {
+        elements.add(new ValidElement(ce));
       }
-      topLevelElements = elements.toArray(new ValidElement[elements.size()]);
     }
-    return topLevelElements;
+    return elements.toArray(new ValidElement[elements.size()]);
   }
 
   /**
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/modelinference/InferredModelUtil.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/modelinference/InferredModelUtil.java
index 79c8ce61cc..6a38412422 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/modelinference/InferredModelUtil.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/modelinference/InferredModelUtil.java
@@ -24,6 +24,7 @@
 /**
  * Utility methods for inferred models.
  */
+@SuppressWarnings("PMD.InstantiableUtilityClass") // Preserve subclass compatibility for this exported API.
 public class InferredModelUtil {
 
   protected InferredModelUtil() { // No public constructor for utility class
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/XtextGMFResourceUtil.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/XtextGMFResourceUtil.java
index 26e95b6449..5a1e84db6d 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/XtextGMFResourceUtil.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/XtextGMFResourceUtil.java
@@ -23,6 +23,7 @@
 /**
  * Utility class for combined Xtext-GMF resources.
  */
+@SuppressWarnings("PMD.InstantiableUtilityClass") // Preserve subclass compatibility for this exported API.
 public class XtextGMFResourceUtil {
 
   /** Class-wide logger. */
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
index bd6ea489a8..181c493a03 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
@@ -87,7 +87,7 @@ public int readCompressedInt() throws IOException {
     }
 
     @SuppressWarnings("PMD.UnusedFormalParameter")
-    protected void handleLoadEObject(final InternalEObject loaded, final BinaryResourceImpl.EObjectInputStream input) throws IOException {
+    private void handleLoadEObject(final InternalEObject loaded, final BinaryResourceImpl.EObjectInputStream input) throws IOException {
       if (modificationTrackingAdapter != null) {
         loaded.eAdapters().add(modificationTrackingAdapter);
       }
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java
index d4ff158c88..090da0dad3 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java
@@ -109,6 +109,8 @@ public static void fillIdToEObjectMap(final IParseResult parseResult) {
    *          resource, must not be {@code null}
    * @return original EObject ID map or {@code null} if no proxied node model was present
    */
+  // PMD 7.27+: null is a sentinel; caller fills a fresh map when no proxy was present
+  @SuppressWarnings("PMD.ReturnEmptyCollectionRatherThanNull")
   static List<EObject> uninstallProxyNodeModel(final Resource resource) {
     List<EObject> result = null;
     if (!resource.getContents().isEmpty()) {
diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml
index 9c0de76c81..bf76ed1584 100644
--- a/ddk-parent/pom.xml
+++ b/ddk-parent/pom.xml
@@ -54,7 +54,7 @@
     <spotbugs.plugin.version>4.10.4.0</spotbugs.plugin.version>
     <spotbugs.version>4.10.4</spotbugs.version>
     <pmd.plugin.version>3.28.0</pmd.plugin.version>
-    <pmd.version>7.26.0</pmd.version>
+    <pmd.version>7.27.0</pmd.version>
     <tycho.version>5.0.4</tycho.version>
     <xtend.version>2.43.0</xtend.version>