This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/main by this push:
new 2e8501a5 Update dependencies (#791)
2e8501a5 is described below
commit 2e8501a5a9027edebc32e9b7b16b081de17def50
Author: Bertil Chapuis <[email protected]>
AuthorDate: Tue Oct 24 11:26:12 2023 +0200
Update dependencies (#791)
* Update dependencies
* Fix build script
---
baremaps-cli/pom.xml | 2 +
baremaps-core/pom.xml | 1 -
baremaps-core/{pom.xml => pom.xml.versionsBackup} | 4 --
.../baremaps/tilestore/postgres/PostgresGroup.java | 6 +--
.../baremaps/tilestore/postgres/PostgresQuery.java | 3 +-
.../baremaps/database/calcite/CalciteTest.java | 12 ++---
pom.xml | 60 +++++++++++-----------
scripts/build-project.sh | 4 +-
8 files changed, 44 insertions(+), 48 deletions(-)
diff --git a/baremaps-cli/pom.xml b/baremaps-cli/pom.xml
index b42482e0..bb579c9f 100644
--- a/baremaps-cli/pom.xml
+++ b/baremaps-cli/pom.xml
@@ -151,6 +151,7 @@ limitations under the License.
<configuration>
<finalName>apache-${project.parent.artifactId}-${project.parent.version}-incubating-src</finalName>
<appendAssemblyId>false</appendAssemblyId>
+ <tarLongFileMode>posix</tarLongFileMode>
<descriptors>
<descriptor>src/assembly/src.xml</descriptor>
</descriptors>
@@ -165,6 +166,7 @@ limitations under the License.
<configuration>
<finalName>apache-${project.parent.artifactId}-${project.parent.version}-incubating-bin</finalName>
<appendAssemblyId>false</appendAssemblyId>
+ <tarLongFileMode>posix</tarLongFileMode>
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
</descriptors>
diff --git a/baremaps-core/pom.xml b/baremaps-core/pom.xml
index f7d3c99f..2b61c403 100644
--- a/baremaps-core/pom.xml
+++ b/baremaps-core/pom.xml
@@ -138,7 +138,6 @@ limitations under the License.
<dependency>
<groupId>org.wololo</groupId>
<artifactId>flatgeobuf</artifactId>
- <version>3.24.0</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
diff --git a/baremaps-core/pom.xml b/baremaps-core/pom.xml.versionsBackup
similarity index 97%
copy from baremaps-core/pom.xml
copy to baremaps-core/pom.xml.versionsBackup
index f7d3c99f..e4b75527 100644
--- a/baremaps-core/pom.xml
+++ b/baremaps-core/pom.xml.versionsBackup
@@ -54,10 +54,6 @@ limitations under the License.
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
</dependency>
- <dependency>
- <groupId>com.github.jsqlparser</groupId>
- <artifactId>jsqlparser</artifactId>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresGroup.java
b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresGroup.java
index 2c221ce2..de473ab4 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresGroup.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresGroup.java
@@ -33,7 +33,7 @@ import net.sf.jsqlparser.statement.select.SelectItem;
*/
class PostgresGroup {
- private final List<SelectItem> selectItems;
+ private final List<SelectItem<?>> selectItems;
private final FromItem fromItem;
private final List<Join> joins;
@@ -45,7 +45,7 @@ class PostgresGroup {
* @param fromItem the from clause
* @param joins the join clauses
*/
- public PostgresGroup(List<SelectItem> selectItems, FromItem fromItem,
List<Join> joins) {
+ public PostgresGroup(List<SelectItem<?>> selectItems, FromItem fromItem,
List<Join> joins) {
this.selectItems = selectItems;
this.fromItem = fromItem;
this.joins = joins;
@@ -56,7 +56,7 @@ class PostgresGroup {
*
* @return the selected columns
*/
- public List<SelectItem> getSelectItems() {
+ public List<SelectItem<?>> getSelectItems() {
return selectItems;
}
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQuery.java
b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQuery.java
index 7afa59bb..68cbf750 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQuery.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQuery.java
@@ -23,7 +23,6 @@ import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
import net.sf.jsqlparser.statement.select.PlainSelect;
import net.sf.jsqlparser.statement.select.Select;
-import net.sf.jsqlparser.statement.select.SelectExpressionItem;
import net.sf.jsqlparser.statement.select.SelectItem;
import net.sf.jsqlparser.statement.select.SelectItemVisitorAdapter;
@@ -120,7 +119,7 @@ public class PostgresQuery {
for (SelectItem selectItem : plainSelect.getSelectItems()) {
selectItem.accept(new SelectItemVisitorAdapter() {
@Override
- public void visit(SelectExpressionItem selectExpressionItem) {
+ public void visit(SelectItem selectExpressionItem) {
selectExpressionItem.setAlias(null);
}
});
diff --git
a/baremaps-core/src/test/java/org/apache/baremaps/database/calcite/CalciteTest.java
b/baremaps-core/src/test/java/org/apache/baremaps/database/calcite/CalciteTest.java
index ed22aee5..3943456a 100644
---
a/baremaps-core/src/test/java/org/apache/baremaps/database/calcite/CalciteTest.java
+++
b/baremaps-core/src/test/java/org/apache/baremaps/database/calcite/CalciteTest.java
@@ -32,10 +32,10 @@ import org.apache.baremaps.database.type.RowDataType;
import org.apache.baremaps.vectortile.VectorTileFunctions;
import org.apache.calcite.jdbc.CalciteConnection;
import org.apache.calcite.model.ModelHandler;
+import org.apache.calcite.runtime.AccumOperation;
+import org.apache.calcite.runtime.CollectOperation;
import org.apache.calcite.runtime.SpatialTypeFunctions;
-import org.apache.calcite.runtime.SpatialTypeFunctions.Accum;
-import org.apache.calcite.runtime.SpatialTypeFunctions.Collect;
-import org.apache.calcite.runtime.SpatialTypeFunctions.Union;
+import org.apache.calcite.runtime.UnionOperation;
import org.apache.calcite.schema.SchemaPlus;
import org.apache.calcite.schema.impl.AggregateFunctionImpl;
import org.apache.calcite.sql.fun.SqlSpatialTypeFunctions;
@@ -63,9 +63,9 @@ public class CalciteTest {
ModelHandler.addFunctions(rootSchema, null, emptyPath,
SqlSpatialTypeFunctions.class.getName(), "*", true);
- rootSchema.add("ST_UNION", AggregateFunctionImpl.create(Union.class));
- rootSchema.add("ST_ACCUM", AggregateFunctionImpl.create(Accum.class));
- rootSchema.add("ST_COLLECT",
AggregateFunctionImpl.create(Collect.class));
+ rootSchema.add("ST_UNION",
AggregateFunctionImpl.create(UnionOperation.class));
+ rootSchema.add("ST_ACCUM",
AggregateFunctionImpl.create(AccumOperation.class));
+ rootSchema.add("ST_COLLECT",
AggregateFunctionImpl.create(CollectOperation.class));
ModelHandler.addFunctions(rootSchema, "ST_AsMVTGeom", emptyPath,
VectorTileFunctions.class.getName(), "asVectorTileGeom", true);
diff --git a/pom.xml b/pom.xml
index bd0d0906..e02e1e5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,55 +82,55 @@ limitations under the License.
<sonar.projectKey>apache_baremaps</sonar.projectKey>
<version.lib.activation>1.2.2</version.lib.activation>
<version.lib.annotation-api>1.3.2</version.lib.annotation-api>
- <version.lib.awaitability>3.0.0</version.lib.awaitability>
- <version.lib.awssdk>2.17.284</version.lib.awssdk>
- <version.lib.caffeine>3.1.1</version.lib.caffeine>
- <version.lib.calcite>1.34.0</version.lib.calcite>
- <version.lib.commons-compress>1.21</version.lib.commons-compress>
- <version.lib.fastutil>8.5.9</version.lib.fastutil>
- <version.lib.flatgeobuf>3.24.0</version.lib.flatgeobuf>
- <version.lib.geopackage>6.5.0</version.lib.geopackage>
- <version.lib.graalvm>22.2.0</version.lib.graalvm>
- <version.lib.guava>31.1-jre</version.lib.guava>
+ <version.lib.awaitability>4.2.0</version.lib.awaitability>
+ <version.lib.awssdk>2.21.5</version.lib.awssdk>
+ <version.lib.caffeine>3.1.8</version.lib.caffeine>
+ <version.lib.calcite>1.35.0</version.lib.calcite>
+ <version.lib.commons-compress>1.24.0</version.lib.commons-compress>
+ <version.lib.fastutil>8.5.12</version.lib.fastutil>
+ <version.lib.flatgeobuf>3.26.1</version.lib.flatgeobuf>
+ <version.lib.geopackage>6.6.3</version.lib.geopackage>
+ <version.lib.graalvm>23.0.2</version.lib.graalvm>
+ <version.lib.guava>32.1.3-jre</version.lib.guava>
<version.lib.hikari>5.0.1</version.lib.hikari>
- <version.lib.ipresource>1.49</version.lib.ipresource>
+ <version.lib.ipresource>1.52</version.lib.ipresource>
<version.lib.jackson>2.13.0</version.lib.jackson>
<version.lib.jakarta>2.1.6</version.lib.jakarta>
<version.lib.jaxb-runtime>2.3.5</version.lib.jaxb-runtime>
- <version.lib.jersey>2.35</version.lib.jersey>
+ <version.lib.jersey>2.37</version.lib.jersey>
<version.lib.jmh>1.35</version.lib.jmh>
- <version.lib.jsqlparser>4.2</version.lib.jsqlparser>
+ <version.lib.jsqlparser>4.7</version.lib.jsqlparser>
<version.lib.jts>1.19.0</version.lib.jts>
- <version.lib.junit>5.7.1</version.lib.junit>
- <version.lib.junit-vintage>5.7.2</version.lib.junit-vintage>
- <version.lib.log4j>2.20.0</version.lib.log4j>
- <version.lib.pgbulkinsert>8.1.0</version.lib.pgbulkinsert>
- <version.lib.picocli>4.6.3</version.lib.picocli>
- <version.lib.postgresql>42.5.0</version.lib.postgresql>
- <version.lib.proj4j>1.2.3</version.lib.proj4j>
+ <version.lib.junit>5.10.0</version.lib.junit>
+ <version.lib.junit-vintage>5.10.0</version.lib.junit-vintage>
+ <version.lib.log4j>3.0.0-alpha1</version.lib.log4j>
+ <version.lib.pgbulkinsert>8.1.2</version.lib.pgbulkinsert>
+ <version.lib.picocli>4.7.5</version.lib.picocli>
+ <version.lib.postgresql>42.6.0</version.lib.postgresql>
+ <version.lib.proj4j>1.3.0</version.lib.proj4j>
<version.lib.protobuf>3.21.6</version.lib.protobuf>
- <version.lib.roaringbitmap>0.9.38</version.lib.roaringbitmap>
- <version.lib.servicetalk>0.42.28</version.lib.servicetalk>
+ <version.lib.roaringbitmap>1.0.0</version.lib.roaringbitmap>
+ <version.lib.servicetalk>0.42.38</version.lib.servicetalk>
<version.lib.servlet>3.1.0</version.lib.servlet>
- <version.lib.slf4j>2.0.7</version.lib.slf4j>
- <version.lib.sqlite>3.39.3.0</version.lib.sqlite>
- <version.lib.swagger-parser>2.1.13</version.lib.swagger-parser>
- <version.lib.testcontainers>1.17.3</version.lib.testcontainers>
+ <version.lib.slf4j>2.0.9</version.lib.slf4j>
+ <version.lib.sqlite>3.43.2.1</version.lib.sqlite>
+ <version.lib.swagger-parser>2.1.18</version.lib.swagger-parser>
+ <version.lib.testcontainers>1.19.1</version.lib.testcontainers>
<version.lib.validation>2.0.2</version.lib.validation>
<version.lucene>9.4.2</version.lucene>
<version.lucene-spatial>9.4.2</version.lucene-spatial>
-
<version.plugin.jacoco-maven-plugin>0.8.8</version.plugin.jacoco-maven-plugin>
+
<version.plugin.jacoco-maven-plugin>0.8.11</version.plugin.jacoco-maven-plugin>
<version.plugin.jib-maven-plugin>3.0.0</version.plugin.jib-maven-plugin>
<version.plugin.maven-compiler-plugin>3.10.1</version.plugin.maven-compiler-plugin>
<version.plugin.maven-exec-plugin>3.0.0</version.plugin.maven-exec-plugin>
<version.plugin.maven-gpg-plugin>1.6</version.plugin.maven-gpg-plugin>
<version.plugin.maven-jar-plugin>3.3.0</version.plugin.maven-jar-plugin>
<version.plugin.maven-javadoc-plugin>3.2.0</version.plugin.maven-javadoc-plugin>
- <version.plugin.maven-jxr-plugin>3.1.1</version.plugin.maven-jxr-plugin>
+ <version.plugin.maven-jxr-plugin>3.3.1</version.plugin.maven-jxr-plugin>
<version.plugin.maven-release-plugin>2.5.3</version.plugin.maven-release-plugin>
<version.plugin.maven-scm-plugin>1.11.2</version.plugin.maven-scm-plugin>
<version.plugin.maven-source-plugin>3.2.1</version.plugin.maven-source-plugin>
-
<version.plugin.maven-surefire-plugin>2.22.2</version.plugin.maven-surefire-plugin>
+
<version.plugin.maven-surefire-plugin>3.2.1</version.plugin.maven-surefire-plugin>
<version.plugin.maven-surefire-plugin.provider.junit>1.3.2</version.plugin.maven-surefire-plugin.provider.junit>
<version.plugin.nexus-staging-maven-plugin>1.6.13</version.plugin.nexus-staging-maven-plugin>
<!-- Using version [6.3.0,6.5.0] creates an issue with usage of
java.util.Arrays and missing necessary import
@@ -138,7 +138,7 @@ limitations under the License.
<version.plugin.openapi-generator-maven-plugin>6.2.1</version.plugin.openapi-generator-maven-plugin>
<version.plugin.os-maven-plugin>1.7.0</version.plugin.os-maven-plugin>
<version.plugin.protobuf-maven-plugin>0.6.1</version.plugin.protobuf-maven-plugin>
-
<version.plugin.spotless-maven-plugin>2.33.0</version.plugin.spotless-maven-plugin>
+
<version.plugin.spotless-maven-plugin>2.40.0</version.plugin.spotless-maven-plugin>
</properties>
<dependencyManagement>
diff --git a/scripts/build-project.sh b/scripts/build-project.sh
index 4d2ef078..b1f0dcb6 100755
--- a/scripts/build-project.sh
+++ b/scripts/build-project.sh
@@ -27,8 +27,8 @@ echo ""
cd ..
./mvnw spotless:apply clean install -DskipTests
rm -fr baremaps
-tar -xvf
./baremaps-cli/target/apache-baremaps-0.7.2-SNAPSHOT-incubating-bin.tar.gz -C
target/
-mv ./target/apache-baremaps-0.7.2-SNAPSHOT-incubating-bin ./baremaps
+tar -xvf
./baremaps-cli/target/apache-baremaps-0.7.3-SNAPSHOT-incubating-bin.tar.gz -C
target/
+mv ./target/apache-baremaps-0.7.3-SNAPSHOT-incubating-bin ./baremaps
export PATH=$PATH:`pwd`/baremaps/bin
echo ""
