Merge pull request #16 from startreedata/actions_2

Fix jar name and remove unnecessary files from taco
startreedata · Apr 30, 2024 · 1f4ee6d · 1f4ee6d
2 parents 8f38d2f + 924566c
commit 1f4ee6d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 19 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -74,6 +74,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./ai.startree.pinot-1.0.taco
-        asset_name: ai.startree.pinot-1.0.taco
+        asset_path: ./ai.startree.pinot-startree-tableau-connector-1.0.taco
+        asset_name: ai.startree.pinot-startree-tableau-connector-1.0.taco
         asset_content_type: application/octet-stream
diff --git a/pom.xml b/pom.xml
@@ -19,24 +19,22 @@
   <version>1.0</version>
   <packaging>pom</packaging>
 
-<!--  <parent>-->
-<!--    <artifactId>startree-pinot-connectors</artifactId>-->
-<!--    <groupId>ai.startree.pinot</groupId>-->
-<!--    <version>${revision}</version>-->
-<!--  </parent>-->
-
   <artifactId>startree-tableau-connector</artifactId>
   <name>StarTree Tableau Connector</name>
   <groupId>ai.startree.pinot</groupId>
   <url>https://startree.ai/</url>
 
   <properties>
     <pinot.root>${basedir}</pinot.root>
-    <connector.assembly.name>${project.groupId}-${project.version}</connector.assembly.name>
+    <connector.assembly.name>${project.groupId}-${project.artifactId}-${project.version}</connector.assembly.name>
     <taco.signing.keystore>taco.jks</taco.signing.keystore>
     <taco.signing.alias>alias</taco.signing.alias>
     <taco.signing.storepass>storepass</taco.signing.storepass>
     <taco.signing.keypass></taco.signing.keypass>
+    <taco.signing.tsa>http://timestamp.globalsign.com/tsa/r6advanced1</taco.signing.tsa>
+    <taco.signing.storetype>PKCS11</taco.signing.storetype>
+    <taco.signing.providerclass>sun.security.pkcs11.SunPKCS11</taco.signing.providerclass>
+    <taco.signing.providerarg>eToken.cfg</taco.signing.providerarg>
   </properties>
 
   <licenses>
@@ -66,28 +64,52 @@
               </descriptors>
             </configuration>
           </execution>
-         </executions>
+        </executions>
       </plugin>
 
       <plugin>
         <artifactId>maven-jarsigner-plugin</artifactId>
         <executions>
           <execution>
             <id>sign</id>
-            <phase>package</phase>
+            <phase>install</phase>
             <goals>
               <goal>sign</goal>
             </goals>
           </execution>
         </executions>
         <configuration>
-          <keystore>${taco.signing.keystore}</keystore>
+          <tsa>${taco.signing.tsa}</tsa>
+          <storetype>${taco.signing.storetype}</storetype>
+          <providerClass>${taco.signing.providerclass}</providerClass>
+          <providerArg>${taco.signing.providerarg}</providerArg>
           <alias>${taco.signing.alias}</alias>
-          <storepass>${taco.signing.storepass}</storepass>
-          <keypass>${taco.signing.keypass}</keypass>
         </configuration>
       </plugin>
 
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <finalName>${connector.assembly.name}</finalName>
+              <shadedArtifactAttached>false</shadedArtifactAttached>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <version>3.1.0</version>
@@ -99,7 +121,8 @@
             </goals>
             <configuration>
               <target>
-                <move file="${project.build.directory}/${connector.assembly.name}.jar" tofile="${project.build.directory}/${connector.assembly.name}.taco" />
+                <move file="${project.build.directory}/${connector.assembly.name}.jar"
+                      tofile="${project.build.directory}/${connector.assembly.name}.taco"/>
               </target>
             </configuration>
           </execution>
@@ -114,9 +137,6 @@
           <licenseSets>
             <licenseSet>
               <header>${pinot.root}/HEADER</header>
-<!--              <headerDefinitions>-->
-<!--                <headerDefinition>${pinot.root}/headerdefinition.xml</headerDefinition>-->
-<!--              </headerDefinitions>-->
               <excludes>
                 <!-- Text and log files -->
                 <exclude>**/*.txt</exclude>

diff --git a/taco-assembly.xml b/taco-assembly.xml
@@ -27,6 +27,10 @@
       <includes>
         <include>**/*</include>
       </includes>
-    </fileSet>
+      <excludes>
+                <exclude>META-INF/TE*</exclude>
+                <exclude>static/**</exclude>
+      </excludes>
+      </fileSet>
   </fileSets>
 </assembly>