You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by dl...@apache.org on 2021/10/25 23:53:41 UTC

[asterixdb-clients] branch master updated: [NO ISSUE] Copy taco SDK into build folder

This is an automated email from the ASF dual-hosted git repository.

dlych pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb-clients.git


The following commit(s) were added to refs/heads/master by this push:
     new d355ca3  [NO ISSUE] Copy taco SDK into build folder
d355ca3 is described below

commit d355ca3640364abb57717bb00dc52e5508572d5b
Author: Dmitry Lychagin <dm...@couchbase.com>
AuthorDate: Mon Oct 25 16:03:41 2021 -0700

    [NO ISSUE] Copy taco SDK into build folder
    
    Change-Id: Ief2113387aa99a04fddcca2223a9ad2fa52b75d1
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb-clients/+/13783
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Michael Blow <mb...@apache.org>
---
 asterixdb-jdbc/asterix-jdbc-taco/pom.xml | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/asterixdb-jdbc/asterix-jdbc-taco/pom.xml b/asterixdb-jdbc/asterix-jdbc-taco/pom.xml
index adf5005..5aca063 100644
--- a/asterixdb-jdbc/asterix-jdbc-taco/pom.xml
+++ b/asterixdb-jdbc/asterix-jdbc-taco/pom.xml
@@ -58,12 +58,14 @@
 
     <taco.sourceDirectory>${project.basedir}/src/main/taco</taco.sourceDirectory>
 
+    <build.taco.copy.sdk.stage>none</build.taco.copy.sdk.stage>
     <build.taco.init.sdk.stage>none</build.taco.init.sdk.stage>
     <build.taco.package.sdk.stage>none</build.taco.package.sdk.stage>
     <build.taco.package.nosdk.stage>none</build.taco.package.nosdk.stage>
     <build.taco.directory>${project.build.directory}/taco</build.taco.directory>
     <build.taco.gensrc.directory>${build.taco.directory}/generated-sources</build.taco.gensrc.directory>
     <build.taco.gensrc.plugin.class.directory>${build.taco.gensrc.directory}/plugins/${taco.plugin.class}</build.taco.gensrc.plugin.class.directory>
+    <build.taco.sdk.directory>${build.taco.directory}/connector-plugin-sdk</build.taco.sdk.directory>
     <build.taco.log.directory>${build.taco.directory}</build.taco.log.directory>
     <build.taco.package.file>${project.build.directory}/${taco.plugin.class}.taco</build.taco.package.file>
     <build.venv.directory>${project.build.directory}/venv</build.venv.directory>
@@ -108,6 +110,23 @@
               </resources>
             </configuration>
           </execution>
+          <execution>
+            <id>taco-copy-sdk</id>
+            <phase>${build.taco.copy.sdk.stage}</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${build.taco.sdk.directory}</outputDirectory>
+              <resources>
+                <resource>
+                  <!--suppress UnresolvedMavenProperty -->
+                  <directory>${taco.sdk.path}</directory>
+                  <filtering>false</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -158,7 +177,7 @@
             </goals>
             <configuration>
               <executable>${build.venv.python.path}</executable>
-              <workingDirectory>${taco.sdk.path}/connector-packager</workingDirectory>
+              <workingDirectory>${build.taco.sdk.directory}/connector-packager</workingDirectory>
               <arguments>
                 <argument>setup.py</argument>
                 <argument>install</argument>
@@ -178,7 +197,7 @@
             </goals>
             <configuration>
               <executable>${build.venv.python.path}</executable>
-              <workingDirectory>${taco.sdk.path}/connector-packager</workingDirectory>
+              <workingDirectory>${build.taco.sdk.directory}/connector-packager</workingDirectory>
               <arguments>
                 <argument>-m</argument>
                 <argument>connector_packager.package</argument>
@@ -230,7 +249,8 @@
         </property>
       </activation>
       <properties>
-        <build.taco.init.sdk.stage>initialize</build.taco.init.sdk.stage>
+        <build.taco.copy.sdk.stage>generate-resources</build.taco.copy.sdk.stage>
+        <build.taco.init.sdk.stage>process-resources</build.taco.init.sdk.stage>
         <build.taco.package.sdk.stage>package</build.taco.package.sdk.stage>
       </properties>
       <build>