Skip to content

Commit f8f712f

Browse files
committed
Fix vendor Calcite 1.40
1 parent 92bbf63 commit f8f712f

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

vendor/calcite-1_40_0/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ List<String> packagesToRelocate = [
5252
"net.minidev",
5353
"org.apache.calcite",
5454
"org.apache.commons",
55+
"org.apache.hc.core5",
56+
"org.apache.hc.client5",
5557
"org.apache.http",
5658
"org.apiguardian.api",
5759
"org.codehaus",
@@ -77,6 +79,7 @@ vendorJava(
7779
"com/google/errorprone/**",
7880
"com/google/j2objc/annotations/**",
7981
"javax/annotation/**",
82+
"javax/transaction/**",
8083
"org/checkerframework/**",
8184
"org/jmlspecs/**",
8285
"org/intellij/lang/annotations/**",
@@ -101,6 +104,11 @@ vendorJava(
101104
"com/jayway/jsonpath/spi/mapper/JsonOrgMappingProvider*",
102105
"com/jayway/jsonpath/spi/mapper/TapestryMappingProvider*",
103106

107+
// Unused Calcite's OpenGIS implementation
108+
"org/locationtech/jts/**",
109+
"org/locationtech/proj4j/**",
110+
"org/json/simple/**", // dependency of locationtech
111+
104112
// Unused broken code
105113
"org/apache/commons/dbcp2/managed/**",
106114
"org/apache/commons/pool2/proxy/**",

0 commit comments

Comments
 (0)