You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sa...@apache.org on 2019/04/25 18:10:01 UTC
[atlas] branch master updated: Revert "ATLAS-3045: Fix
atlas-server-package.xml and add a new classification-updater assembly"
This is an automated email from the ASF dual-hosted git repository.
sarath pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push:
new eaee02f Revert "ATLAS-3045: Fix atlas-server-package.xml and add a new classification-updater assembly"
eaee02f is described below
commit eaee02fef4d2fa6186af5e3d754886507b5fada3
Author: Sarath Subramanian <ss...@hortonworks.com>
AuthorDate: Thu Apr 25 11:09:32 2019 -0700
Revert "ATLAS-3045: Fix atlas-server-package.xml and add a new classification-updater assembly"
This reverts commit 04bd64be7bbb0c97939629edaf8f827ce1a40b4b.
---
distro/pom.xml | 3 +-
.../src/main/assemblies/atlas-server-package.xml | 31 +------------
.../src/main/assemblies/classification-updater.xml | 54 ----------------------
pom.xml | 1 -
4 files changed, 3 insertions(+), 86 deletions(-)
diff --git a/distro/pom.xml b/distro/pom.xml
index dc532c5..799b154 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -136,8 +136,7 @@ atlas.graph.index.search.solr.wait-searcher=true
<descriptor>src/main/assemblies/atlas-server-package.xml</descriptor>
<descriptor>src/main/assemblies/standalone-package.xml</descriptor>
<descriptor>src/main/assemblies/src-package.xml</descriptor>
- <descriptor>src/main/assemblies/migration-exporter.xml</descriptor>
- <descriptor>src/main/assemblies/classification-updater.xml</descriptor>
+ <!--<descriptor>src/main/assemblies/migration-exporter.xml</descriptor>-->
</descriptors>
<finalName>apache-atlas-${project.version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
diff --git a/distro/src/main/assemblies/atlas-server-package.xml b/distro/src/main/assemblies/atlas-server-package.xml
index 2aa15a0..248645a 100755
--- a/distro/src/main/assemblies/atlas-server-package.xml
+++ b/distro/src/main/assemblies/atlas-server-package.xml
@@ -92,44 +92,17 @@
</fileSet>
<!-- for migration setup -->
<fileSet>
- <directory>../tools/atlas-migration-exporter/src/main/resources</directory>
+ <directory>../tools/atlas-migration-exporter</directory>
<outputDirectory>tools/migration-exporter</outputDirectory>
<includes>
<include>README</include>
<include>*.py</include>
<include>atlas-log4j.xml</include>
- <include>migrationContext.xml</include>
+ <include>atlas-migration-*.jar</include>
</includes>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
- <fileSet>
- <directory>../tools/atlas-migration-exporter/target</directory>
- <outputDirectory>tools/migration-exporter</outputDirectory>
- <includes>
- <include>atlas-migration-exporter-${project.version}.jar</include>
- </includes>
- </fileSet>
-
- <!-- for classification-updater -->
- <fileSet>
- <directory>../tools/classification-updater/src/main/resources</directory>
- <outputDirectory>tools/classification-updater</outputDirectory>
- <includes>
- <include>*.sh</include>
- <include>atlas-log4j.xml</include>
- </includes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>../tools/classification-updater/target</directory>
- <outputDirectory>tools/classification-updater</outputDirectory>
- <includes>
- <include>atlas-classification-updater-${project.version}.jar</include>
- </includes>
- </fileSet>
-
<fileSet>
<directory>../</directory>
diff --git a/distro/src/main/assemblies/classification-updater.xml b/distro/src/main/assemblies/classification-updater.xml
deleted file mode 100644
index f4bfe3c..0000000
--- a/distro/src/main/assemblies/classification-updater.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-**
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-*
--->
-<assembly>
- <id>classification-updater</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
-
- <baseDirectory>atlas-classification-updater</baseDirectory>
-
- <fileSets>
- <fileSet>
- <includes>
- <include>README*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../tools/classification-updater/src/main/resources</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>*.sh</include>
- <include>atlas-log4j.xml</include>
- </includes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>../tools/classification-updater/target</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>atlas-classification-updater-${project.version}.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/pom.xml b/pom.xml
index c4da236..7634138 100644
--- a/pom.xml
+++ b/pom.xml
@@ -777,7 +777,6 @@
<module>addons/hbase-bridge</module>
<module>addons/hbase-testing-util</module>
<module>addons/kafka-bridge</module>
- <module>tools/classification-updater</module>
<module>distro</module>
</modules>