You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2020/10/23 16:16:18 UTC

[atlas] 01/02: ATLAS-3999: updated build to remove copying of dist artifacts into directories

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

madhan pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git

commit d861641dd425f40e375298e90e4e081495efdbbb
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Sun Oct 18 23:27:02 2020 -0700

    ATLAS-3999: updated build to remove copying of dist artifacts into directories
    
    (cherry picked from commit bd9d1213b48721f269f32db1ee388e2beb9a7d3d)
---
 distro/src/main/assemblies/atlas-falcon-hook-package.xml  | 1 -
 distro/src/main/assemblies/atlas-hbase-hook-package.xml   | 1 -
 distro/src/main/assemblies/atlas-hive-hook-package.xml    | 1 -
 distro/src/main/assemblies/atlas-impala-hook-package.xml  | 3 +--
 distro/src/main/assemblies/atlas-kafka-hook-package.xml   | 1 -
 distro/src/main/assemblies/atlas-repair-index-package.xml | 1 -
 distro/src/main/assemblies/atlas-server-package.xml       | 1 -
 distro/src/main/assemblies/atlas-sqoop-hook-package.xml   | 1 -
 distro/src/main/assemblies/atlas-storm-hook-package.xml   | 1 -
 distro/src/main/assemblies/classification-updater.xml     | 1 -
 distro/src/main/assemblies/migration-exporter.xml         | 1 -
 distro/src/main/assemblies/src-package.xml                | 2 ++
 distro/src/main/assemblies/standalone-package.xml         | 1 -
 13 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/distro/src/main/assemblies/atlas-falcon-hook-package.xml b/distro/src/main/assemblies/atlas-falcon-hook-package.xml
index 1c1ff00..9ddc86d 100644
--- a/distro/src/main/assemblies/atlas-falcon-hook-package.xml
+++ b/distro/src/main/assemblies/atlas-falcon-hook-package.xml
@@ -21,7 +21,6 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <formats>
         <format>tar.gz</format>
-        <format>dir</format>
     </formats>
     <id>falcon-hook</id>
     <baseDirectory>apache-atlas-falcon-hook-${project.version}</baseDirectory>
diff --git a/distro/src/main/assemblies/atlas-hbase-hook-package.xml b/distro/src/main/assemblies/atlas-hbase-hook-package.xml
index ba51b23..a51c20a 100644
--- a/distro/src/main/assemblies/atlas-hbase-hook-package.xml
+++ b/distro/src/main/assemblies/atlas-hbase-hook-package.xml
@@ -21,7 +21,6 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <formats>
         <format>tar.gz</format>
-        <format>dir</format>
     </formats>
     <id>hbase-hook</id>
     <baseDirectory>apache-atlas-hbase-hook-${project.version}</baseDirectory>
diff --git a/distro/src/main/assemblies/atlas-hive-hook-package.xml b/distro/src/main/assemblies/atlas-hive-hook-package.xml
index a0e7bc7..eaeb1b8 100644
--- a/distro/src/main/assemblies/atlas-hive-hook-package.xml
+++ b/distro/src/main/assemblies/atlas-hive-hook-package.xml
@@ -21,7 +21,6 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <formats>
         <format>tar.gz</format>
-        <format>dir</format>
     </formats>
     <id>hive-hook</id>
     <baseDirectory>apache-atlas-hive-hook-${project.version}</baseDirectory>
diff --git a/distro/src/main/assemblies/atlas-impala-hook-package.xml b/distro/src/main/assemblies/atlas-impala-hook-package.xml
index 7e6177e..cb1bb0d 100644
--- a/distro/src/main/assemblies/atlas-impala-hook-package.xml
+++ b/distro/src/main/assemblies/atlas-impala-hook-package.xml
@@ -21,7 +21,6 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <formats>
         <format>tar.gz</format>
-        <format>dir</format>
     </formats>
     <id>impala-hook</id>
     <baseDirectory>apache-atlas-impala-hook-${project.version}</baseDirectory>
@@ -37,4 +36,4 @@
         </fileSet>
 
     </fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/distro/src/main/assemblies/atlas-kafka-hook-package.xml b/distro/src/main/assemblies/atlas-kafka-hook-package.xml
index 8394ea8..38bf4c5 100644
--- a/distro/src/main/assemblies/atlas-kafka-hook-package.xml
+++ b/distro/src/main/assemblies/atlas-kafka-hook-package.xml
@@ -21,7 +21,6 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <formats>
         <format>tar.gz</format>
-        <format>dir</format>
     </formats>
     <id>kafka-hook</id>
     <baseDirectory>apache-atlas-kafka-hook-${project.version}</baseDirectory>
diff --git a/distro/src/main/assemblies/atlas-repair-index-package.xml b/distro/src/main/assemblies/atlas-repair-index-package.xml
index 7d92bb2..5cdcaf1 100644
--- a/distro/src/main/assemblies/atlas-repair-index-package.xml
+++ b/distro/src/main/assemblies/atlas-repair-index-package.xml
@@ -21,7 +21,6 @@
 <assembly>
     <id>atlas-index-repair</id>
     <formats>
-        <format>dir</format>
         <format>zip</format>
     </formats>
 
diff --git a/distro/src/main/assemblies/atlas-server-package.xml b/distro/src/main/assemblies/atlas-server-package.xml
index 241ed04..6086d07 100755
--- a/distro/src/main/assemblies/atlas-server-package.xml
+++ b/distro/src/main/assemblies/atlas-server-package.xml
@@ -21,7 +21,6 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <formats>
         <format>tar.gz</format>
-        <format>dir</format>
     </formats>
     <id>server</id>
     <baseDirectory>apache-atlas-${project.version}</baseDirectory>
diff --git a/distro/src/main/assemblies/atlas-sqoop-hook-package.xml b/distro/src/main/assemblies/atlas-sqoop-hook-package.xml
index 0e91af9..5fc23eb 100644
--- a/distro/src/main/assemblies/atlas-sqoop-hook-package.xml
+++ b/distro/src/main/assemblies/atlas-sqoop-hook-package.xml
@@ -21,7 +21,6 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <formats>
         <format>tar.gz</format>
-        <format>dir</format>
     </formats>
     <id>sqoop-hook</id>
     <baseDirectory>apache-atlas-sqoop-hook-${project.version}</baseDirectory>
diff --git a/distro/src/main/assemblies/atlas-storm-hook-package.xml b/distro/src/main/assemblies/atlas-storm-hook-package.xml
index 92bc689..e5d4a93 100644
--- a/distro/src/main/assemblies/atlas-storm-hook-package.xml
+++ b/distro/src/main/assemblies/atlas-storm-hook-package.xml
@@ -21,7 +21,6 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <formats>
         <format>tar.gz</format>
-        <format>dir</format>
     </formats>
     <id>storm-hook</id>
     <baseDirectory>apache-atlas-storm-hook-${project.version}</baseDirectory>
diff --git a/distro/src/main/assemblies/classification-updater.xml b/distro/src/main/assemblies/classification-updater.xml
index f4bfe3c..03a9b68 100644
--- a/distro/src/main/assemblies/classification-updater.xml
+++ b/distro/src/main/assemblies/classification-updater.xml
@@ -21,7 +21,6 @@
 <assembly>
     <id>classification-updater</id>
     <formats>
-        <format>dir</format>
         <format>zip</format>
     </formats>
 
diff --git a/distro/src/main/assemblies/migration-exporter.xml b/distro/src/main/assemblies/migration-exporter.xml
index be0a9d5..4907a68 100644
--- a/distro/src/main/assemblies/migration-exporter.xml
+++ b/distro/src/main/assemblies/migration-exporter.xml
@@ -21,7 +21,6 @@
 <assembly>
     <id>migration-exporter</id>
     <formats>
-        <format>dir</format>
         <format>zip</format>
     </formats>
 
diff --git a/distro/src/main/assemblies/src-package.xml b/distro/src/main/assemblies/src-package.xml
index a17b31e..b534871 100755
--- a/distro/src/main/assemblies/src-package.xml
+++ b/distro/src/main/assemblies/src-package.xml
@@ -42,6 +42,8 @@
                 <exclude>**/${sys:atlas.data}/**</exclude>
                 <exclude>**/atlas.data/**</exclude>
                 <exclude>**/*.patch</exclude>
+                <exclude>dev-support/atlas-docker/data/**</exclude>
+                <exclude>dev-support/atlas-docker/dist/**</exclude>
             </excludes>
         </fileSet>
     </fileSets>
diff --git a/distro/src/main/assemblies/standalone-package.xml b/distro/src/main/assemblies/standalone-package.xml
index aa462cd..3e2ca1c 100755
--- a/distro/src/main/assemblies/standalone-package.xml
+++ b/distro/src/main/assemblies/standalone-package.xml
@@ -21,7 +21,6 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <formats>
         <format>tar.gz</format>
-        <format>dir</format>
     </formats>
     <id>bin</id>
     <baseDirectory>apache-atlas-${project.version}</baseDirectory>