EA-16753

- upgrade to jdk17 by using insightvm-parent-library-pom - removed junit4 and used junit5
rapid7 · Nov 5, 2024 · ceee244 · ceee244
1 parent 3f6ca81
commit ceee244
Show file tree

Hide file tree

Showing 3 changed files with 143 additions and 147 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.rapid7.presto</groupId>
     <artifactId>presto-query-builder</artifactId>
-    <version>0.0.32-SNAPSHOT</version>
-    
+    <version>0.0.33-SNAPSHOT</version>
+
     <name>presto-query-builder</name>
-    <description>A Java library that will help you create queries for Presto programmatically. This will help you test your code and create dynamic queries.</description>
+    <description>A Java library that will help you create queries for Presto programmatically. This will help you test
+        your code and create dynamic queries.
+    </description>
     <url>https://github.com/rapid7/presto-query-builder</url>
 
+    <parent>
+        <groupId>com.rapid7.insightvm</groupId>
+        <artifactId>insightvm-parent-library-pom</artifactId>
+        <version>9.0.24</version>
+    </parent>
+
     <organization>
         <name>Rapid 7, Inc.</name>
         <url>http://www.rapid7.com</url>
@@ -49,41 +58,18 @@
         </repository>
     </distributionManagement>
 
+    <properties>
+        <presto.parser.version>0.249.1</presto.parser.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.facebook.presto</groupId>
             <artifactId>presto-parser</artifactId>
-            <version>0.240.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>24.1-jre</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
+            <version>${presto.parser.version}</version>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
             <id>release</id>
@@ -98,7 +84,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.7</version>
+                        <version>1.7.0</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>
@@ -110,50 +96,50 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>2.2.1</version>
+                        <version>3.3.1</version>
                         <executions>
                             <execution>
-                            <id>attach-sources</id>
-                            <goals>
-                                <goal>jar-no-fork</goal>
-                            </goals>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
                             </execution>
                         </executions>
                     </plugin>
 
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
+                        <version>3.11.1</version>
                         <executions>
                             <execution>
-                            <id>attach-javadocs</id>
-                            <goals>
-                                <goal>jar</goal>
-                            </goals>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
                             </execution>
                         </executions>
                     </plugin>
 
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
+                        <version>3.2.7</version>
                         <executions>
                             <execution>
-                            <id>sign-artifacts</id>
-                            <phase>verify</phase>
-                            <goals>
-                                <goal>sign</goal>
-                            </goals>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
                             </execution>
                         </executions>
                     </plugin>
 
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-release-plugin</artifactId>
-                        <version>2.5</version>
+                        <version>3.1.1</version>
                         <configuration>
                             <tagNameFormat>@{project.version}</tagNameFormat>
                         </configuration>

diff --git a/src/main/java/com/rapid7/presto/BasicSelectBuilder.java b/src/main/java/com/rapid7/presto/BasicSelectBuilder.java
@@ -297,8 +297,9 @@ private void completeQuery() {
   public QueryBody build() {
     completeQuery();
 
+    Optional<Boolean> optionalFalse = Optional.of(false);
     if (queries.size() > 1) {
-      return new Union(queries, false);
+      return new Union(queries, optionalFalse);
     } else {
       return (QueryBody) queries.get(0);
     }