You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2023/10/27 16:35:49 UTC
(asterixdb) branch master updated (ac81f12836 -> 57882c8b74)
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
from ac81f12836 [ASTERIXDB-3287][SQL++] Support parsing COPY TO statement
new 84edbf672e [NO ISSUE][HYR][TEST] Refactor hyracks-server tests to avoid dependency issues
new 75d9e2b4f6 [NO ISSUE][MISC] Update dependencies
new 4a5fba2ba6 [NO ISSUE][API] Fixing regression introduced in fix for ASTERIXDB-3277
new 4cb70d8dd5 [NO ISSUE][HYR][HTTP] Enable CLF logger instance customization
new 57882c8b74 Merge branch 'gerrit/trinity' into 'master'
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
copy hyracks-fullstack/hyracks/{hyracks-server => hyracks-tests/hyracks-server-test}/pom.xml (68%)
rename hyracks-fullstack/hyracks/{hyracks-server => hyracks-tests/hyracks-server-test}/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java (97%)
rename hyracks-fullstack/hyracks/{hyracks-server => hyracks-tests/hyracks-server-test}/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java (100%)
rename hyracks-fullstack/hyracks/{hyracks-server => hyracks-tests/hyracks-server-test}/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java (100%)
rename hyracks-fullstack/hyracks/{hyracks-server => hyracks-tests/hyracks-server-test}/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java (100%)
rename hyracks-fullstack/hyracks/{hyracks-server => hyracks-tests/hyracks-server-test}/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java (100%)
rename hyracks-fullstack/hyracks/{hyracks-server => hyracks-tests/hyracks-server-test}/src/test/resources/NCServiceIT/cc.conf (100%)
rename hyracks-fullstack/hyracks/{hyracks-server => hyracks-tests/hyracks-server-test}/src/test/resources/NCServiceIT/nc-blue.conf (100%)
rename hyracks-fullstack/hyracks/{hyracks-server => hyracks-tests/hyracks-server-test}/src/test/resources/NCServiceIT/nc-red.conf (100%)
rename hyracks-fullstack/hyracks/{hyracks-server => hyracks-tests/hyracks-server-test}/src/test/resources/logging.properties (100%)
(asterixdb) 04/05: [NO ISSUE][HYR][HTTP] Enable CLF logger instance customization
Posted by mb...@apache.org.
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 4cb70d8dd5d4ee241062155e41a90d847fb59a46
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Oct 25 23:34:03 2023 -0400
[NO ISSUE][HYR][HTTP] Enable CLF logger instance customization
Change-Id: Ia0a322fd0d193e21a16d654990253f6a6ad5bb0b
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17881
Reviewed-by: Ian Maxon <im...@uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Michael Blow <mb...@apache.org>
---
.../main/java/org/apache/hyracks/http/server/CLFLogger.java | 12 +++++++++---
.../apache/hyracks/http/server/HttpServerInitializer.java | 6 +++++-
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/CLFLogger.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/CLFLogger.java
index 1f5b441b95..219995b8e3 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/CLFLogger.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/CLFLogger.java
@@ -47,8 +47,9 @@ public class CLFLogger extends ChannelDuplexHandler {
private static final Level ACCESS_LOG_LEVEL = Level.forName("ACCESS", 550);
private static final DateTimeFormatter DATE_TIME_FORMATTER =
DateTimeFormatter.ofPattern("dd/MMM/yyyy:HH:mm:ss Z").withZone(ZoneId.systemDefault());
- private StringBuilder logLineBuilder;
+ private final StringBuilder logLineBuilder;
+ private final Logger accessLogger;
private String clientIp;
private Instant requestTime;
private String reqLine;
@@ -58,7 +59,12 @@ public class CLFLogger extends ChannelDuplexHandler {
private boolean lastChunk = false;
public CLFLogger() {
+ this(LOGGER);
+ }
+
+ public CLFLogger(Logger accessLogger) {
this.logLineBuilder = new StringBuilder();
+ this.accessLogger = accessLogger;
respSize = 0;
}
@@ -121,7 +127,7 @@ public class CLFLogger extends ChannelDuplexHandler {
}
private void printAndPrepare() {
- if (!LOGGER.isEnabled(ACCESS_LOG_LEVEL)) {
+ if (!accessLogger.isEnabled(ACCESS_LOG_LEVEL)) {
return;
}
logLineBuilder.append(clientIp);
@@ -136,7 +142,7 @@ public class CLFLogger extends ChannelDuplexHandler {
logLineBuilder.append(" ").append(statusCode);
logLineBuilder.append(" ").append(respSize);
logLineBuilder.append(" ").append(userAgentRef);
- LOGGER.log(ACCESS_LOG_LEVEL, logLineBuilder);
+ accessLogger.log(ACCESS_LOG_LEVEL, logLineBuilder);
respSize = 0;
logLineBuilder.setLength(0);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerInitializer.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerInitializer.java
index b7b33a7296..ad8a61f4a0 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerInitializer.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerInitializer.java
@@ -49,8 +49,12 @@ public class HttpServerInitializer extends ChannelInitializer<SocketChannel> {
p.addLast(new HttpRequestCapacityController(server));
p.addLast(new HttpRequestDecoder(maxRequestInitialLineLength, maxRequestHeaderSize, maxRequestChunkSize));
p.addLast(new HttpResponseEncoder());
- p.addLast(new CLFLogger());
+ p.addLast(getCLFLogger());
p.addLast(new HttpRequestAggregator(maxRequestSize));
p.addLast(server.createHttpHandler(maxResponseChunkSize));
}
+
+ protected CLFLogger getCLFLogger() {
+ return new CLFLogger();
+ }
}
(asterixdb) 03/05: [NO ISSUE][API] Fixing regression introduced in fix for ASTERIXDB-3277
Posted by mb...@apache.org.
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 4a5fba2ba6802d5c6ce28230fc77e5b08169224e
Author: Peeyush Gupta <pe...@couchbase.com>
AuthorDate: Wed Oct 25 22:02:38 2023 -0700
[NO ISSUE][API] Fixing regression introduced in fix for ASTERIXDB-3277
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
In the fix for ASTERIXDB-3277 a thread unsafe access to JobManager internal
state was used causing NullPointerException. This patch removes the unsafe
access.
Change-Id: I87df9b6e180a49ecccfc9fd2bcb2fa70c515c14d
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17882
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Peeyush Gupta <pe...@couchbase.com>
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Tested-by: Murtadha Hubail <mh...@apache.org>
---
.../main/java/org/apache/asterix/translator/ResultMetadata.java | 9 +++++++++
.../java/org/apache/asterix/app/result/JobResultCallback.java | 1 +
.../java/org/apache/asterix/app/translator/QueryTranslator.java | 5 +----
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ResultMetadata.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ResultMetadata.java
index 78f84ffaa5..60f4939a43 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ResultMetadata.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ResultMetadata.java
@@ -37,6 +37,7 @@ public class ResultMetadata implements IResultMetadata {
private Set<Warning> warnings;
private long totalWarningsCount;
private transient List<Object> outputTypes;
+ private long queueWaitTimeInNanos;
public ResultMetadata(SessionConfig.OutputFormat format) {
this.format = format;
@@ -104,6 +105,14 @@ public class ResultMetadata implements IResultMetadata {
return outputTypes;
}
+ public long getQueueWaitTimeInNanos() {
+ return queueWaitTimeInNanos;
+ }
+
+ public void setQueueWaitTimeInNanos(long queueWaitTimeInNanos) {
+ this.queueWaitTimeInNanos = queueWaitTimeInNanos;
+ }
+
@Override
public String toString() {
return "ResultMetadata{" + "format=" + format + ", jobDuration=" + jobDuration + ", processedObjects="
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/JobResultCallback.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/JobResultCallback.java
index 66d81d2ac4..ebf169fc65 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/JobResultCallback.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/JobResultCallback.java
@@ -93,6 +93,7 @@ public class JobResultCallback implements IJobResultCallback {
}
}
}
+ metadata.setQueueWaitTimeInNanos(run.getJobProfile().getQueueWaitTimeInNanos());
}
metadata.setProcessedObjects(processedObjects);
metadata.setWarnings(AggregateWarnings);
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index fc539ef3a0..d8b5d846cb 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -4778,10 +4778,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen
(org.apache.asterix.translator.ResultMetadata) controllerService.getResultDirectoryService()
.getResultMetadata(jobId, rsId);
stats.setProcessedObjects(resultMetadata.getProcessedObjects());
- if (controllerService.getJobManager().get(jobId) != null) {
- stats.setQueueWaitTime(
- controllerService.getJobManager().get(jobId).getJobProfile().getQueueWaitTimeInNanos());
- }
+ stats.setQueueWaitTime(resultMetadata.getQueueWaitTimeInNanos());
if (jobFlags.contains(JobFlag.PROFILE_RUNTIME)) {
stats.setJobProfile(resultMetadata.getJobProfile());
apiFramework.generateOptimizedLogicalPlanWithProfile(resultMetadata.getJobProfile());
(asterixdb) 01/05: [NO ISSUE][HYR][TEST] Refactor hyracks-server tests to avoid dependency issues
Posted by mb...@apache.org.
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 84edbf672e3a2596407feb087472b5c43392ab7c
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Mon Oct 23 18:16:53 2023 -0400
[NO ISSUE][HYR][TEST] Refactor hyracks-server tests to avoid dependency issues
Change-Id: I4f504f3137f843a2340e4b4558ec55e4f0fd9436
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17874
Reviewed-by: Michael Blow <mb...@apache.org>
Reviewed-by: Hussain Towaileb <hu...@gmail.com>
Tested-by: Michael Blow <mb...@apache.org>
Integration-Tests: Michael Blow <mb...@apache.org>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
---
asterixdb/asterix-server/pom.xml | 6 +-
asterixdb/pom.xml | 2 +-
.../hyracks-examples/hyracks-shutdown-test/pom.xml | 10 +--
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 +
15 files changed, 39 insertions(+), 143 deletions(-)
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 479ef8508b..a10b9693d9 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -544,8 +544,8 @@
<licenses>
<license>
<displayName>Various 3rd party</displayName>
- <url>file://${basedir}}/../asterix-dashboard/src/main/resources/dashboard/static/3rdpartylicenses.txt</url>
- <contentFile>${basedir}}/../asterix-dashboard/src/main/resources/dashboard/static/3rdpartylicenses.txt</contentFile>
+ <url>file://${basedir}/../asterix-dashboard/src/main/resources/dashboard/static/3rdpartylicenses.txt</url>
+ <contentFile>${basedir}/../asterix-dashboard/src/main/resources/dashboard/static/3rdpartylicenses.txt</contentFile>
</license>
<license>
<displayName>a BSD 3-clause license</displayName>
@@ -1147,7 +1147,7 @@
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-server</artifactId>
+ <artifactId>hyracks-server-test</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 398239d0cc..e54fea18c3 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -1312,7 +1312,7 @@
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-server</artifactId>
+ <artifactId>hyracks-server-test</artifactId>
<version>${hyracks.version}</version>
<type>test-jar</type>
</dependency>
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
index ab7c63c721..6c19207956 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml
@@ -43,6 +43,11 @@
<usedDependency>org.apache.hyracks:hyracks-control-nc</usedDependency>
<usedDependency>org.apache.hyracks:hyracks-control-cc</usedDependency>
</usedDependencies>
+ <ignoredNonTestScopedDependencies>
+ <ignoredNonTestScopedDependency>org.apache.hyracks:hyracks-ipc:*</ignoredNonTestScopedDependency>
+ <ignoredNonTestScopedDependency>org.apache.hyracks:hyracks-api:*</ignoredNonTestScopedDependency>
+ <ignoredNonTestScopedDependency>org.apache.logging.log4j:log4j-api:*</ignoredNonTestScopedDependency>
+ </ignoredNonTestScopedDependencies>
</configuration>
<executions>
<execution>
@@ -191,31 +196,26 @@
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-ipc</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-nc</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-cc</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/hyracks-fullstack/hyracks/hyracks-server/pom.xml b/hyracks-fullstack/hyracks/hyracks-server/pom.xml
index acf238e732..70db6a65ec 100644
--- a/hyracks-fullstack/hyracks/hyracks-server/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-server/pom.xml
@@ -42,23 +42,14 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies combine.children="append">
<usedDependency>org.apache.hyracks:hyracks-control-nc</usedDependency>
+ <usedDependency>org.apache.hyracks:hyracks-control-cc</usedDependency>
+ <usedDependency>org.apache.hyracks:hyracks-nc-service</usedDependency>
</usedDependencies>
</configuration>
<executions>
@@ -70,23 +61,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <runOrder>alphabetical</runOrder>
- <forkMode>pertest</forkMode>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
@@ -148,49 +122,16 @@
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-cc</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-nc-service</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-util</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-control-nc</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/hyracks-fullstack/hyracks/hyracks-server/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml
similarity index 68%
copy from hyracks-fullstack/hyracks/hyracks-server/pom.xml
copy to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml
index acf238e732..bd7bf759ff 100644
--- a/hyracks-fullstack/hyracks/hyracks-server/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml
@@ -19,11 +19,11 @@
<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>
</parent>
@@ -37,7 +37,7 @@
</licenses>
<properties>
- <root.dir>${basedir}/../..</root.dir>
+ <root.dir>${basedir}/../../..</root.dir>
</properties>
<build>
@@ -58,7 +58,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies combine.children="append">
- <usedDependency>org.apache.hyracks:hyracks-control-nc</usedDependency>
+ <usedDependency>org.apache.hyracks:hyracks-server</usedDependency>
</usedDependencies>
</configuration>
<executions>
@@ -86,61 +86,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <programs>
- <program>
- <mainClass>org.apache.hyracks.control.cc.CCDriver</mainClass>
- <name>hyrackscc</name>
- </program>
- <program>
- <mainClass>org.apache.hyracks.control.nc.NCDriver</mainClass>
- <name>hyracksnc</name>
- </program>
- <program>
- <mainClass>org.apache.hyracks.control.nc.service.NCService</mainClass>
- <name>hyracksncservice</name>
- </program>
- </programs>
- <repositoryLayout>flat</repositoryLayout>
- <repositoryName>lib</repositoryName>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>process-test-classes</id>
- <phase>package</phase>
- <configuration>
- <target>
- <chmod file="target/appassembler/bin/*" perm="755" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<dependencies>
@@ -158,33 +103,32 @@
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-util</artifactId>
+ <artifactId>hyracks-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+<!--
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-control-nc</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
+-->
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-control-nc</artifactId>
+ <artifactId>hyracks-util</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -192,5 +136,15 @@
<artifactId>log4j-api</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java
similarity index 97%
rename from hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java
rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java
index cd0359f9ae..5ae57cd44a 100644
--- a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java
@@ -47,7 +47,7 @@ public class NCServiceIT {
private static final String TARGET_DIR = FileUtil.joinPath(".", "target");
private static final String LOG_DIR = FileUtil.joinPath(TARGET_DIR, "failsafe-reports");
private static final String RESOURCE_DIR = FileUtil.joinPath(TARGET_DIR, "test-classes", "NCServiceIT");
- private static final String APP_HOME = FileUtil.joinPath(TARGET_DIR, "appassembler");
+ private static final String APP_HOME = FileUtil.joinPath("..", "..", "hyracks-server", "target", "appassembler");
private static final Logger LOGGER = LogManager.getLogger();
private static HyracksVirtualCluster cluster = null;
diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java
similarity index 100%
rename from hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java
rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java
diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java
similarity index 100%
rename from hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java
rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java
diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java
similarity index 100%
rename from hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java
rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java
diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java
similarity index 100%
rename from hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java
rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java
diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/cc.conf
similarity index 100%
rename from hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf
rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/cc.conf
diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/nc-blue.conf
similarity index 100%
rename from hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf
rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/nc-blue.conf
diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/nc-red.conf
similarity index 100%
rename from hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf
rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/nc-red.conf
diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/resources/logging.properties b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/logging.properties
similarity index 100%
rename from hyracks-fullstack/hyracks/hyracks-server/src/test/resources/logging.properties
rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/logging.properties
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/pom.xml
index a26adeaa53..71bb0e917b 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-tests/pom.xml
@@ -52,5 +52,6 @@
<module>hyracks-storage-am-lsm-invertedindex-test</module>
<module>hyracks-storage-am-bloomfilter-test</module>
<module>hyracks-dataflow-common-test</module>
+ <module>hyracks-server-test</module>
</modules>
</project>
(asterixdb) 02/05: [NO ISSUE][MISC] Update dependencies
Posted by mb...@apache.org.
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 75d9e2b4f62b683d5b3d99a02597ecf4fef20624
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Tue Oct 24 11:26:46 2023 -0400
[NO ISSUE][MISC] Update dependencies
com.amazonaws:aws-java-sdk-dynamodb ....... 1.12.402 -> 1.12.573
com.amazonaws:aws-java-sdk-s3 ............. 1.12.402 -> 1.12.573
org.apache.commons:commons-csv ................. 1.9.0 -> 1.10.0
org.apache.commons:commons-lang3 .............. 3.12.0 -> 3.13.0
org.apache.httpcomponents:httpclient .......... 4.5.13 -> 4.5.14
org.apache.httpcomponents:httpcore ............ 4.4.15 -> 4.4.16
org.apache.httpcomponents:httpmime ............ 4.5.11 -> 4.5.14
org.apache.logging.log4j:log4j-1.2-api ........ 2.19.0 -> 2.21.1
org.apache.logging.log4j:log4j-api ............ 2.19.0 -> 2.21.1
org.apache.logging.log4j:log4j-core ........... 2.19.0 -> 2.21.1
org.apache.logging.log4j:log4j-jul ............ 2.19.0 -> 2.21.1
org.slf4j:slf4j-simple ........................ 1.7.33 -> 1.7.36
Change-Id: If33adeb76108cf1b6f8774e52be223bf97f0de5d
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17876
Reviewed-by: Michael Blow <mb...@apache.org>
Tested-by: Michael Blow <mb...@apache.org>
---
asterixdb/pom.xml | 10 +++++-----
.../main/appended-resources/supplemental-models.xml | 20 ++++++++++----------
hyracks-fullstack/hyracks/hyracks-http/pom.xml | 1 -
hyracks-fullstack/pom.xml | 15 ++++++++++-----
4 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index e54fea18c3..90634944a3 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -87,10 +87,10 @@
<hyracks.version>0.3.8.2-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>
<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>
@@ -962,7 +962,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.33</version>
+ <version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -1828,7 +1828,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
- <version>1.9.0</version>
+ <version>1.10.0</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
@@ -1843,7 +1843,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>4.5.11</version>
+ <version>4.5.14</version>
</dependency>
<dependency>
<groupId>org.msgpack</groupId>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 4fd516c995..26dfe31e58 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -614,8 +614,8 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.12.402</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.12.402</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.12.572</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.12.572</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -625,8 +625,8 @@
<groupId>com.amazonaws</groupId>
<artifactId>jmespath-java</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.12.402</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.12.402</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.12.572</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.12.572</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -636,8 +636,8 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.12.402</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.12.402</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.12.572</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.12.572</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -647,8 +647,8 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-kms</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.12.402</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.12.402</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.12.572</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.12.572</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -658,8 +658,8 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-dynamodb</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.12.402</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.12.402</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.12.572</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.12.572</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
diff --git a/hyracks-fullstack/hyracks/hyracks-http/pom.xml b/hyracks-fullstack/hyracks/hyracks-http/pom.xml
index e0c8efeac0..20c30d0559 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-http/pom.xml
@@ -82,7 +82,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-nio</artifactId>
- <version>4.4.15</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 477cfef2dc..4c803b8f27 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -71,7 +71,7 @@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<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>
<snappy.version>1.1.10.5</snappy.version>
<jackson.version>2.14.3</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
@@ -324,7 +324,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
+ <version>3.13.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -334,12 +334,17 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.15</version>
+ <version>4.4.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-nio</artifactId>
+ <version>4.4.16</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.13</version>
+ <version>4.5.14</version>
</dependency>
<dependency>
<groupId>org.apache.rat</groupId>
@@ -424,7 +429,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.33</version>
+ <version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
(asterixdb) 05/05: Merge branch 'gerrit/trinity' into 'master'
Posted by mb...@apache.org.
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 <mi...@couchbase.com>
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>