Merge branch 'goldfish' into 'master'
Change-Id: Id8f1f8a87df1b605d68c8a241720bbc391122d44
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 5b2f8a4..0c00951 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -326,7 +326,7 @@
<workingDirectory>${project.build.directory}/fake-gcs-server</workingDirectory>
<arguments>
<argument>-port</argument>
- <argument>4443</argument>
+ <argument>24443</argument>
<argument>-scheme</argument>
<argument>http</argument>
<argument>-host</argument>
@@ -422,36 +422,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>1.13.4</version>
- <configuration>
- <nodeVersion>v14.15.4</nodeVersion>
- <npmVersion>6.14.11</npmVersion>
- <workingDirectory>target/npm</workingDirectory>
- <installDirectory>target/npm</installDirectory>
- </configuration>
- <executions>
- <execution>
- <id>install node and yarn</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- <phase>${azurite.npm.install.stage}</phase>
- </execution>
- <execution>
- <id>azurite blob</id>
- <phase>${azurite.install.stage}</phase>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>install azurite</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -619,7 +589,7 @@
<goal>npm</goal>
</goals>
<configuration>
- <arguments>install azurite</arguments>
+ <arguments>install azurite@3.31.0</arguments>
</configuration>
</execution>
</executions>
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageGCSTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageGCSTest.java
index c532d9d..6ac4a5d 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageGCSTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageGCSTest.java
@@ -68,7 +68,7 @@
private static final String CONFIG_FILE_NAME = "src/test/resources/cc-cloud-storage-gcs.conf";
private static final String DELTA_RESULT_PATH = "results_cloud";
private static final String EXCLUDED_TESTS = "MP";
- public static final String MOCK_SERVER_HOSTNAME = "http://127.0.0.1:4443";
+ public static final String MOCK_SERVER_HOSTNAME = "http://127.0.0.1:24443";
private static final String MOCK_SERVER_PROJECT_ID = "asterixdb-gcs-test-project-id";
public CloudStorageGCSTest(TestCaseContext tcCtx) {
diff --git a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf
index 0046644..518cc71 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf
@@ -67,7 +67,7 @@
cloud.storage.scheme=gs
cloud.storage.bucket=cloud-storage-container
cloud.storage.region=us-west2
-cloud.storage.endpoint=http://127.0.0.1:4443
+cloud.storage.endpoint=http://127.0.0.1:24443
cloud.storage.anonymous.auth=true
cloud.storage.cache.policy=selective
cloud.max.write.requests.per.second=1000
diff --git a/asterixdb/asterix-cloud/pom.xml b/asterixdb/asterix-cloud/pom.xml
index 9244979..6f952b0 100644
--- a/asterixdb/asterix-cloud/pom.xml
+++ b/asterixdb/asterix-cloud/pom.xml
@@ -122,7 +122,7 @@
<workingDirectory>${project.build.directory}/fake-gcs-server</workingDirectory>
<arguments>
<argument>-port</argument>
- <argument>4443</argument>
+ <argument>24443</argument>
<argument>-scheme</argument>
<argument>http</argument>
<argument>-host</argument>
@@ -195,7 +195,7 @@
<goal>npm</goal>
</goals>
<configuration>
- <arguments>install azurite</arguments>
+ <arguments>install azurite@3.31.0</arguments>
</configuration>
</execution>
</executions>
diff --git a/asterixdb/asterix-cloud/src/test/java/org/apache/asterix/cloud/gcs/LSMGCSTest.java b/asterixdb/asterix-cloud/src/test/java/org/apache/asterix/cloud/gcs/LSMGCSTest.java
index 08864ac..d89c872 100644
--- a/asterixdb/asterix-cloud/src/test/java/org/apache/asterix/cloud/gcs/LSMGCSTest.java
+++ b/asterixdb/asterix-cloud/src/test/java/org/apache/asterix/cloud/gcs/LSMGCSTest.java
@@ -35,7 +35,7 @@
public class LSMGCSTest extends AbstractLSMTest {
private static Storage client;
- private static final int MOCK_SERVER_PORT = 4443;
+ private static final int MOCK_SERVER_PORT = 24443;
private static final String MOCK_SERVER_HOSTNAME = "http://127.0.0.1:" + MOCK_SERVER_PORT;
private static final String MOCK_SERVER_REGION = "us-west2"; // does not matter the value
private static final String MOCK_SERVER_PROJECT_ID = "asterixdb-gcs-test-project-id";