>From Murtadha Hubail <[email protected]>:
Murtadha Hubail has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19164 )
Change subject: Merge branch 'goldfish' into 'master'
......................................................................
Merge branch 'goldfish' into 'master'
Change-Id: Id8f1f8a87df1b605d68c8a241720bbc391122d44
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-cloud/pom.xml
3 files changed, 16 insertions(+), 131 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/64/19164/1
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 12e4d6d..0c00951 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -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 [email protected]</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -619,7 +589,7 @@
<goal>npm</goal>
</goals>
<configuration>
- <arguments>install azurite</arguments>
+ <arguments>install [email protected]</arguments>
</configuration>
</execution>
</executions>
diff --git a/asterixdb/asterix-cloud/pom.xml b/asterixdb/asterix-cloud/pom.xml
index b4102d3..9ba2108 100644
--- a/asterixdb/asterix-cloud/pom.xml
+++ b/asterixdb/asterix-cloud/pom.xml
@@ -39,7 +39,6 @@
<root.dir>${basedir}/..</root.dir>
</properties>
-<<<<<<< HEAD (76744a [ASTERIXDB-3531][COMP] Push projections into assign
operator)
<build>
<plugins>
<plugin>
@@ -165,104 +164,6 @@
</plugin>
</plugins>
</build>
-=======
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <licenses>
- <license
implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
- </licenses>
- <excludes combine.children="append">
- <exclude>src/test/resources/result/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <version>1.4.2</version>
- <executions>
- <execution>
- <id>install-fake-gcs</id>
- <phase>${gcs.download.stage}</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
-
<url>https://github.com/fsouza/fake-gcs-server/releases/download/v1.48.0/fake-gcs-server_1.48.0_Linux_amd64.tar.gz</url>
-
<outputFileName>fake-gcs-server_1.48.0_Linux_amd64.tar.gz</outputFileName>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>extract-gcs</id>
- <phase>${gcs.install.stage}</phase>
- <configuration>
- <target>
- <echo message="Extracting fake-gcs-server" />
- <mkdir dir="${project.build.directory}/fake-gcs-server" />
- <gunzip
src="${project.build.directory}/fake-gcs-server_1.48.0_Linux_amd64.tar.gz"
dest="${project.build.directory}/fake-gcs-server_1.48.0_Linux_amd64.tar" />
- <untar
src="${project.build.directory}/fake-gcs-server_1.48.0_Linux_amd64.tar"
dest="${project.build.directory}/fake-gcs-server" />
- <chmod
file="${project.build.directory}/fake-gcs-server/fake-gcs-server" perm="ugo+rx"
/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>fake-gcs-server</id>
- <phase>${gcs.stage}</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
-
<executable>${project.build.directory}/fake-gcs-server/fake-gcs-server</executable>
-
<workingDirectory>${project.build.directory}/fake-gcs-server</workingDirectory>
- <arguments>
- <argument>-port</argument>
- <argument>24443</argument>
- <argument>-scheme</argument>
- <argument>http</argument>
- <argument>-host</argument>
- <argument>127.0.0.1</argument>
- <argument>-log-level</argument>
- <argument>error</argument>
- <argument>-filesystem-root</argument>
-
<argument>${project.build.directory}/fake-gcs-server/storage</argument>
- </arguments>
- <async>true</async>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
->>>>>>> BRANCH (1e4b8c [NO ISSUE]: Fix
AzureBlobStorageExternalDatasetOnePartitionT)
<profiles>
<profile>
@@ -294,7 +195,7 @@
<goal>npm</goal>
</goals>
<configuration>
- <arguments>install azurite</arguments>
+ <arguments>install
[email protected]</arguments>
</configuration>
</execution>
</executions>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19164
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Id8f1f8a87df1b605d68c8a241720bbc391122d44
Gerrit-Change-Number: 19164
Gerrit-PatchSet: 1
Gerrit-Owner: Murtadha Hubail <[email protected]>
Gerrit-MessageType: newchange
