JDK 11 upgrade (required by Dremio 25.0.0)

Dremio 25.0.0 upgrade Readme Fixes Remove unused code Dependency upgrades POM.xml fixes
sheinbergon · May 10, 2024 · 99de9ae · 99de9ae
1 parent 841b63e
commit 99de9ae
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 136 deletions.
diff --git a/.github/workflows/development-ci.yml b/.github/workflows/development-ci.yml
@@ -12,10 +12,10 @@ jobs:
     steps:
 
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Java JDK 11 setup
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 11
           architecture: x64

diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -12,10 +12,10 @@ jobs:
     steps:
 
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Java JDK 11 setup
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 11
           architecture: x64

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/README.MD b/README.MD
@@ -36,18 +36,18 @@ Enjoying my work? A show of support would be much obliged :grin:
 
 | Library Version | Dremio Version | Status     |
 |-----------------|----------------|------------|
-| 0.2.x           | 20.1.0         | Legacy     |
-| 0.3.x           | 21.1.1         | Legacy     |
-| 0.4.x           | 21.2.0         | Legacy     |
-| 0.5.x           | 22.0.0         | Legacy     |
-| 0.6.x           | 22.1.1         | Legacy     |
-| 0.7.x           | 23.0.1         | Legacy     |
-| 0.8.x           | 23.1.0         | Legacy     |
-| 0.9.x           | 24.0.0         | Maintained |
-| 0.10.x          | 24.1.0         | Maintained |
-| 0.11.x          | 24.2.6         | Maintained |
-| 0.12.x          | 24.3.0         | Maintained |
-
+| 0.2.x           | 20.1.x         | Legacy     |
+| 0.3.x           | 21.1.x         | Legacy     |
+| 0.4.x           | 21.2.x         | Legacy     |
+| 0.5.x           | 22.0.x         | Legacy     |
+| 0.6.x           | 22.1.x         | Legacy     |
+| 0.7.x           | 23.0.x         | Legacy     |
+| 0.8.x           | 23.1.x         | Legacy     |
+| 0.9.x           | 24.0.x         | Legacy     |
+| 0.10.x          | 24.1.x         | Legacy     |
+| 0.11.x          | 24.2.x         | Legacy     |
+| 0.12.x          | 24.3.x         | Maintained |
+| 0.13.x          | 25.0.x         | Maintained |
 
 ### Usage Notes
 

diff --git a/detekt.yml b/detekt.yml
@@ -1,28 +1,11 @@
 build:
   maxIssues: 0
-  weights:
-  # complexity: 2
-  # LongParameterList: 1
-  # style: 1
-  # comments: 1
 
 processors:
   active: true
-  exclude:
-  # - 'FunctionCountProcessor'
-  # - 'PropertyCountProcessor'
-  # - 'ClassCountProcessor'
-  # - 'PackageCountProcessor'
-  # - 'KtFileCountProcessor'
 
 console-reports:
   active: true
-  exclude:
-  #  - 'ProjectStatisticsReport'
-  #  - 'ComplexityReport'
-  #  - 'NotificationReport'
-  #  - 'FindingsReport'
-  #  - 'BuildFailureReport'
 
 comments:
   active: true
@@ -304,13 +287,11 @@ naming:
     excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
   FunctionParameterNaming:
     active: true
     excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     parameterPattern: '[a-z][A-Za-z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
   InvalidPackageDeclaration:
     active: false
     rootPackage: ''
@@ -349,7 +330,6 @@ naming:
     variablePattern: '[a-z][A-Za-z0-9]*'
     privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
 
 performance:
   active: true
@@ -421,7 +401,7 @@ style:
     includeLineWrapping: false
   ForbiddenComment:
     active: true
-    values: [ 'FIXME:','STOPSHIP:' ]
+    comments: [ 'FIXME:','STOPSHIP:' ]
   ForbiddenImport:
     active: false
     imports: [ ]
@@ -432,7 +412,7 @@ style:
     active: false
     ignoreOverridableFunction: true
     excludedFunctions:
-     - 'describeContents'
+      - 'describeContents'
   LoopWithTooManyJumpStatements:
     active: false
     maxJumpCount: 1
@@ -448,8 +428,6 @@ style:
     ignoreNamedArgument: true
     ignoreEnums: false
     ignoreRanges: false
-  MandatoryBracesIfStatements:
-    active: false
   MaxLineLength:
     active: true
     excludes: "**/*Configuration.kt"
@@ -471,8 +449,6 @@ style:
     active: true
   OptionalUnit:
     active: false
-  OptionalWhenBraces:
-    active: false
   PreferToOverPairSyntax:
     active: false
   ProtectedMemberInFinalClass:
@@ -483,7 +459,7 @@ style:
     active: true
     max: 2
     excludedFunctions:
-     - "equals"
+      - "equals"
     excludeLabeled: false
     excludeReturnFromLambda: true
   SafeCast:

diff --git a/pom.xml b/pom.xml
@@ -5,24 +5,25 @@
     <groupId>org.sheinbergon</groupId>
     <artifactId>dremio-udf-gis</artifactId>
     <properties>
+
         <checkstyle.version>9.3</checkstyle.version>
-        <dremio.version>24.3.0-202312190021150029-52db2faf</dremio.version>
-        <dremio-arrow.version>12.0.3-20231120223228-a225426e14-dremio</dremio-arrow.version>
+        <dremio.version>25.0.0-202404051521110861-ed9515a8</dremio.version>
+        <dremio-arrow.version>14.0.2-20240131150813-452ae43b2e-dremio</dremio-arrow.version>
         <proj4j.version>1.3.0</proj4j.version>
         <jts-core.version>1.19.0</jts-core.version>
         <jts-io-common.version>1.19.0</jts-io-common.version>
         <commons-io.version>2.11.0</commons-io.version>
         <junit.version>4.13.2</junit.version>
-        <junit-jupiter.version>5.10.1</junit-jupiter.version>
-        <junit-platform.version>1.10.1</junit-platform.version>
-        <kotlin.version>1.9.21</kotlin.version>
-        <kotest.version>5.7.2</kotest.version>
+        <junit-jupiter.version>5.10.2</junit-jupiter.version>
+        <junit-platform.version>1.10.2</junit-platform.version>
+        <kotlin.version>1.9.23</kotlin.version>
+        <kotest.version>5.9.0</kotest.version>
         <joda.version>2.9</joda.version>
-        <detekt.version>1.23.4</detekt.version>
+        <detekt.version>1.23.5</detekt.version>
         <carrotsearch.version>0.7.0</carrotsearch.version>
-        <arrow-memory-netty.version>12.0.1</arrow-memory-netty.version>
+        <arrow-memory-netty.version>14.0.2</arrow-memory-netty.version>
     </properties>
-    <version>0.13.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
     <name>dremio-udf-gis</name>
     <description>GIS UDF extensions for Dremio</description>
     <url>https://github.com/sheinbergon/dremio-udf-gis</url>
@@ -240,7 +241,7 @@
                 <artifactId>detekt-maven-plugin</artifactId>
                 <version>${detekt.version}</version>
                 <configuration>
-                    <jvmTarget>1.8</jvmTarget>
+                    <jvmTarget>11</jvmTarget>
                     <config>detekt.yml</config>
                 </configuration>
                 <executions>
@@ -325,8 +326,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
                 <executions>
                     <execution>
@@ -394,18 +395,13 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <jvmTarget>1.8</jvmTarget>
+                    <jvmTarget>11</jvmTarget>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
-            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>0.8.10</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>
@@ -438,70 +434,15 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin.version}</version>
-                <executions>
-                    <execution>
-                        <id>test-compile</id>
-                        <phase>process-test-sources</phase>
-                        <goals>
-                            <goal>test-compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>compile</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <jvmTarget>1.8</jvmTarget>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-                <version>4.3.0</version>
+                <version>3.1.2</version>
                 <configuration>
-                    <sourceEncoding>UTF-8</sourceEncoding>
-                    <repoToken>${env.COVERALLS_TOKEN}</repoToken>
+                    <systemPropertyVariables>
+                        <kotest.framework.classpath.scanning.autoscan.disable>true</kotest.framework.classpath.scanning.autoscan.disable>
+                    </systemPropertyVariables>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                        <version>2.3.1</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
@@ -529,7 +470,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.2.4</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

diff --git a/src/main/java/org/sheinbergon/dremio/udf/gis/STAsText.java b/src/main/java/org/sheinbergon/dremio/udf/gis/STAsText.java
@@ -22,8 +22,6 @@
 import com.dremio.exec.expr.annotations.Output;
 import com.dremio.exec.expr.annotations.Param;
 
-
-
 import javax.inject.Inject;
 
 @FunctionTemplate(

diff --git a/src/main/java/org/sheinbergon/dremio/udf/gis/util/GeometryHelpers.java b/src/main/java/org/sheinbergon/dremio/udf/gis/util/GeometryHelpers.java
@@ -67,13 +67,6 @@ public static Geometry emptyGeometry() {
     return factory.createEmpty(GEOMETRY_DIMENSIONS);
   }
 
-  public static String toUTF8String(final @Nonnull VarCharHolder holder) {
-    return StringFunctionHelpers.toStringFromUTF8(
-        holder.start,
-        holder.end,
-        holder.buffer);
-  }
-
   public static String toUTF8String(final @Nonnull NullableVarCharHolder holder) {
     return StringFunctionHelpers.toStringFromUTF8(
         holder.start,
@@ -233,10 +226,6 @@ public static Geometry toGeometry(
     }
   }
 
-  public static int toBitValue(final boolean value) {
-    return value ? BIT_TRUE : BIT_FALSE;
-  }
-
   public static void populate(
       final @Nonnull byte[] bytes,
       final @Nonnull ArrowBuf buffer,