From 603c10502ec19e1f4779b6ad2d355cbad3890616 Mon Sep 17 00:00:00 2001
From: Malte Brunnlieb <malte.brunnlieb@capgemini.com>
Date: Fri, 14 Apr 2023 08:55:11 +0200
Subject: [PATCH] cleanup and fixing eclipse import issues with m2e

---
 build.sh                                      |  2 +-
 cobigen-eclipse/cobigen-eclipse-test/pom.xml  |  7 +++--
 .../src/main/targlets/2018-12.target          | 29 -------------------
 .../impl/extension/PluginRegistry.java        | 10 +++++--
 pom.xml                                       | 14 ---------
 5 files changed, 12 insertions(+), 50 deletions(-)
 delete mode 100644 cobigen-eclipse/cobigen-eclipse-test/src/main/targlets/2018-12.target

diff --git a/build.sh b/build.sh
index 2c4be6459d..c782958ca3 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-source "$(dirname "${0}")"/functions.sh
+source "$(dirname ${0})/functions.sh"
 
 echo ""
 echo "##########################################"
diff --git a/cobigen-eclipse/cobigen-eclipse-test/pom.xml b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
index 909c623f91..7cebbd3042 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
@@ -13,7 +13,8 @@
   </parent>
 
   <properties>
-    <tycho.testArgLine.enriched>${surefireArgLineIntegration} -Xms512m -Xmx2048m -XX:+DisableExplicitGC</tycho.testArgLine.enriched>
+    <tycho.testArgLine.enriched>${surefireArgLineIntegration} -Xms512m -Xmx2048m
+      -XX:+DisableExplicitGC</tycho.testArgLine.enriched>
     <enforcer.skip>true</enforcer.skip>
   </properties>
 
@@ -120,8 +121,8 @@
                 <artifact>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>cobigen-eclipse-releng</artifactId>
-		              <version>${revision}</version>
-		              <relativePath>../cobigen-eclipse-releng/pom.xml</relativePath>
+                  <version>${revision}</version>
+                  <relativePath>../cobigen-eclipse-releng/pom.xml</relativePath>
                 </artifact>
               </target>
             </configuration>
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/targlets/2018-12.target b/cobigen-eclipse/cobigen-eclipse-test/src/main/targlets/2018-12.target
deleted file mode 100644
index 3f84425f0b..0000000000
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/targlets/2018-12.target
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="Eclipse 2018-12" sequenceNumber="51">
-<locations>
-  <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-    <repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
-    <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="4.0.0.202206011610"/>
-    <unit id="org.eclipse.swtbot.feature.group" version="4.0.0.202206011610"/>
-    <unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.0.0.202206011610"/>
-  </location>
-  <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-    <repository location="https://download.eclipse.org/releases/2018-12/"/>
-    <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-    <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
-    <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-    <unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
-  </location>
-  <location path="${projectDir}/../../cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/target/repository" type="Directory"/>
-  <location path="${projectDir}/../../cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/target/repository" type="Directory"/>
-  <location path="${projectDir}/../../cobigen-plugins/cobigen-xmlplugin/target/repository" type="Directory"/>
-  <location path="${projectDir}/../../cobigen-plugins/cobigen-jsonplugin/target/repository" type="Directory"/>
-  <location path="${projectDir}/../../cobigen-plugins/cobigen-htmlplugin/target/repository" type="Directory"/>
-  <location path="${projectDir}/../../cobigen-plugins/cobigen-propertyplugin/target/repository" type="Directory"/>
-  <location path="${projectDir}/../../cobigen-plugins/cobigen-textmerger/target/repository" type="Directory"/>
-  <location path="${projectDir}/../../cobigen-plugins/cobigen-templateengines/cobigen-tempeng-velocity/target/repository" type="Directory"/>
-  <location path="${projectDir}/../../cobigen-plugins/cobigen-templateengines/cobigen-tempeng-freemarker/target/repository" type="Directory"/>
-  <location path="${projectDir}/../../cobigen-plugins/cobigen-tsplugin/target/repository" type="Directory"/>
-</locations>
-</target>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/extension/PluginRegistry.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/extension/PluginRegistry.java
index d54210dfc9..b5067d9884 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/extension/PluginRegistry.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/extension/PluginRegistry.java
@@ -1,5 +1,6 @@
 package com.devonfw.cobigen.impl.extension;
 
+import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -39,7 +40,9 @@ public class PluginRegistry {
   private static Map<String, TriggerInterpreter> registeredTriggerInterpreter = Maps
       .<String, TriggerInterpreter> newHashMap();
 
-  /** Currently registered {@link TriggerInterpreter}s mapped by their supporting file extensions */
+  /**
+   * Currently registered {@link TriggerInterpreter}s mapped by their supporting file extensions
+   */
   private static Multimap<String, TriggerInterpreter> registeredTriggerInterpreterByFileExtension = HashMultimap
       .<String, TriggerInterpreter> create();
 
@@ -63,7 +66,7 @@ public class PluginRegistry {
   private static <T extends GeneratorPluginActivator> GeneratorPluginActivator loadPlugin(Class<T> generatorPlugin) {
 
     try {
-      Object plugin = generatorPlugin.newInstance();
+      Object plugin = generatorPlugin.getDeclaredConstructor().newInstance();
       LOG.info("Register CobiGen Plug-in '{}'.", generatorPlugin.getCanonicalName());
       if (plugin instanceof GeneratorPluginActivator) {
         // Collect Mergers
@@ -87,7 +90,8 @@ private static <T extends GeneratorPluginActivator> GeneratorPluginActivator loa
             GeneratorPluginActivator.class.getCanonicalName());
         return null;
       }
-    } catch (InstantiationException | IllegalAccessException e) {
+    } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
+        | NoSuchMethodException | SecurityException e) {
       throw new CobiGenRuntimeException(
           "Could not intantiate CobiGen Plug-in '" + generatorPlugin.getCanonicalName() + "'.", e);
     }
diff --git a/pom.xml b/pom.xml
index e0f14f7dbf..2b44855a7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -514,20 +514,6 @@
                     <ignore></ignore>
                   </action>
                 </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <versionRange>[1.12,)</versionRange>
-                    <goals>
-                      <goal>regex-property</goal>
-                      <goal>add-source</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore></ignore>
-                  </action>
-                </pluginExecution>
                 <pluginExecution>
                   <pluginExecutionFilter>
                     <groupId>org.commonjava.maven.plugins</groupId>