Merge pull request #948 from jeffgbutler/build-updates

[ci skip] Eclipse Build updates 2 - Fix the Composite Repo Publish

Author: jeffgbutler

core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/SqlScriptRunner.java

@@ -79,7 +79,7 @@ public void executeScript() throws MojoExecutionException {
 
         try {
             Class<?> driverClass = ObjectFactory.externalClassForName(driver);
-            Driver theDriver = (Driver) driverClass.newInstance();
+            Driver theDriver = (Driver) driverClass.getDeclaredConstructor().newInstance();
 
             Properties properties = new Properties();
             if (userid != null) {
@@ -114,10 +114,8 @@ public void executeScript() throws MojoExecutionException {
             throw new MojoExecutionException("SqlException: " + e.getMessage(), e);
         } catch (IOException e) {
             throw new MojoExecutionException("IOException: " + e.getMessage(), e);
-        } catch (InstantiationException e) {
-            throw new MojoExecutionException("InstantiationException: " + e.getMessage());
-        } catch (IllegalAccessException e) {
-            throw new MojoExecutionException("IllegalAccessException: " + e.getMessage());
+        } catch (ReflectiveOperationException e) {
+            throw new MojoExecutionException("ReflectiveOperationException: " + e.getMessage());
         } finally {
             closeConnection(connection);
         }

core/mybatis-generator-systests-domtests/src/main/java/mbg/domtest/GenerateTestSourceFiles.java

@@ -48,20 +48,20 @@ public static void main (String[] args) {
         }
     }
 
-    private void gatherGenerators(List<CompilationUnitGenerator> generators) throws InstantiationException, IllegalAccessException {
+    private void gatherGenerators(List<CompilationUnitGenerator> generators) throws ReflectiveOperationException {
         Reflections reflections = new Reflections("mbg.domtest.generators");
         Set<Class<? extends CompilationUnitGenerator>> classes = reflections.getSubTypesOf(CompilationUnitGenerator.class);
 
         for (Class<? extends CompilationUnitGenerator> clazz : classes) {
             if (clazz.getAnnotation(IgnoreDomTest.class) == null) {
-                generators.add(clazz.newInstance());
+                generators.add(clazz.getDeclaredConstructor().newInstance());
             } else {
                 System.out.println("Generator " + clazz.getName() + " ignored");
             }
         }
     }
 
-    private void run(File outputDirectory) throws IOException, InstantiationException, IllegalAccessException {
+    private void run(File outputDirectory) throws IOException, ReflectiveOperationException {
         setupOutputDirectry(outputDirectory);
 
         List<CompilationUnitGenerator> generators = new ArrayList<>();

eclipse/org.mybatis.generator.eclipse.site/pom.xml

@@ -111,18 +111,22 @@
                   <type>eclipse-feature</type>
                 </dependency>
                 <dependency>
-                  <artifactId>org.eclipse.equinox.ds</artifactId>
-                  <type>eclipse-plugin</type>
+                  <artifactId>org.eclipse.equinox.p2.discovery.feature</artifactId>
+                  <type>eclipse-feature</type>
                 </dependency>
               </dependencies>
-              <applicationsArgs>
-                <applicationsArg>-application org.eclipse.ant.core.antRunner</applicationsArg>
-                <applicationsArg>-buildfile updateP2CompositeRepo.ant</applicationsArg>
-                <applicationsArg>-Dproject.artifactId=${project.artifactId}</applicationsArg>
-                <applicationsArg>-DqualifiedVersion=${qualifiedVersion}</applicationsArg>
-                <applicationsArg>-Dproject.build.directory=${project.build.directory}</applicationsArg>
-                <applicationsArg>-Dp2.repo.base.directory=${p2.repo.base.directory}</applicationsArg>
-              </applicationsArgs>
+              <applicationArgs>
+                <arg>-application</arg>
+                <arg>org.eclipse.ant.core.antRunner</arg>
+                <arg>-buildfile</arg>
+                <arg>updateP2CompositeRepo.ant</arg>
+              </applicationArgs>
+              <jvmArgs>
+                <arg>-Dproject.artifactId=${project.artifactId}</arg>
+                <arg>-DqualifiedVersion=${qualifiedVersion}</arg>
+                <arg>-Dproject.build.directory=${project.build.directory}</arg>
+                <arg>-Dp2.repo.base.directory=${p2.repo.base.directory}</arg>
+              </jvmArgs>
             </configuration>
             <executions>
               <execution>

eclipse/org.mybatis.generator.eclipse.site/updateP2CompositeRepo.ant

@@ -31,7 +31,11 @@
         by pulling a current copy from jfrog)
     
 -->
-<project name="project" default="updateRepo">
+<project name="project" default="writeScript">
+  <condition property="isUnix">
+  	<os family="unix" />
+  </condition>
+  
   <target name="init">
     <property name="repo.drops.dir" value="${p2.repo.base.directory}/drops"/>
     <property name="repo.zipped.dir" value="${p2.repo.base.directory}/zipped"/>
@@ -78,7 +82,9 @@
         <include name="*.xml" />
       </fileset>
     </replaceregexp>
+  </target>
 
+  <target name="writeScript" depends="updateRepo" if="isUnix">
     <!-- setup the shebang and variables -->
     <echo message="#!/bin/bash${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" />
     <echo message="USER=xxxx${line.separator}" file="${p2.repo.base.directory}/jfrogUpload.sh" append="true" />
@@ -102,6 +108,5 @@
 
     <!-- make it executable -->
     <chmod perm="+x" file="${p2.repo.base.directory}/jfrogUpload.sh"/>
-
   </target>
 </project>

eclipse/org.mybatis.generator.eclipse.test.utilities/src/org/mybatis/generator/eclipse/test/Utilities.java

@@ -60,7 +60,7 @@ public static String getResourceAsString(InputStream resource) throws IOExceptio
 
     public static <T> T newInstance(Class<? extends T> type) {
         try {
-            return type.newInstance();
+            return type.getDeclaredConstructor().newInstance();
         } catch (Exception e) {
             throw new CantCreateInstanceException("error creating instance of class " + type.getName(), e);
         }

eclipse/pom.xml

@@ -190,13 +190,6 @@
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
         <configuration>
-          <target>
-            <artifact>
-              <groupId>org.mybatis.generator</groupId>
-              <artifactId>org.mybatis.generator.eclipse.target.platform</artifactId>
-              <version>${project.version}</version>
-            </artifact>
-          </target>
           <target>
             <file>../releng/2021-06.target</file>
           </target>