This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 9cea3cd0c1673629eb10899a5b1e474e6ade3163 Author: Michael Blow <[email protected]> AuthorDate: Wed Feb 14 21:46:33 2024 -0500 [NO ISSUE] Update impsort-maven-plugin to 1.9.0 Change-Id: I8bd95ea62048ad97f358fd895c3c1e1ff6a33e51 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18165 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Tested-by: Michael Blow <[email protected]> --- .../asterix/external/util/ExternalDataUtils.java | 20 ++++++++++---------- asterixdb/pom.xml | 9 ++++++++- hyracks-fullstack/pom.xml | 9 ++++++++- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java index 144af3b8ee..b61d62dd61 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java @@ -29,6 +29,16 @@ import static org.apache.asterix.common.exceptions.ErrorCode.PARAM_NOT_ALLOWED_I import static org.apache.asterix.common.exceptions.ErrorCode.REQUIRED_PARAM_IF_PARAM_IS_PRESENT; import static org.apache.asterix.common.exceptions.ErrorCode.REQUIRED_PARAM_OR_PARAM_IF_PARAM_IS_PRESENT; import static org.apache.asterix.common.exceptions.ErrorCode.S3_REGION_NOT_SUPPORTED; +import static org.apache.asterix.external.util.ExternalDataConstants.KEY_ADAPTER_NAME_GCS; +import static org.apache.asterix.external.util.ExternalDataConstants.KEY_DELIMITER; +import static org.apache.asterix.external.util.ExternalDataConstants.KEY_ESCAPE; +import static org.apache.asterix.external.util.ExternalDataConstants.KEY_EXCLUDE; +import static org.apache.asterix.external.util.ExternalDataConstants.KEY_EXTERNAL_SCAN_BUFFER_SIZE; +import static org.apache.asterix.external.util.ExternalDataConstants.KEY_FORMAT; +import static org.apache.asterix.external.util.ExternalDataConstants.KEY_INCLUDE; +import static org.apache.asterix.external.util.ExternalDataConstants.KEY_QUOTE; +import static org.apache.asterix.external.util.ExternalDataConstants.KEY_RECORD_END; +import static org.apache.asterix.external.util.ExternalDataConstants.KEY_RECORD_START; import static org.apache.asterix.external.util.ExternalDataConstants.AwsS3.ACCESS_KEY_ID_FIELD_NAME; import static org.apache.asterix.external.util.ExternalDataConstants.AwsS3.ERROR_METHOD_NOT_IMPLEMENTED; import static org.apache.asterix.external.util.ExternalDataConstants.AwsS3.HADOOP_ACCESS_KEY_ID; @@ -57,16 +67,6 @@ import static org.apache.asterix.external.util.ExternalDataConstants.Azure.SHARE import static org.apache.asterix.external.util.ExternalDataConstants.Azure.TENANT_ID_FIELD_NAME; import static org.apache.asterix.external.util.ExternalDataConstants.GCS.APPLICATION_DEFAULT_CREDENTIALS_FIELD_NAME; import static org.apache.asterix.external.util.ExternalDataConstants.GCS.JSON_CREDENTIALS_FIELD_NAME; -import static org.apache.asterix.external.util.ExternalDataConstants.KEY_ADAPTER_NAME_GCS; -import static org.apache.asterix.external.util.ExternalDataConstants.KEY_DELIMITER; -import static org.apache.asterix.external.util.ExternalDataConstants.KEY_ESCAPE; -import static org.apache.asterix.external.util.ExternalDataConstants.KEY_EXCLUDE; -import static org.apache.asterix.external.util.ExternalDataConstants.KEY_EXTERNAL_SCAN_BUFFER_SIZE; -import static org.apache.asterix.external.util.ExternalDataConstants.KEY_FORMAT; -import static org.apache.asterix.external.util.ExternalDataConstants.KEY_INCLUDE; -import static org.apache.asterix.external.util.ExternalDataConstants.KEY_QUOTE; -import static org.apache.asterix.external.util.ExternalDataConstants.KEY_RECORD_END; -import static org.apache.asterix.external.util.ExternalDataConstants.KEY_RECORD_START; import static org.apache.asterix.runtime.evaluators.functions.StringEvaluatorUtils.RESERVED_REGEX_CHARS; import static org.apache.hyracks.api.util.ExceptionUtils.getMessageOrToString; diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 4cefd4a7e3..d1b7faf20e 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -652,7 +652,14 @@ <plugin> <groupId>net.revelc.code</groupId> <artifactId>impsort-maven-plugin</artifactId> - <version>1.2.0</version> + <version>1.9.0</version> + <dependencies> + <dependency> + <groupId>com.github.javaparser</groupId> + <artifactId>javaparser-core</artifactId> + <version>3.25.5</version> + </dependency> + </dependencies> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index e74aa77a15..487cadddd9 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -762,7 +762,14 @@ <plugin> <groupId>net.revelc.code</groupId> <artifactId>impsort-maven-plugin</artifactId> - <version>1.2.0</version> + <version>1.9.0</version> + <dependencies> + <dependency> + <groupId>com.github.javaparser</groupId> + <artifactId>javaparser-core</artifactId> + <version>3.25.5</version> + </dependency> + </dependencies> </plugin> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin>
