cleanup and fixing eclipse import issues with m2e

NelsonNew · Apr 14, 2023 · 603c105 · 603c105
1 parent 35ca10a
commit 603c105
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 50 deletions.
diff --git 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
@@ -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
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
@@ -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
@@ -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>