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 57882c8b747fa0fc42648f23a0d4b1dbcd67a85b Merge: ac81f12836 4cb70d8dd5 Author: Michael Blow <[email protected]> AuthorDate: Fri Oct 27 10:37:34 2023 -0400 Merge branch 'gerrit/trinity' into 'master' Change-Id: Ic281767d6cc45acc53b1d4f5f6881ad984797200 .../apache/asterix/translator/ResultMetadata.java | 9 ++ .../asterix/app/result/JobResultCallback.java | 1 + .../asterix/app/translator/QueryTranslator.java | 5 +- asterixdb/asterix-server/pom.xml | 6 +- asterixdb/pom.xml | 12 +-- .../appended-resources/supplemental-models.xml | 20 ++--- .../hyracks-examples/hyracks-shutdown-test/pom.xml | 10 +-- hyracks-fullstack/hyracks/hyracks-http/pom.xml | 1 - .../org/apache/hyracks/http/server/CLFLogger.java | 12 ++- .../hyracks/http/server/HttpServerInitializer.java | 6 +- hyracks-fullstack/hyracks/hyracks-server/pom.xml | 63 +------------- .../hyracks-server-test}/pom.xml | 98 ++++++---------------- .../apache/hyracks/test/server/NCServiceIT.java | 2 +- .../test/server/process/HyracksCCProcess.java | 0 .../server/process/HyracksNCServiceProcess.java | 0 .../test/server/process/HyracksServerProcess.java | 0 .../test/server/process/HyracksVirtualCluster.java | 0 .../src/test/resources/NCServiceIT/cc.conf | 0 .../src/test/resources/NCServiceIT/nc-blue.conf | 0 .../src/test/resources/NCServiceIT/nc-red.conf | 0 .../src/test/resources/logging.properties | 0 hyracks-fullstack/hyracks/hyracks-tests/pom.xml | 1 + hyracks-fullstack/pom.xml | 15 ++-- 23 files changed, 89 insertions(+), 172 deletions(-) diff --cc asterixdb/pom.xml index 8f97ef46c4,90634944a3..e31b4ac200 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -81,20 -81,16 +81,20 @@@ <shim.stage>none</shim.stage> <pytestlib.stage>none</pytestlib.stage> <skip-npm-touch.stage>none</skip-npm-touch.stage> + <azurite.npm.install.stage>none</azurite.npm.install.stage> + <azurite.install.stage>none</azurite.install.stage> + <azurite.stage>none</azurite.stage> <!-- Versions under dependencymanagement or used in many projects via properties --> - <algebricks.version>0.3.8.2-SNAPSHOT</algebricks.version> - <hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version> + <algebricks.version>0.3.9-SNAPSHOT</algebricks.version> + <hyracks.version>0.3.9-SNAPSHOT</hyracks.version> <hadoop.version>3.3.6</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> - <log4j.version>2.19.0</log4j.version> + <log4j.version>2.21.1</log4j.version> - <awsjavasdk.version>2.17.218</awsjavasdk.version> + <awsjavasdk.version>2.20.135</awsjavasdk.version> + <awsjavasdk.crt.version>0.27.1</awsjavasdk.crt.version> <parquet.version>1.12.3</parquet.version> - <hadoop-awsjavasdk.version>1.12.402</hadoop-awsjavasdk.version> + <hadoop-awsjavasdk.version>1.12.572</hadoop-awsjavasdk.version> <azureblobjavasdk.version>12.22.0</azureblobjavasdk.version> <azurecommonjavasdk.version>12.21.0</azurecommonjavasdk.version> <azureidentity.version>1.9.0</azureidentity.version> diff --cc hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml index 2ce2473e8f,bd7bf759ff..47113900f7 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml @@@ -19,12 -19,12 +19,12 @@@ <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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <artifactId>hyracks-server</artifactId> - <name>hyracks-server</name> + <artifactId>hyracks-server-test</artifactId> + <name>hyracks-server-test</name> <parent> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks</artifactId> + <artifactId>hyracks-tests</artifactId> - <version>0.3.8.2-SNAPSHOT</version> + <version>0.3.9-SNAPSHOT</version> </parent> <licenses>
