Skip to content

Commit c5bf7f4

Browse files
aozandemirel-r7aozandemirel-r7
committed
EA-16753
- upgrade to jdk17 by using insightvm-parent-library-pom - removed junit4 and used junit5
1 parent 3f6ca81 commit c5bf7f4

File tree

4 files changed

+145
-147
lines changed

4 files changed

+145
-147
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*.iml
2+
.idea
23
target
4+
release.properties

‎pom.xml‎

Lines changed: 36 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<groupId>com.rapid7.presto</groupId>
67
<artifactId>presto-query-builder</artifactId>
7-
<version>0.0.32-SNAPSHOT</version>
8-
8+
<version>0.0.33-SNAPSHOT</version>
9+
910
<name>presto-query-builder</name>
10-
<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>
11+
<description>A Java library that will help you create queries for Presto programmatically. This will help you test
12+
your code and create dynamic queries.
13+
</description>
1114
<url>https://github.com/rapid7/presto-query-builder</url>
1215

16+
<parent>
17+
<groupId>com.rapid7.insightvm</groupId>
18+
<artifactId>insightvm-parent-library-pom</artifactId>
19+
<version>9.0.24</version>
20+
</parent>
21+
1322
<organization>
1423
<name>Rapid 7, Inc.</name>
1524
<url>http://www.rapid7.com</url>
@@ -49,41 +58,18 @@
4958
</repository>
5059
</distributionManagement>
5160

61+
<properties>
62+
<presto.parser.version>0.249.1</presto.parser.version>
63+
</properties>
64+
5265
<dependencies>
5366
<dependency>
5467
<groupId>com.facebook.presto</groupId>
5568
<artifactId>presto-parser</artifactId>
56-
<version>0.240.1</version>
57-
</dependency>
58-
59-
<dependency>
60-
<groupId>com.google.guava</groupId>
61-
<artifactId>guava</artifactId>
62-
<version>24.1-jre</version>
63-
</dependency>
64-
65-
<dependency>
66-
<groupId>junit</groupId>
67-
<artifactId>junit</artifactId>
68-
<version>4.12</version>
69-
<scope>test</scope>
69+
<version>${presto.parser.version}</version>
7070
</dependency>
7171
</dependencies>
7272

73-
<build>
74-
<plugins>
75-
<plugin>
76-
<groupId>org.apache.maven.plugins</groupId>
77-
<artifactId>maven-compiler-plugin</artifactId>
78-
<version>3.8.0</version>
79-
<configuration>
80-
<source>1.8</source>
81-
<target>1.8</target>
82-
</configuration>
83-
</plugin>
84-
</plugins>
85-
</build>
86-
8773
<profiles>
8874
<profile>
8975
<id>release</id>
@@ -98,7 +84,7 @@
9884
<plugin>
9985
<groupId>org.sonatype.plugins</groupId>
10086
<artifactId>nexus-staging-maven-plugin</artifactId>
101-
<version>1.6.7</version>
87+
<version>1.7.0</version>
10288
<extensions>true</extensions>
10389
<configuration>
10490
<serverId>ossrh</serverId>
@@ -110,50 +96,50 @@
11096
<plugin>
11197
<groupId>org.apache.maven.plugins</groupId>
11298
<artifactId>maven-source-plugin</artifactId>
113-
<version>2.2.1</version>
99+
<version>3.3.1</version>
114100
<executions>
115101
<execution>
116-
<id>attach-sources</id>
117-
<goals>
118-
<goal>jar-no-fork</goal>
119-
</goals>
102+
<id>attach-sources</id>
103+
<goals>
104+
<goal>jar-no-fork</goal>
105+
</goals>
120106
</execution>
121107
</executions>
122108
</plugin>
123109

124110
<plugin>
125111
<groupId>org.apache.maven.plugins</groupId>
126112
<artifactId>maven-javadoc-plugin</artifactId>
127-
<version>2.9.1</version>
113+
<version>3.11.1</version>
128114
<executions>
129115
<execution>
130-
<id>attach-javadocs</id>
131-
<goals>
132-
<goal>jar</goal>
133-
</goals>
116+
<id>attach-javadocs</id>
117+
<goals>
118+
<goal>jar</goal>
119+
</goals>
134120
</execution>
135121
</executions>
136122
</plugin>
137123

138124
<plugin>
139125
<groupId>org.apache.maven.plugins</groupId>
140126
<artifactId>maven-gpg-plugin</artifactId>
141-
<version>1.5</version>
127+
<version>3.2.7</version>
142128
<executions>
143129
<execution>
144-
<id>sign-artifacts</id>
145-
<phase>verify</phase>
146-
<goals>
147-
<goal>sign</goal>
148-
</goals>
130+
<id>sign-artifacts</id>
131+
<phase>verify</phase>
132+
<goals>
133+
<goal>sign</goal>
134+
</goals>
149135
</execution>
150136
</executions>
151137
</plugin>
152138

153139
<plugin>
154140
<groupId>org.apache.maven.plugins</groupId>
155141
<artifactId>maven-release-plugin</artifactId>
156-
<version>2.5</version>
142+
<version>3.1.1</version>
157143
<configuration>
158144
<tagNameFormat>@{project.version}</tagNameFormat>
159145
</configuration>

‎src/main/java/com/rapid7/presto/BasicSelectBuilder.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,9 @@ private void completeQuery() {
297297
public QueryBody build() {
298298
completeQuery();
299299

300+
Optional<Boolean> optionalFalse = Optional.of(false);
300301
if (queries.size() > 1) {
301-
return new Union(queries, false);
302+
return new Union(queries, optionalFalse);
302303
} else {
303304
return (QueryBody) queries.get(0);
304305
}

0 commit comments

Comments
 (0)