Merge pull request #1276 from ricksjames/BACKLOG-35251

[BACKLOG-35251] Java 11 compatibility
pentaho · Sep 3, 2021 · b9f0309 · b9f0309
2 parents 61d1e77 + e99c691
commit b9f0309
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/mondrian/pom.xml b/mondrian/pom.xml
@@ -180,7 +180,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -197,6 +196,7 @@
                 <property name="generated.resources.dir" value="${project.basedir}/src/generated/resources" />
                 <property name="relative.generated.java.dir" value="src/generated/java" />
                 <property name="classes.dir" value="${project.build.outputDirectory}" />
+                <property name="build.compiler" value="extJavac"/>
                 <mkdir dir="${project.build.outputDirectory}" />
                 <mkdir dir="${generated.java.dir}/mondrian/olap" />
                 <mkdir dir="${generated.java.dir}/mondrian/rolap/aggmatcher" />
@@ -211,15 +211,6 @@
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>com.sun</groupId>
-            <artifactId>tools</artifactId>
-            <version>1.8.0</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -405,7 +396,6 @@
           </plugin>
           <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
             <executions>
               <execution>
                 <id>copy-mysql-cnf</id>

diff --git a/workbench/pom.xml b/workbench/pom.xml
@@ -146,7 +146,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -155,6 +154,7 @@
             </goals>
             <configuration>
               <target>
+                <property name="build.compiler" value="extJavac"/>
                 <property name="classpath" refid="maven.compile.classpath" />
                 <property name="relative.java.dir" value="src/main/java" />
                 <property name="relative.generated.java.dir" value="src/generated/java" />
@@ -166,15 +166,6 @@
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>com.sun</groupId>
-            <artifactId>tools</artifactId>
-            <version>1.8.0</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

diff --git a/workbench/src/main/java/mondrian/gui/JdbcExplorer.java b/workbench/src/main/java/mondrian/gui/JdbcExplorer.java
@@ -122,7 +122,7 @@ private void logNode(DefaultMutableTreeNode theTreeNode, String message) {
                 : (Node) parentNode.getUserObject();
 
         @SuppressWarnings({"unchecked"})
-        Enumeration<DefaultMutableTreeNode> children = theTreeNode.children();
+        Enumeration<TreeNode> children = theTreeNode.children();
 
         LOGGER.debug(
             message + ": " + theNode + ", " + theNode.type
@@ -131,7 +131,7 @@ private void logNode(DefaultMutableTreeNode theTreeNode, String message) {
                 ? ""
                 : ", " + theParentNode.type));
         while (children.hasMoreElements()) {
-            DefaultMutableTreeNode treeNode = children.nextElement();
+            DefaultMutableTreeNode treeNode = ( DefaultMutableTreeNode ) children.nextElement();
             Node child = (Node) treeNode.getUserObject();
             LOGGER.debug("\t" + child.toString() + ", " + child.type);
         }