Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@bchapuis
bchapuis committed Oct 23, 2023
1 parent 9eaeaec commit 0100e01
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 41 deletions.
2 changes: 2 additions & 0 deletions baremaps-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/
class PostgresGroup {

private final List<SelectItem> selectItems;
private final List<SelectItem<?>> selectItems;
private final FromItem fromItem;
private final List<Join> joins;

Expand All @@ -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;
Expand All @@ -56,7 +56,7 @@ public PostgresGroup(List<SelectItem> selectItems, FromItem fromItem, List<Join>
*
* @return the selected columns
*/
public List<SelectItem> getSelectItems() {
public List<SelectItem<?>> getSelectItems() {
return selectItems;
}

Expand Down
3 changes: 1 addition & 2 deletions baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQuery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
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;

Expand Down Expand Up @@ -120,7 +119,7 @@ private PlainSelect parse(String query) {
for (SelectItem selectItem : plainSelect.getSelectItems()) {
selectItem.accept(new SelectItemVisitorAdapter() {
@Override
public void visit(SelectExpressionItem selectExpressionItem) {
public void visit(SelectItem selectExpressionItem) {
selectExpressionItem.setAlias(null);
}
});
Expand Down
12 changes: 6 additions & 6 deletions baremaps-core/src/test/java/org/apache/baremaps/database/calcite/CalciteTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
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;
Expand Down Expand Up @@ -63,9 +63,9 @@ public void test() throws SQLException {
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);
Expand Down
60 changes: 30 additions & 30 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,63 +82,63 @@ 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
similar to https://github.com/OpenAPITools/openapi-generator/issues/8408 -->
<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>
Expand Down

0 comments on commit 0100e01

Please sign in to comment.