(atlas) branch master updated: ATLAS-4881: minor improvements in notification processing
This is an automated email from the ASF dual-hosted git repository. madhan 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 2369e7c8e ATLAS-4881: minor improvements in notification processing 2369e7c8e is described below commit 2369e7c8e0ad63a6dc173713823cdca9bf3b9b35 Author: Madhan Neethiraj AuthorDate: Tue Jun 18 00:18:19 2024 -0700 ATLAS-4881: minor improvements in notification processing --- .../org/apache/atlas/utils/AtlasPerfMetrics.java | 9 - .../notification/NotificationHookConsumer.java | 41 -- .../preprocessor/HiveDbDDLPreprocessor.java| 5 ++- .../preprocessor/HivePreprocessor.java | 4 ++- .../preprocessor/HiveTableDDLPreprocessor.java | 5 ++- .../preprocessor/PreprocessorContext.java | 10 +++--- 6 files changed, 56 insertions(+), 18 deletions(-) diff --git a/common/src/main/java/org/apache/atlas/utils/AtlasPerfMetrics.java b/common/src/main/java/org/apache/atlas/utils/AtlasPerfMetrics.java index c72b2c3e2..a65dc8606 100644 --- a/common/src/main/java/org/apache/atlas/utils/AtlasPerfMetrics.java +++ b/common/src/main/java/org/apache/atlas/utils/AtlasPerfMetrics.java @@ -25,6 +25,7 @@ import java.util.Set; public class AtlasPerfMetrics { private final Map metrics = new LinkedHashMap<>(); +private long startTimeMs = -1; public MetricRecorder getMetricRecorder(String name) { @@ -36,6 +37,10 @@ public class AtlasPerfMetrics { final String name = recorder.name; final long timeTaken = recorder.getElapsedTime(); +if (startTimeMs == -1) { +startTimeMs = System.currentTimeMillis(); +} + Metric metric = metrics.get(name); if (metric == null) { @@ -51,6 +56,8 @@ public class AtlasPerfMetrics { public void clear() { metrics.clear(); + +startTimeMs = -1; } public boolean isEmpty() { @@ -76,7 +83,7 @@ public class AtlasPerfMetrics { sb.append("\"").append(metric.getName()).append("\":{\"count\":").append(metric.getInvocations()).append(",\"timeTaken\":").append(metric.getTotalTimeMSecs()).append("},"); } -sb.setLength(sb.length() - 1); // remove last "," +sb.append("\"totalTime\":").append(System.currentTimeMillis() - startTimeMs); } sb.append("}"); diff --git a/webapp/src/main/java/org/apache/atlas/notification/NotificationHookConsumer.java b/webapp/src/main/java/org/apache/atlas/notification/NotificationHookConsumer.java index 7b02ac449..86535275b 100644 --- a/webapp/src/main/java/org/apache/atlas/notification/NotificationHookConsumer.java +++ b/webapp/src/main/java/org/apache/atlas/notification/NotificationHookConsumer.java @@ -84,6 +84,7 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Component; import javax.inject.Inject; +import javax.ws.rs.core.Response; import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; @@ -932,18 +933,34 @@ public class NotificationHookConsumer implements Service, ActiveStateChangeHandl RequestContext.get().resetEntityGuidUpdates(); exceptionClassName = e.getClass().getSimpleName(); -if (numRetries == (maxRetries - 1)) { -String strMessage = AbstractNotification.getMessageJson(message); +// don't retry in following conditions: +// 1. number of retry attempts reached configured count +// 2. notification processing failed due to invalid data (non-existing type, entity, ..) +booleanmaxRetriesReached= numRetries == (maxRetries - 1); +AtlasErrorCode errorCode= (e instanceof AtlasBaseException) ? ((AtlasBaseException) e).getAtlasErrorCode() : null; +booleanunrecoverableFailure = errorCode != null && (Response.Status.NOT_FOUND.equals(errorCode.getHttpCode()) || Response.Status.BAD_REQUEST.equals(errorCode.getHttpCode())); -LOG.warn("Max retries exceeded for message {}", strMessage, e); +if (maxRetriesReached || unrecoverableFailure) { +try { +String strMessage = AbstractNotification.getMessageJson(message); + +if (unrecoverableFailure) { +LOG.warn("Unrecoverable failure while processing message {}", strMessage, e
(atlas) branch master updated: ATLAS-4878: utility to analyze hook notifications
This is an automated email from the ASF dual-hosted git repository. madhan 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 978087a88 ATLAS-4878: utility to analyze hook notifications 978087a88 is described below commit 978087a882348f1fc1b6002a0aeb29192d8cc00a Author: Madhan Neethiraj AuthorDate: Sun Jun 9 18:36:56 2024 -0700 ATLAS-4878: utility to analyze hook notifications --- distro/pom.xml | 1 + .../src/main/assemblies/notification-analyzer.xml | 71 + pom.xml| 1 + tools/notification-analyzer/README | 119 tools/notification-analyzer/pom.xml| 192 .../scripts/notification-analyzer.sh | 28 ++ .../apache/atlas/tools/NotificationAnalyzer.java | 322 + .../main/resources/atlas-application.properties| 18 ++ .../src/main/resources/atlas-log4j.xml | 44 +++ 9 files changed, 796 insertions(+) diff --git a/distro/pom.xml b/distro/pom.xml index 874b944f2..66f710896 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -136,6 +136,7 @@ atlas.graph.storage.hbase.regions-per-server=1 src/main/assemblies/atlas-repair-index-package.xml src/main/assemblies/classification-updater.xml + src/main/assemblies/notification-analyzer.xml apache-atlas-${project.version} gnu diff --git a/distro/src/main/assemblies/notification-analyzer.xml b/distro/src/main/assemblies/notification-analyzer.xml new file mode 100644 index 0..63d9f2490 --- /dev/null +++ b/distro/src/main/assemblies/notification-analyzer.xml @@ -0,0 +1,71 @@ + + +notification-analyzer + +zip + + +notification-analyzer + + + + +README* + + + + ../tools/notification-analyzer/target/dependency +. + + +../tools/notification-analyzer/scripts +. + +*.sh + +0755 +0755 + + + ../tools/notification-analyzer/src/main/resources +. + +atlas-log4j.xml +atlas-application.properties + + + +../tools/notification-analyzer +. + +README + + + +../tools/notification-analyzer/target +. + + atlas-notification-analyzer-${project.version}.jar + + + + diff --git a/pom.xml b/pom.xml index 2f9aedbd2..bfb1094ff 100644 --- a/pom.xml +++ b/pom.xml @@ -846,6 +846,7 @@ addons/kafka-bridge tools/classification-updater tools/atlas-index-repair +tools/notification-analyzer addons/impala-hook-api addons/impala-bridge-shim addons/impala-bridge diff --git a/tools/notification-analyzer/README b/tools/notification-analyzer/README new file mode 100644 index 0..7631e06d9 --- /dev/null +++ b/tools/notification-analyzer/README @@ -0,0 +1,119 @@ +# +# 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. +# + +Introduction + This utility analyzes hook notification messages stored in JSON format + in a file, and reports following details: +- number of notifications per notification type +- number of entities created/updated +- number of entity references in notifications per entity type +- number of entity operations performed +- number of entity operations performed per entity type + +Setup + - All libraries necessary to run the utility are packaged in following file: + distro/target/apache-atlas--notification-analyzer.zip + + - Unzip the file in the directory
(atlas) 01/02: ATLAS-4876: Docker setup fix to address HBase failure
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit 5bb9d8d58f6b0936ff79ace1297060678443e3c8 Author: Madhan Neethiraj AuthorDate: Sun Jun 2 00:21:02 2024 -0700 ATLAS-4876: Docker setup fix to address HBase failure --- dev-support/atlas-docker/scripts/atlas.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-support/atlas-docker/scripts/atlas.sh b/dev-support/atlas-docker/scripts/atlas.sh index 57d802142..e44b312c8 100755 --- a/dev-support/atlas-docker/scripts/atlas.sh +++ b/dev-support/atlas-docker/scripts/atlas.sh @@ -42,6 +42,9 @@ then sed -i "s/atlas.kafka.zookeeper.connect=.*$/atlas.kafka.zookeeper.connect=atlas-zk.example.com:2181/" /opt/atlas/conf/atlas-application.properties sed -i "s/atlas.kafka.bootstrap.servers=.*$/atlas.kafka.bootstrap.servers=atlas-kafka.example.com:9092/" /opt/atlas/conf/atlas-application.properties + echo "" >> /opt/atlas/conf/atlas-application.properties + echo "atlas.graph.storage.hbase.compression-algorithm=NONE" >> /opt/atlas/conf/atlas-application.properties + chown -R atlas:atlas ${ATLAS_HOME}/ touch ${ATLAS_HOME}/.setupDone
(atlas) branch master updated (42bf77ba5 -> 445e4b820)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git from 42bf77ba5 ATLAS-4846-Source-the-atlas-env-file-in-ATLAS-import.patch new 5bb9d8d58 ATLAS-4876: Docker setup fix to address HBase failure new 445e4b820 ATLAS-4877: updated version of JanusGraph and Tinkerpop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dev-support/atlas-docker/scripts/atlas.sh | 3 +++ pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)
(atlas) 02/02: ATLAS-4877: updated version of JanusGraph and Tinkerpop
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit 445e4b820b4365f60b8a16dfd72ae32df384b57d Author: Madhan Neethiraj AuthorDate: Sun Jun 9 16:56:41 2024 -0700 ATLAS-4877: updated version of JanusGraph and Tinkerpop --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6e6724275..2f9aedbd2 100644 --- a/pom.xml +++ b/pom.xml @@ -751,7 +751,7 @@ 2.5.2 2.11.3 2.11.3 -0.6.3 +0.6.4 0.5.3 1 3.1.0 @@ -808,7 +808,7 @@ 2C 3.0.0-M5 7.0.0 -3.5.5 +3.5.7 5.0.3 3.5.7
(atlas) branch master updated: ATLAS-4875: compression type specified for HBase backend store should be used by HBase audit store as well
This is an automated email from the ASF dual-hosted git repository. madhan 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 457deaa6e ATLAS-4875: compression type specified for HBase backend store should be used by HBase audit store as well 457deaa6e is described below commit 457deaa6eb00c64459de92ad2f7c81d56e182135 Author: Madhan Neethiraj AuthorDate: Sat Jun 1 11:29:16 2024 -0700 ATLAS-4875: compression type specified for HBase backend store should be used by HBase audit store as well --- .../atlas/repository/audit/HBaseBasedAuditRepository.java | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java b/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java index 9161cc8ff..e0ecacc6d 100644 --- a/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java +++ b/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java @@ -34,7 +34,6 @@ import org.apache.atlas.utils.AtlasPerfMetrics; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.configuration.Configuration; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; @@ -79,7 +78,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.stream.Collectors; /** @@ -106,6 +104,7 @@ public class HBaseBasedAuditRepository extends AbstractStorageBasedAuditReposito public static final String CONFIG_PREFIX = "atlas.audit"; public static final String CONFIG_TABLE_NAME = CONFIG_PREFIX + ".hbase.tablename"; public static final String DEFAULT_TABLE_NAME = "ATLAS_ENTITY_AUDIT_EVENTS"; +public static final String CONFIG_COMPRESSION_ALGORITHM = CONFIG_PREFIX + ".hbase.compression-algorithm"; public static final String CONFIG_PERSIST_ENTITY_DEFINITION = CONFIG_PREFIX + ".persistEntityDefinition"; public static final byte[] COLUMN_FAMILY = Bytes.toBytes("dt"); @@ -114,6 +113,7 @@ public class HBaseBasedAuditRepository extends AbstractStorageBasedAuditReposito public static final byte[] COLUMN_USER = Bytes.toBytes("u"); public static final byte[] COLUMN_DEFINITION = Bytes.toBytes("f"); +private static final String HBASE_STORE_COMPRESSION_PROPERTY = "atlas.graph.storage.hbase.compression-algorithm"; private static final String AUDIT_REPOSITORY_MAX_SIZE_PROPERTY = "atlas.hbase.client.keyvalue.maxsize"; private static final String AUDIT_EXCLUDE_ATTRIBUTE_PROPERTY = "atlas.audit.hbase.entity"; private static final String FIELD_SEPARATOR = ":"; @@ -132,7 +132,8 @@ public class HBaseBasedAuditRepository extends AbstractStorageBasedAuditReposito throw new RuntimeException(e); } } -private TableName tableName; +private TableName tableName; +private String compressionType; private Connection connection; /** @@ -774,7 +775,7 @@ public class HBaseBasedAuditRepository extends AbstractStorageBasedAuditReposito HColumnDescriptor columnFamily = new HColumnDescriptor(COLUMN_FAMILY); columnFamily.setMaxVersions(1); columnFamily.setDataBlockEncoding(DataBlockEncoding.FAST_DIFF); -columnFamily.setCompressionType(Compression.Algorithm.SNAPPY); + columnFamily.setCompressionType(Compression.Algorithm.valueOf(compressionType)); columnFamily.setBloomFilterType(BloomType.ROW); tableDescriptor.addFamily(columnFamily); admin.createTable(tableDescriptor); @@ -847,6 +848,8 @@ public class HBaseBasedAuditRepository extends AbstractStorageBasedAuditReposito String tableNameStr = atlasConf.getString(CONFIG_TABLE_NAME, DEFAULT_TABLE_NAME); tableName = TableName.valueOf(tableNameStr); +compressionType = atlasConf.getString(CONFIG_COMPRESSION_ALGORITHM, atlasConf.getString(HBASE_STORE_COMPRESSION_PROPERTY, "SNAPPY")); + try { connection = createConnection(hbaseConf); } catch (IOException e) {
(atlas) 02/02: ATLAS-4815: publish Python client library with the fix from previous commit
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 2c920afb5f4bc221e78399b1e8a163e3591864b1 Author: Madhan Neethiraj AuthorDate: Fri Dec 1 15:17:44 2023 -0800 ATLAS-4815: publish Python client library with the fix from previous commit (cherry picked from commit e86406906ebdf21056952f238478d2b5a9d48441) --- intg/src/main/python/README.md | 2 +- intg/src/main/python/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/intg/src/main/python/README.md b/intg/src/main/python/README.md index 140e6c329..a53a1e1bd 100644 --- a/intg/src/main/python/README.md +++ b/intg/src/main/python/README.md @@ -16,7 +16,7 @@ Verify if apache-atlas client is installed: Package Version - -apache-atlas 0.0.14 +apache-atlas 0.0.15 ``` ## Usage diff --git a/intg/src/main/python/setup.py b/intg/src/main/python/setup.py index daeaf6295..034b3fc75 100644 --- a/intg/src/main/python/setup.py +++ b/intg/src/main/python/setup.py @@ -28,7 +28,7 @@ with open("README.md", "r") as fh: setup( name='apache-atlas', -version='0.0.14', +version='0.0.15', author="Apache Atlas", author_email='d...@atlas.apache.org', description="Apache Atlas Python Client",
(atlas) branch branch-2.0 updated (f944f813a -> 2c920afb5)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git from f944f813a ATLAS-4768: Implement aging for audits stored by Atlas. new cdb8a8324 Update entity.py remove_classification method new 2c920afb5 ATLAS-4815: publish Python client library with the fix from previous commit The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: intg/src/main/python/README.md | 2 +- intg/src/main/python/apache_atlas/client/entity.py | 2 +- intg/src/main/python/setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(atlas) 01/02: Update entity.py remove_classification method
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 cdb8a83240497e24d251265f2d5983df51abffe2 Author: JoaoDuque92 <30290504+joaoduqu...@users.noreply.github.com> AuthorDate: Mon Jun 19 18:36:56 2023 +0100 Update entity.py remove_classification method There was a typo in the remove_classification method where it was written format instead of format (cherry picked from commit e1f1be8b7a61c8375cc2539934b35e8c02946ae2) --- intg/src/main/python/apache_atlas/client/entity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intg/src/main/python/apache_atlas/client/entity.py b/intg/src/main/python/apache_atlas/client/entity.py index 14cb4ed60..d28dc41fe 100644 --- a/intg/src/main/python/apache_atlas/client/entity.py +++ b/intg/src/main/python/apache_atlas/client/entity.py @@ -244,7 +244,7 @@ class EntityClient: def remove_classification(self, entity_guid, classification_name, associated_entity_guid): query = {'guid': entity_guid, 'classification_name': classification_name} - self.client.call_api(EntityClient.DELETE_CLASSIFICATION.formart_path(query), None, None, associated_entity_guid) + self.client.call_api(EntityClient.DELETE_CLASSIFICATION.format_path(query), None, None, associated_entity_guid) def remove_classification_by_name(self, type_name, uniq_attributes, classification_name): query_params = attributes_to_params(uniq_attributes)
(atlas) branch master updated: ATLAS-4815: publish Python client library with the fix from previous commit
This is an automated email from the ASF dual-hosted git repository. madhan 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 e86406906 ATLAS-4815: publish Python client library with the fix from previous commit e86406906 is described below commit e86406906ebdf21056952f238478d2b5a9d48441 Author: Madhan Neethiraj AuthorDate: Fri Dec 1 15:17:44 2023 -0800 ATLAS-4815: publish Python client library with the fix from previous commit --- intg/src/main/python/README.md | 2 +- intg/src/main/python/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/intg/src/main/python/README.md b/intg/src/main/python/README.md index 140e6c329..a53a1e1bd 100644 --- a/intg/src/main/python/README.md +++ b/intg/src/main/python/README.md @@ -16,7 +16,7 @@ Verify if apache-atlas client is installed: Package Version - -apache-atlas 0.0.14 +apache-atlas 0.0.15 ``` ## Usage diff --git a/intg/src/main/python/setup.py b/intg/src/main/python/setup.py index daeaf6295..034b3fc75 100644 --- a/intg/src/main/python/setup.py +++ b/intg/src/main/python/setup.py @@ -28,7 +28,7 @@ with open("README.md", "r") as fh: setup( name='apache-atlas', -version='0.0.14', +version='0.0.15', author="Apache Atlas", author_email='d...@atlas.apache.org', description="Apache Atlas Python Client",
(atlas) branch master updated: Update entity.py remove_classification method
This is an automated email from the ASF dual-hosted git repository. madhan 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 e1f1be8b7 Update entity.py remove_classification method new 5f38e9255 Merge pull request #232 from itsjoaoduque/patch-1 e1f1be8b7 is described below commit e1f1be8b7a61c8375cc2539934b35e8c02946ae2 Author: JoaoDuque92 <30290504+joaoduqu...@users.noreply.github.com> AuthorDate: Mon Jun 19 18:36:56 2023 +0100 Update entity.py remove_classification method There was a typo in the remove_classification method where it was written format instead of format --- intg/src/main/python/apache_atlas/client/entity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intg/src/main/python/apache_atlas/client/entity.py b/intg/src/main/python/apache_atlas/client/entity.py index 14cb4ed60..d28dc41fe 100644 --- a/intg/src/main/python/apache_atlas/client/entity.py +++ b/intg/src/main/python/apache_atlas/client/entity.py @@ -244,7 +244,7 @@ class EntityClient: def remove_classification(self, entity_guid, classification_name, associated_entity_guid): query = {'guid': entity_guid, 'classification_name': classification_name} - self.client.call_api(EntityClient.DELETE_CLASSIFICATION.formart_path(query), None, None, associated_entity_guid) + self.client.call_api(EntityClient.DELETE_CLASSIFICATION.format_path(query), None, None, associated_entity_guid) def remove_classification_by_name(self, type_name, uniq_attributes, classification_name): query_params = attributes_to_params(uniq_attributes)
(atlas) 02/02: ATLAS-4814: updated build/python scripts to replace references to python with python3
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit 204a39cb3aee39c71d2706db706d62241708652e Author: Madhan Neethiraj AuthorDate: Tue Nov 21 17:47:19 2023 -0800 ATLAS-4814: updated build/python scripts to replace references to python with python3 --- dev-support/atlas-docker/Dockerfile.atlas-base | 2 +- distro/pom.xml | 2 +- distro/src/bin/atlas_admin.py | 2 +- distro/src/bin/atlas_client_cmdline.py | 2 +- distro/src/bin/atlas_config.py | 2 +- distro/src/bin/atlas_kafka_setup.py | 2 +- distro/src/bin/atlas_kafka_setup_hook.py| 2 +- distro/src/bin/atlas_start.py | 2 +- distro/src/bin/atlas_stop.py| 2 +- distro/src/bin/atlas_update_simple_auth_json.py | 2 +- distro/src/bin/cputil.py| 2 +- distro/src/bin/quick_start.py | 2 +- distro/src/bin/quick_start_v1.py| 2 +- distro/src/test/mock/setup.py | 2 +- distro/src/test/python/scripts/TestMetadata.py | 2 +- distro/src/test/python/unitTests.py | 2 +- tools/atlas-index-repair/src/main/resources/repair_index.py | 2 +- tools/atlas-migration-exporter/atlas_migration_export.py| 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-support/atlas-docker/Dockerfile.atlas-base b/dev-support/atlas-docker/Dockerfile.atlas-base index 4aa225c16..6a39586b7 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas-base +++ b/dev-support/atlas-docker/Dockerfile.atlas-base @@ -23,7 +23,7 @@ ARG ATLAS_BASE_JAVA_VERSION # Install tzdata, Python, Java RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata \ -python python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh +python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh # Set environment variables ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH} diff --git a/distro/pom.xml b/distro/pom.xml index 9df238eb3..874b944f2 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -572,7 +572,7 @@ atlas.graph.storage.conf-file=${sys:atlas.home}/conf/cassandra.yml ${skipTests} -python +python3 src/test/python unitTests.py diff --git a/distro/src/bin/atlas_admin.py b/distro/src/bin/atlas_admin.py index 795a5716f..e7413d3ae 100644 --- a/distro/src/bin/atlas_admin.py +++ b/distro/src/bin/atlas_admin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_client_cmdline.py b/distro/src/bin/atlas_client_cmdline.py index f05a3c8f9..1691526e2 100644 --- a/distro/src/bin/atlas_client_cmdline.py +++ b/distro/src/bin/atlas_client_cmdline.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_config.py b/distro/src/bin/atlas_config.py index 31e6fd043..70030ac5c 100755 --- a/distro/src/bin/atlas_config.py +++ b/distro/src/bin/atlas_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup.py b/distro/src/bin/atlas_kafka_setup.py index c13030e88..4451a5bcd 100644 --- a/distro/src/bin/atlas_kafka_setup.py +++ b/distro/src/bin/atlas_kafka_setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup_hook.py b/distro/src/bin/atlas_kafka_setup_hook.py index cd8c0c3ca..6dc8d08a3 100644 --- a/distro/src/bin/atlas_kafka_setup_hook.py +++ b/distro/src/bin/atlas_kafka_setup_hook.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_start.py b/distro/src/bin/atlas_start.py index ffbe16271..f7d51c090 100755 --- a/distro/src/bin/atlas_start.py +++ b/distro/src/bin/atlas_start.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_stop.py b/distro/src/bin/a
(atlas) 01/02: Revert "ATLAS-4184: updated build/python scripts to replace references to python with python3"
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit 483ba3ea23c0b329a30b58460d4450f72f166e62 Author: Madhan Neethiraj AuthorDate: Wed Nov 22 09:08:34 2023 -0800 Revert "ATLAS-4184: updated build/python scripts to replace references to python with python3" incorrect JIRA number in commit message This reverts commit 0f331aa63095bae010f2c4cb0a76e58eb5606e1b. --- dev-support/atlas-docker/Dockerfile.atlas-base | 2 +- distro/pom.xml | 2 +- distro/src/bin/atlas_admin.py | 2 +- distro/src/bin/atlas_client_cmdline.py | 2 +- distro/src/bin/atlas_config.py | 2 +- distro/src/bin/atlas_kafka_setup.py | 2 +- distro/src/bin/atlas_kafka_setup_hook.py| 2 +- distro/src/bin/atlas_start.py | 2 +- distro/src/bin/atlas_stop.py| 2 +- distro/src/bin/atlas_update_simple_auth_json.py | 2 +- distro/src/bin/cputil.py| 2 +- distro/src/bin/quick_start.py | 2 +- distro/src/bin/quick_start_v1.py| 2 +- distro/src/test/mock/setup.py | 2 +- distro/src/test/python/scripts/TestMetadata.py | 2 +- distro/src/test/python/unitTests.py | 2 +- tools/atlas-index-repair/src/main/resources/repair_index.py | 2 +- tools/atlas-migration-exporter/atlas_migration_export.py| 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-support/atlas-docker/Dockerfile.atlas-base b/dev-support/atlas-docker/Dockerfile.atlas-base index 6a39586b7..4aa225c16 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas-base +++ b/dev-support/atlas-docker/Dockerfile.atlas-base @@ -23,7 +23,7 @@ ARG ATLAS_BASE_JAVA_VERSION # Install tzdata, Python, Java RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata \ -python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh +python python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh # Set environment variables ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH} diff --git a/distro/pom.xml b/distro/pom.xml index 874b944f2..9df238eb3 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -572,7 +572,7 @@ atlas.graph.storage.conf-file=${sys:atlas.home}/conf/cassandra.yml ${skipTests} -python3 +python src/test/python unitTests.py diff --git a/distro/src/bin/atlas_admin.py b/distro/src/bin/atlas_admin.py index e7413d3ae..795a5716f 100644 --- a/distro/src/bin/atlas_admin.py +++ b/distro/src/bin/atlas_admin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_client_cmdline.py b/distro/src/bin/atlas_client_cmdline.py index 1691526e2..f05a3c8f9 100644 --- a/distro/src/bin/atlas_client_cmdline.py +++ b/distro/src/bin/atlas_client_cmdline.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_config.py b/distro/src/bin/atlas_config.py index 70030ac5c..31e6fd043 100755 --- a/distro/src/bin/atlas_config.py +++ b/distro/src/bin/atlas_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup.py b/distro/src/bin/atlas_kafka_setup.py index 4451a5bcd..c13030e88 100644 --- a/distro/src/bin/atlas_kafka_setup.py +++ b/distro/src/bin/atlas_kafka_setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup_hook.py b/distro/src/bin/atlas_kafka_setup_hook.py index 6dc8d08a3..cd8c0c3ca 100644 --- a/distro/src/bin/atlas_kafka_setup_hook.py +++ b/distro/src/bin/atlas_kafka_setup_hook.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_start.py b/distro/src/bin/atlas_start.py index f7d51c090..ffbe16271 100755 --- a/distro/src/bin/atlas_start.py +++ b/distro/src/bin/atlas_start.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python
(atlas) branch master updated (0f331aa63 -> 204a39cb3)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git from 0f331aa63 ATLAS-4184: updated build/python scripts to replace references to python with python3 new 483ba3ea2 Revert "ATLAS-4184: updated build/python scripts to replace references to python with python3" new 204a39cb3 ATLAS-4814: updated build/python scripts to replace references to python with python3 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
(atlas) 01/01: ATLAS-4814: updated build/python scripts to replace references to python with python3
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 f72f5ec58f8da843fed072d2b94f3abd948a4716 Author: Madhan Neethiraj AuthorDate: Tue Nov 21 17:47:19 2023 -0800 ATLAS-4814: updated build/python scripts to replace references to python with python3 (cherry picked from commit 0f331aa63095bae010f2c4cb0a76e58eb5606e1b) --- dev-support/atlas-docker/Dockerfile.atlas-base | 2 +- distro/pom.xml | 2 +- distro/src/bin/atlas_admin.py | 2 +- distro/src/bin/atlas_client_cmdline.py | 2 +- distro/src/bin/atlas_config.py | 2 +- distro/src/bin/atlas_kafka_setup.py | 2 +- distro/src/bin/atlas_kafka_setup_hook.py| 2 +- distro/src/bin/atlas_start.py | 2 +- distro/src/bin/atlas_stop.py| 2 +- distro/src/bin/atlas_update_simple_auth_json.py | 2 +- distro/src/bin/cputil.py| 2 +- distro/src/bin/quick_start.py | 2 +- distro/src/bin/quick_start_v1.py| 2 +- distro/src/test/mock/setup.py | 2 +- distro/src/test/python/scripts/TestMetadata.py | 2 +- distro/src/test/python/unitTests.py | 2 +- tools/atlas-index-repair/src/main/resources/repair_index.py | 2 +- tools/atlas-migration-exporter/atlas_migration_export.py| 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-support/atlas-docker/Dockerfile.atlas-base b/dev-support/atlas-docker/Dockerfile.atlas-base index 4aa225c16..6a39586b7 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas-base +++ b/dev-support/atlas-docker/Dockerfile.atlas-base @@ -23,7 +23,7 @@ ARG ATLAS_BASE_JAVA_VERSION # Install tzdata, Python, Java RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata \ -python python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh +python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh # Set environment variables ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH} diff --git a/distro/pom.xml b/distro/pom.xml index a8585562e..7d4179ff4 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -572,7 +572,7 @@ atlas.graph.storage.conf-file=${sys:atlas.home}/conf/cassandra.yml ${skipTests} -python +python3 src/test/python unitTests.py diff --git a/distro/src/bin/atlas_admin.py b/distro/src/bin/atlas_admin.py index 795a5716f..e7413d3ae 100644 --- a/distro/src/bin/atlas_admin.py +++ b/distro/src/bin/atlas_admin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_client_cmdline.py b/distro/src/bin/atlas_client_cmdline.py index f05a3c8f9..1691526e2 100644 --- a/distro/src/bin/atlas_client_cmdline.py +++ b/distro/src/bin/atlas_client_cmdline.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_config.py b/distro/src/bin/atlas_config.py index 31e6fd043..70030ac5c 100755 --- a/distro/src/bin/atlas_config.py +++ b/distro/src/bin/atlas_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup.py b/distro/src/bin/atlas_kafka_setup.py index c13030e88..4451a5bcd 100644 --- a/distro/src/bin/atlas_kafka_setup.py +++ b/distro/src/bin/atlas_kafka_setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup_hook.py b/distro/src/bin/atlas_kafka_setup_hook.py index cd8c0c3ca..6dc8d08a3 100644 --- a/distro/src/bin/atlas_kafka_setup_hook.py +++ b/distro/src/bin/atlas_kafka_setup_hook.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_start.py b/distro/src/bin/atlas_start.py index ffbe16271..f7d51c090 100755 --- a/distro/src/bin/atlas_start.py +++ b/distro/src/bin/atlas_start.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF)
(atlas) branch branch-2.0 updated (87fb3a4a4 -> f72f5ec58)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git discard 87fb3a4a4 ATLAS-4184: updated build/python scripts to replace references to python with python3 new f72f5ec58 ATLAS-4814: updated build/python scripts to replace references to python with python3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (87fb3a4a4) \ N -- N -- N refs/heads/branch-2.0 (f72f5ec58) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
(atlas) branch branch-2.0 updated: ATLAS-4184: updated build/python scripts to replace references to python with python3
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 87fb3a4a4 ATLAS-4184: updated build/python scripts to replace references to python with python3 87fb3a4a4 is described below commit 87fb3a4a4e3eae1b89909ac052139be1e0f164ee Author: Madhan Neethiraj AuthorDate: Tue Nov 21 17:47:19 2023 -0800 ATLAS-4184: updated build/python scripts to replace references to python with python3 (cherry picked from commit 0f331aa63095bae010f2c4cb0a76e58eb5606e1b) --- dev-support/atlas-docker/Dockerfile.atlas-base | 2 +- distro/pom.xml | 2 +- distro/src/bin/atlas_admin.py | 2 +- distro/src/bin/atlas_client_cmdline.py | 2 +- distro/src/bin/atlas_config.py | 2 +- distro/src/bin/atlas_kafka_setup.py | 2 +- distro/src/bin/atlas_kafka_setup_hook.py| 2 +- distro/src/bin/atlas_start.py | 2 +- distro/src/bin/atlas_stop.py| 2 +- distro/src/bin/atlas_update_simple_auth_json.py | 2 +- distro/src/bin/cputil.py| 2 +- distro/src/bin/quick_start.py | 2 +- distro/src/bin/quick_start_v1.py| 2 +- distro/src/test/mock/setup.py | 2 +- distro/src/test/python/scripts/TestMetadata.py | 2 +- distro/src/test/python/unitTests.py | 2 +- tools/atlas-index-repair/src/main/resources/repair_index.py | 2 +- tools/atlas-migration-exporter/atlas_migration_export.py| 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-support/atlas-docker/Dockerfile.atlas-base b/dev-support/atlas-docker/Dockerfile.atlas-base index 4aa225c16..6a39586b7 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas-base +++ b/dev-support/atlas-docker/Dockerfile.atlas-base @@ -23,7 +23,7 @@ ARG ATLAS_BASE_JAVA_VERSION # Install tzdata, Python, Java RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata \ -python python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh +python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh # Set environment variables ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH} diff --git a/distro/pom.xml b/distro/pom.xml index a8585562e..7d4179ff4 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -572,7 +572,7 @@ atlas.graph.storage.conf-file=${sys:atlas.home}/conf/cassandra.yml ${skipTests} -python +python3 src/test/python unitTests.py diff --git a/distro/src/bin/atlas_admin.py b/distro/src/bin/atlas_admin.py index 795a5716f..e7413d3ae 100644 --- a/distro/src/bin/atlas_admin.py +++ b/distro/src/bin/atlas_admin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_client_cmdline.py b/distro/src/bin/atlas_client_cmdline.py index f05a3c8f9..1691526e2 100644 --- a/distro/src/bin/atlas_client_cmdline.py +++ b/distro/src/bin/atlas_client_cmdline.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_config.py b/distro/src/bin/atlas_config.py index 31e6fd043..70030ac5c 100755 --- a/distro/src/bin/atlas_config.py +++ b/distro/src/bin/atlas_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup.py b/distro/src/bin/atlas_kafka_setup.py index c13030e88..4451a5bcd 100644 --- a/distro/src/bin/atlas_kafka_setup.py +++ b/distro/src/bin/atlas_kafka_setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup_hook.py b/distro/src/bin/atlas_kafka_setup_hook.py index cd8c0c3ca..6dc8d08a3 100644 --- a/distro/src/bin/atlas_kafka_setup_hook.py +++ b/distro/src/bin/atlas_kafka_setup_hook.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_start.py b/distro/src/bin/atlas_start.py index ffbe16271
(atlas) branch master updated: ATLAS-4184: updated build/python scripts to replace references to python with python3
This is an automated email from the ASF dual-hosted git repository. madhan 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 0f331aa63 ATLAS-4184: updated build/python scripts to replace references to python with python3 0f331aa63 is described below commit 0f331aa63095bae010f2c4cb0a76e58eb5606e1b Author: Madhan Neethiraj AuthorDate: Tue Nov 21 17:47:19 2023 -0800 ATLAS-4184: updated build/python scripts to replace references to python with python3 --- dev-support/atlas-docker/Dockerfile.atlas-base | 2 +- distro/pom.xml | 2 +- distro/src/bin/atlas_admin.py | 2 +- distro/src/bin/atlas_client_cmdline.py | 2 +- distro/src/bin/atlas_config.py | 2 +- distro/src/bin/atlas_kafka_setup.py | 2 +- distro/src/bin/atlas_kafka_setup_hook.py| 2 +- distro/src/bin/atlas_start.py | 2 +- distro/src/bin/atlas_stop.py| 2 +- distro/src/bin/atlas_update_simple_auth_json.py | 2 +- distro/src/bin/cputil.py| 2 +- distro/src/bin/quick_start.py | 2 +- distro/src/bin/quick_start_v1.py| 2 +- distro/src/test/mock/setup.py | 2 +- distro/src/test/python/scripts/TestMetadata.py | 2 +- distro/src/test/python/unitTests.py | 2 +- tools/atlas-index-repair/src/main/resources/repair_index.py | 2 +- tools/atlas-migration-exporter/atlas_migration_export.py| 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-support/atlas-docker/Dockerfile.atlas-base b/dev-support/atlas-docker/Dockerfile.atlas-base index 4aa225c16..6a39586b7 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas-base +++ b/dev-support/atlas-docker/Dockerfile.atlas-base @@ -23,7 +23,7 @@ ARG ATLAS_BASE_JAVA_VERSION # Install tzdata, Python, Java RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata \ -python python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh +python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh # Set environment variables ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH} diff --git a/distro/pom.xml b/distro/pom.xml index 9df238eb3..874b944f2 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -572,7 +572,7 @@ atlas.graph.storage.conf-file=${sys:atlas.home}/conf/cassandra.yml ${skipTests} -python +python3 src/test/python unitTests.py diff --git a/distro/src/bin/atlas_admin.py b/distro/src/bin/atlas_admin.py index 795a5716f..e7413d3ae 100644 --- a/distro/src/bin/atlas_admin.py +++ b/distro/src/bin/atlas_admin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_client_cmdline.py b/distro/src/bin/atlas_client_cmdline.py index f05a3c8f9..1691526e2 100644 --- a/distro/src/bin/atlas_client_cmdline.py +++ b/distro/src/bin/atlas_client_cmdline.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_config.py b/distro/src/bin/atlas_config.py index 31e6fd043..70030ac5c 100755 --- a/distro/src/bin/atlas_config.py +++ b/distro/src/bin/atlas_config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup.py b/distro/src/bin/atlas_kafka_setup.py index c13030e88..4451a5bcd 100644 --- a/distro/src/bin/atlas_kafka_setup.py +++ b/distro/src/bin/atlas_kafka_setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_kafka_setup_hook.py b/distro/src/bin/atlas_kafka_setup_hook.py index cd8c0c3ca..6dc8d08a3 100644 --- a/distro/src/bin/atlas_kafka_setup_hook.py +++ b/distro/src/bin/atlas_kafka_setup_hook.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/distro/src/bin/atlas_start.py b/distro/src/bin/atlas_start.py index ffbe16271..f7d51c090 100755 --- a/distro/src/bin/atlas_start.py +++ b/distro/src/bin/atlas_sta
(atlas) branch branch-2.0 updated: ATLAS-4789: added couchbase bridge #2 - fixed incorrect parent.version in pom.xml
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new abafe2b11 ATLAS-4789: added couchbase bridge #2 - fixed incorrect parent.version in pom.xml abafe2b11 is described below commit abafe2b113e372d48ca23f03ccbd4b6f92335dd8 Author: Madhan Neethiraj AuthorDate: Tue Nov 21 14:15:07 2023 -0800 ATLAS-4789: added couchbase bridge #2 - fixed incorrect parent.version in pom.xml --- addons/couchbase-bridge/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/couchbase-bridge/pom.xml b/addons/couchbase-bridge/pom.xml index 8a3ccef17..54f6e6d3f 100644 --- a/addons/couchbase-bridge/pom.xml +++ b/addons/couchbase-bridge/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -3.0.0-SNAPSHOT +2.4.0-SNAPSHOT ../../ couchbase-bridge
(atlas) branch branch-2.0 updated (60b861512 -> b4d06290e)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git from 60b861512 ATLAS-4801: Atlas - Upgrade Okio to 3.4.0 due to CVE-2023-3635 add b4d06290e ATLAS-4789: added couchbase bridge No new revisions were added by this update. Summary of changes: addons/couchbase-bridge/pom.xml| 201 .../com/couchbase/atlas/connector/AtlasConfig.java | 54 .../com/couchbase/atlas/connector/CBConfig.java| 145 + .../couchbase/atlas/connector/CouchbaseHook.java | 341 + .../connector/entities/CouchbaseAtlasEntity.java | 227 ++ .../atlas/connector/entities/CouchbaseBucket.java | 89 ++ .../atlas/connector/entities/CouchbaseCluster.java | 130 .../connector/entities/CouchbaseCollection.java| 90 ++ .../atlas/connector/entities/CouchbaseField.java | 129 .../connector/entities/CouchbaseFieldType.java | 71 + .../atlas/connector/entities/CouchbaseScope.java | 93 ++ .../main/resources/atlas-application.properties| 4 +- .../atlas/connector/CouchbaseHookTest.java | 136 .../entities/CouchbaseAtlasEntityTest.java | 108 +++ .../couchbase-bridge/src/test/resources/log4j.xml | 17 +- .../5000-Couchbase/5020-couchbase_model.json | 159 ++ distro/pom.xml | 1 + ...ackage.xml => atlas-couchbase-hook-package.xml} | 11 +- distro/src/main/assemblies/standalone-package.xml | 6 + docs/src/documents/Hook/HookCouchbase.md | 45 +++ pom.xml| 7 + 21 files changed, 2042 insertions(+), 22 deletions(-) create mode 100644 addons/couchbase-bridge/pom.xml create mode 100644 addons/couchbase-bridge/src/main/java/com/couchbase/atlas/connector/AtlasConfig.java create mode 100644 addons/couchbase-bridge/src/main/java/com/couchbase/atlas/connector/CBConfig.java create mode 100644 addons/couchbase-bridge/src/main/java/com/couchbase/atlas/connector/CouchbaseHook.java create mode 100644 addons/couchbase-bridge/src/main/java/com/couchbase/atlas/connector/entities/CouchbaseAtlasEntity.java create mode 100644 addons/couchbase-bridge/src/main/java/com/couchbase/atlas/connector/entities/CouchbaseBucket.java create mode 100644 addons/couchbase-bridge/src/main/java/com/couchbase/atlas/connector/entities/CouchbaseCluster.java create mode 100644 addons/couchbase-bridge/src/main/java/com/couchbase/atlas/connector/entities/CouchbaseCollection.java create mode 100644 addons/couchbase-bridge/src/main/java/com/couchbase/atlas/connector/entities/CouchbaseField.java create mode 100644 addons/couchbase-bridge/src/main/java/com/couchbase/atlas/connector/entities/CouchbaseFieldType.java create mode 100644 addons/couchbase-bridge/src/main/java/com/couchbase/atlas/connector/entities/CouchbaseScope.java copy dev-support/atlas-docker/Dockerfile.atlas-zk => addons/couchbase-bridge/src/main/resources/atlas-application.properties (97%) create mode 100644 addons/couchbase-bridge/src/test/java/com/couchbase/atlas/connector/CouchbaseHookTest.java create mode 100644 addons/couchbase-bridge/src/test/java/com/couchbase/atlas/connector/entities/CouchbaseAtlasEntityTest.java copy tools/atlas-index-repair/src/main/resources/atlas-log4j.xml => addons/couchbase-bridge/src/test/resources/log4j.xml (70%) create mode 100644 addons/models/5000-Couchbase/5020-couchbase_model.json copy distro/src/main/assemblies/{atlas-impala-hook-package.xml => atlas-couchbase-hook-package.xml} (78%) create mode 100644 docs/src/documents/Hook/HookCouchbase.md
(atlas) branch master updated: ATLAS-4789: added couchbase bridge
This is an automated email from the ASF dual-hosted git repository. madhan 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 fd0d3a69f ATLAS-4789: added couchbase bridge fd0d3a69f is described below commit fd0d3a69fe97867b3565d0a2f497da6362ce5ef4 Author: Dmitrii Chechetkin AuthorDate: Mon Oct 30 12:31:32 2023 -0400 ATLAS-4789: added couchbase bridge Signed-off-by: Madhan Neethiraj --- addons/couchbase-bridge/pom.xml| 201 .../com/couchbase/atlas/connector/AtlasConfig.java | 54 .../com/couchbase/atlas/connector/CBConfig.java| 145 + .../couchbase/atlas/connector/CouchbaseHook.java | 341 + .../connector/entities/CouchbaseAtlasEntity.java | 227 ++ .../atlas/connector/entities/CouchbaseBucket.java | 89 ++ .../atlas/connector/entities/CouchbaseCluster.java | 130 .../connector/entities/CouchbaseCollection.java| 90 ++ .../atlas/connector/entities/CouchbaseField.java | 129 .../connector/entities/CouchbaseFieldType.java | 71 + .../atlas/connector/entities/CouchbaseScope.java | 93 ++ .../main/resources/atlas-application.properties| 17 + .../atlas/connector/CouchbaseHookTest.java | 136 .../entities/CouchbaseAtlasEntityTest.java | 108 +++ .../couchbase-bridge/src/test/resources/log4j.xml | 35 +++ .../5000-Couchbase/5020-couchbase_model.json | 159 ++ distro/pom.xml | 1 + .../assemblies/atlas-couchbase-hook-package.xml| 34 ++ distro/src/main/assemblies/standalone-package.xml | 6 + docs/src/documents/Hook/HookCouchbase.md | 45 +++ pom.xml| 7 + 21 files changed, 2118 insertions(+) diff --git a/addons/couchbase-bridge/pom.xml b/addons/couchbase-bridge/pom.xml new file mode 100644 index 0..8a3ccef17 --- /dev/null +++ b/addons/couchbase-bridge/pom.xml @@ -0,0 +1,201 @@ + + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + +apache-atlas +org.apache.atlas +3.0.0-SNAPSHOT +../../ + +couchbase-bridge +Apache Atlas Couchbase Bridge Module +Apache Atlas Couchbase Bridge +jar + + + +com.google.guava +guava +30.1.1-jre + + +com.couchbase.client +java-client +3.4.4 + + +com.couchbase.client +dcp-client +0.44.0 + + + +org.slf4j +slf4j-api + + + +org.slf4j +slf4j-log4j12 + + + +org.apache.atlas +atlas-client-v2 + + + +org.apache.atlas +atlas-notification + + + +org.testng +testng + + + + + +dist + + + +org.apache.maven.plugins +maven-dependency-plugin + + +copy-hook +package + +copy + + + ${project.build.directory}/dependency/hook/couchbase/atlas-couchbase-plugin-impl + false + false +true + + + ${project.groupId} + ${project.artifactId} + ${project.version} + + + ${project.groupId} + atlas-client-common + ${project.version} + + + ${project.groupId} + atlas-client-v2 + ${project.version} + + + ${project.groupId} +
[atlas] branch branch-2.0 updated: ATLAS-4783: Fix NoSuchElementException when running different indexing backend than Solr
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new fad2746dc ATLAS-4783: Fix NoSuchElementException when running different indexing backend than Solr fad2746dc is described below commit fad2746dca0b3fe534483fc6037443a4cae127f5 Author: szymonorz AuthorDate: Fri Aug 11 22:35:07 2023 +0200 ATLAS-4783: Fix NoSuchElementException when running different indexing backend than Solr Signed-off-by: Madhan Neethiraj (cherry picked from commit 33a2a55899109e2ebe82766d4ba1f3fd82962610) --- intg/src/main/java/org/apache/atlas/ApplicationProperties.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/intg/src/main/java/org/apache/atlas/ApplicationProperties.java b/intg/src/main/java/org/apache/atlas/ApplicationProperties.java index f83dff699..82ddc8ab0 100644 --- a/intg/src/main/java/org/apache/atlas/ApplicationProperties.java +++ b/intg/src/main/java/org/apache/atlas/ApplicationProperties.java @@ -352,7 +352,7 @@ public final class ApplicationProperties extends PropertiesConfiguration { addPropertyDirect(SOLR_WAIT_SEARCHER_CONF, DEFAULT_SOLR_WAIT_SEARCHER); } -LOG.info("Setting solr.wait-searcher property '" + getBoolean(SOLR_WAIT_SEARCHER_CONF) + "'"); +LOG.info("Setting " + SOLR_WAIT_SEARCHER_CONF + " = " + getBoolean(SOLR_WAIT_SEARCHER_CONF)); clearPropertyDirect(INDEX_MAP_NAME_CONF); addPropertyDirect(INDEX_MAP_NAME_CONF, DEFAULT_INDEX_MAP_NAME); @@ -371,7 +371,6 @@ public final class ApplicationProperties extends PropertiesConfiguration { addPropertyDirect(INDEX_SEARCH_MAX_RESULT_SET_SIZE, indexMaxResultSetSize); LOG.info("Setting " + INDEX_SEARCH_MAX_RESULT_SET_SIZE + " = " + indexMaxResultSetSize); -LOG.info("Setting " + SOLR_WAIT_SEARCHER_CONF + " = " + getBoolean(SOLR_WAIT_SEARCHER_CONF)); setDbCacheConfDefaults(); }
[atlas] branch master updated: ATLAS-4783: Fix NoSuchElementException when running different indexing backend than Solr
This is an automated email from the ASF dual-hosted git repository. madhan 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 33a2a5589 ATLAS-4783: Fix NoSuchElementException when running different indexing backend than Solr 33a2a5589 is described below commit 33a2a55899109e2ebe82766d4ba1f3fd82962610 Author: szymonorz AuthorDate: Fri Aug 11 22:35:07 2023 +0200 ATLAS-4783: Fix NoSuchElementException when running different indexing backend than Solr Signed-off-by: Madhan Neethiraj --- intg/src/main/java/org/apache/atlas/ApplicationProperties.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/intg/src/main/java/org/apache/atlas/ApplicationProperties.java b/intg/src/main/java/org/apache/atlas/ApplicationProperties.java index f83dff699..82ddc8ab0 100644 --- a/intg/src/main/java/org/apache/atlas/ApplicationProperties.java +++ b/intg/src/main/java/org/apache/atlas/ApplicationProperties.java @@ -352,7 +352,7 @@ public final class ApplicationProperties extends PropertiesConfiguration { addPropertyDirect(SOLR_WAIT_SEARCHER_CONF, DEFAULT_SOLR_WAIT_SEARCHER); } -LOG.info("Setting solr.wait-searcher property '" + getBoolean(SOLR_WAIT_SEARCHER_CONF) + "'"); +LOG.info("Setting " + SOLR_WAIT_SEARCHER_CONF + " = " + getBoolean(SOLR_WAIT_SEARCHER_CONF)); clearPropertyDirect(INDEX_MAP_NAME_CONF); addPropertyDirect(INDEX_MAP_NAME_CONF, DEFAULT_INDEX_MAP_NAME); @@ -371,7 +371,6 @@ public final class ApplicationProperties extends PropertiesConfiguration { addPropertyDirect(INDEX_SEARCH_MAX_RESULT_SET_SIZE, indexMaxResultSetSize); LOG.info("Setting " + INDEX_SEARCH_MAX_RESULT_SET_SIZE + " = " + indexMaxResultSetSize); -LOG.info("Setting " + SOLR_WAIT_SEARCHER_CONF + " = " + getBoolean(SOLR_WAIT_SEARCHER_CONF)); setDbCacheConfDefaults(); }
[atlas] 01/02: ATLAS-4794: fixed initialization failure in HBase and Hive hooks
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 8e2ff2797474c34b09f47875149762584b81138a Author: Madhan Neethiraj AuthorDate: Fri Sep 8 14:10:17 2023 -0700 ATLAS-4794: fixed initialization failure in HBase and Hive hooks (cherry picked from commit dc5db3b6c1cf1929543d7c64c5b0d7d986f1cdd9) --- addons/hbase-bridge/pom.xml | 10 ++ addons/hive-bridge/pom.xml | 10 ++ 2 files changed, 20 insertions(+) diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index aafe86936..f54dfd01d 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -399,6 +399,16 @@ jersey-bundle ${jersey.version} + + org.apache.logging.log4j +log4j-core + ${log4j2.version} + + + org.apache.logging.log4j +log4j-api + ${log4j2.version} + diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml index 70352d45c..20742bf97 100755 --- a/addons/hive-bridge/pom.xml +++ b/addons/hive-bridge/pom.xml @@ -316,6 +316,16 @@ jersey-client ${jersey.version} + + org.apache.logging.log4j +log4j-core + ${log4j2.version} + + + org.apache.logging.log4j +log4j-api + ${log4j2.version} +
[atlas] 02/02: ATLAS-4795: docker setup updated to support Apple M1
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 368c90dfe35cf552e619dc1c69e9caa4c64b9497 Author: Madhan Neethiraj AuthorDate: Fri Sep 8 12:46:22 2023 -0700 ATLAS-4795: docker setup updated to support Apple M1 (cherry picked from commit 3786524112d02951ac6a059085d303de2649e835) --- dev-support/atlas-docker/.env | 18 -- dev-support/atlas-docker/Dockerfile| 5 - dev-support/atlas-docker/Dockerfile.atlas | 5 + dev-support/atlas-docker/Dockerfile.atlas-base | 11 --- dev-support/atlas-docker/Dockerfile.atlas-build| 6 ++ dev-support/atlas-docker/docker-compose.atlas-base.yml | 3 +++ .../atlas-docker/docker-compose.atlas-build.yml| 2 ++ dev-support/atlas-docker/docker-compose.atlas.yml | 2 ++ dev-support/atlas-docker/scripts/atlas-build.sh| 2 ++ 9 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dev-support/atlas-docker/.env b/dev-support/atlas-docker/.env index 623f0477c..c50ed6093 100644 --- a/dev-support/atlas-docker/.env +++ b/dev-support/atlas-docker/.env @@ -1,10 +1,24 @@ BUILD_HOST_SRC=true SKIPTESTS=true GIT_URL=https://github.com/apache/atlas.git -BRANCH=release-2.3.0 +BRANCH=branch-2.0 PROFILE=dist,external-hbase-solr -ATLAS_VERSION=2.3.0 +# Java version for AtlasBase image. +# This image gets used as base docker image for all images. +# Valid values: 8, 11, 17 +ATLAS_BASE_JAVA_VERSION=8 + +# Java version to use to build Apache Atlas +# Valid values: 8, 11, 17 +ATLAS_BUILD_JAVA_VERSION=8 + +# Java version to use to run Atlas server +# Valid values: 8, 11, 17 +ATLAS_SERVER_JAVA_VERSION=8 + +ATLAS_VERSION=2.4.0-SNAPSHOT +UBUNTU_VERSION=20.04 HADOOP_VERSION=3.3.0 HBASE_VERSION=2.3.3 KAFKA_VERSION=2.8.1 diff --git a/dev-support/atlas-docker/Dockerfile b/dev-support/atlas-docker/Dockerfile index 7bd79651f..12c1b6ea2 100644 --- a/dev-support/atlas-docker/Dockerfile +++ b/dev-support/atlas-docker/Dockerfile @@ -16,12 +16,15 @@ FROM ubuntu:18.04 +ARG TARGETARCH +ARG ATLAS_BASE_JAVA_VERSION + # Install Git, which is missing from the Ubuntu base images. RUN apt-get update && apt-get install -y git python # Install Java. RUN apt-get update && apt-get install -y openjdk-8-jdk -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH} # Install Maven. diff --git a/dev-support/atlas-docker/Dockerfile.atlas b/dev-support/atlas-docker/Dockerfile.atlas index 888779133..83550c5f1 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas +++ b/dev-support/atlas-docker/Dockerfile.atlas @@ -16,7 +16,12 @@ FROM atlas-base:latest +ARG ATLAS_SERVER_JAVA_VERSION ARG ATLAS_VERSION +ARG TARGETARCH + +ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_SERVER_JAVA_VERSION}-openjdk-${TARGETARCH} +RUN update-java-alternatives --set /usr/lib/jvm/java-1.${ATLAS_SERVER_JAVA_VERSION}.0-openjdk-${TARGETARCH} COPY ./scripts/atlas.sh ${ATLAS_SCRIPTS}/ COPY ./dist/apache-atlas-${ATLAS_VERSION}-server.tar.gz /home/atlas/dist/ diff --git a/dev-support/atlas-docker/Dockerfile.atlas-base b/dev-support/atlas-docker/Dockerfile.atlas-base index e68daa69d..4aa225c16 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas-base +++ b/dev-support/atlas-docker/Dockerfile.atlas-base @@ -14,21 +14,26 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ubuntu:20.04 +ARG UBUNTU_VERSION +FROM ubuntu:${UBUNTU_VERSION} +ARG TARGETARCH +ARG ATLAS_BASE_JAVA_VERSION # Install tzdata, Python, Java RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata \ -python python3 python3-pip openjdk-8-jdk bc iputils-ping ssh pdsh +python python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh # Set environment variables -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH} ENV ATLAS_DIST/home/atlas/dist ENV ATLAS_HOME/opt/atlas ENV ATLAS_SCRIPTS /home/atlas/scripts ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +RUN update-java-alternatives --set /usr/lib/jvm/java-1.${ATLAS_BASE_JAVA_VERSION}.0-openjdk-${TARGETARCH} + # setup groups, users, directories RUN groupadd atlas && \ diff --git a/dev-support/atlas-docker/Dockerfile.atlas-build b/dev-support/atlas-docker/Dockerfile.atlas-build index 4b381c1d9..42a2536ee 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas-build +++ b/dev-support/atlas-docker/Dockerfile.atlas-build @@ -16,14 +16,20 @@ FROM atlas-base:latest +ARG ATLAS_BUILD_JAVA_VERSION +ARG TA
[atlas] branch branch-2.0 updated (9b1349078 -> 368c90dfe)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git from 9b1349078 ATLAS-4792: fix to address build failure in Pro with Apple M1 chip new 8e2ff2797 ATLAS-4794: fixed initialization failure in HBase and Hive hooks new 368c90dfe ATLAS-4795: docker setup updated to support Apple M1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: addons/hbase-bridge/pom.xml| 10 ++ addons/hive-bridge/pom.xml | 10 ++ dev-support/atlas-docker/.env | 18 -- dev-support/atlas-docker/Dockerfile| 5 - dev-support/atlas-docker/Dockerfile.atlas | 5 + dev-support/atlas-docker/Dockerfile.atlas-base | 11 --- dev-support/atlas-docker/Dockerfile.atlas-build| 6 ++ dev-support/atlas-docker/docker-compose.atlas-base.yml | 3 +++ .../atlas-docker/docker-compose.atlas-build.yml| 2 ++ dev-support/atlas-docker/docker-compose.atlas.yml | 2 ++ dev-support/atlas-docker/scripts/atlas-build.sh| 2 ++ 11 files changed, 68 insertions(+), 6 deletions(-)
[atlas] 01/02: ATLAS-4794: fixed initialization failure in HBase and Hive hooks
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit dc5db3b6c1cf1929543d7c64c5b0d7d986f1cdd9 Author: Madhan Neethiraj AuthorDate: Fri Sep 8 14:10:17 2023 -0700 ATLAS-4794: fixed initialization failure in HBase and Hive hooks --- addons/hbase-bridge/pom.xml | 10 ++ addons/hive-bridge/pom.xml | 10 ++ 2 files changed, 20 insertions(+) diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index d78abbb37..278b6c6d3 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -399,6 +399,16 @@ jersey-bundle ${jersey.version} + + org.apache.logging.log4j +log4j-core + ${log4j2.version} + + + org.apache.logging.log4j +log4j-api + ${log4j2.version} + diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml index 3464b65f0..356ac9542 100755 --- a/addons/hive-bridge/pom.xml +++ b/addons/hive-bridge/pom.xml @@ -316,6 +316,16 @@ jersey-client ${jersey.version} + + org.apache.logging.log4j +log4j-core + ${log4j2.version} + + + org.apache.logging.log4j +log4j-api + ${log4j2.version} +
[atlas] 02/02: ATLAS-4795: docker setup updated to support Apple M1
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit 3786524112d02951ac6a059085d303de2649e835 Author: Madhan Neethiraj AuthorDate: Fri Sep 8 12:46:22 2023 -0700 ATLAS-4795: docker setup updated to support Apple M1 --- dev-support/atlas-docker/.env | 14 ++ dev-support/atlas-docker/Dockerfile | 5 - dev-support/atlas-docker/Dockerfile.atlas | 5 + dev-support/atlas-docker/Dockerfile.atlas-base | 11 --- dev-support/atlas-docker/Dockerfile.atlas-build | 6 ++ dev-support/atlas-docker/docker-compose.atlas-base.yml | 3 +++ dev-support/atlas-docker/docker-compose.atlas-build.yml | 2 ++ dev-support/atlas-docker/docker-compose.atlas.yml | 2 ++ dev-support/atlas-docker/scripts/atlas-build.sh | 2 ++ 9 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dev-support/atlas-docker/.env b/dev-support/atlas-docker/.env index 440be2a46..0e924b27a 100644 --- a/dev-support/atlas-docker/.env +++ b/dev-support/atlas-docker/.env @@ -4,7 +4,21 @@ GIT_URL=https://github.com/apache/atlas.git BRANCH=master PROFILE=dist,external-hbase-solr +# Java version for AtlasBase image. +# This image gets used as base docker image for all images. +# Valid values: 8, 11, 17 +ATLAS_BASE_JAVA_VERSION=8 + +# Java version to use to build Apache Atlas +# Valid values: 8, 11, 17 +ATLAS_BUILD_JAVA_VERSION=8 + +# Java version to use to run Atlas server +# Valid values: 8, 11, 17 +ATLAS_SERVER_JAVA_VERSION=8 + ATLAS_VERSION=3.0.0-SNAPSHOT +UBUNTU_VERSION=20.04 HADOOP_VERSION=3.3.0 HBASE_VERSION=2.3.3 KAFKA_VERSION=2.8.1 diff --git a/dev-support/atlas-docker/Dockerfile b/dev-support/atlas-docker/Dockerfile index 7bd79651f..12c1b6ea2 100644 --- a/dev-support/atlas-docker/Dockerfile +++ b/dev-support/atlas-docker/Dockerfile @@ -16,12 +16,15 @@ FROM ubuntu:18.04 +ARG TARGETARCH +ARG ATLAS_BASE_JAVA_VERSION + # Install Git, which is missing from the Ubuntu base images. RUN apt-get update && apt-get install -y git python # Install Java. RUN apt-get update && apt-get install -y openjdk-8-jdk -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH} # Install Maven. diff --git a/dev-support/atlas-docker/Dockerfile.atlas b/dev-support/atlas-docker/Dockerfile.atlas index 888779133..83550c5f1 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas +++ b/dev-support/atlas-docker/Dockerfile.atlas @@ -16,7 +16,12 @@ FROM atlas-base:latest +ARG ATLAS_SERVER_JAVA_VERSION ARG ATLAS_VERSION +ARG TARGETARCH + +ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_SERVER_JAVA_VERSION}-openjdk-${TARGETARCH} +RUN update-java-alternatives --set /usr/lib/jvm/java-1.${ATLAS_SERVER_JAVA_VERSION}.0-openjdk-${TARGETARCH} COPY ./scripts/atlas.sh ${ATLAS_SCRIPTS}/ COPY ./dist/apache-atlas-${ATLAS_VERSION}-server.tar.gz /home/atlas/dist/ diff --git a/dev-support/atlas-docker/Dockerfile.atlas-base b/dev-support/atlas-docker/Dockerfile.atlas-base index e68daa69d..4aa225c16 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas-base +++ b/dev-support/atlas-docker/Dockerfile.atlas-base @@ -14,21 +14,26 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ubuntu:20.04 +ARG UBUNTU_VERSION +FROM ubuntu:${UBUNTU_VERSION} +ARG TARGETARCH +ARG ATLAS_BASE_JAVA_VERSION # Install tzdata, Python, Java RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata \ -python python3 python3-pip openjdk-8-jdk bc iputils-ping ssh pdsh +python python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc iputils-ping ssh pdsh # Set environment variables -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-${ATLAS_BASE_JAVA_VERSION}-openjdk-${TARGETARCH} ENV ATLAS_DIST/home/atlas/dist ENV ATLAS_HOME/opt/atlas ENV ATLAS_SCRIPTS /home/atlas/scripts ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +RUN update-java-alternatives --set /usr/lib/jvm/java-1.${ATLAS_BASE_JAVA_VERSION}.0-openjdk-${TARGETARCH} + # setup groups, users, directories RUN groupadd atlas && \ diff --git a/dev-support/atlas-docker/Dockerfile.atlas-build b/dev-support/atlas-docker/Dockerfile.atlas-build index 4b381c1d9..42a2536ee 100644 --- a/dev-support/atlas-docker/Dockerfile.atlas-build +++ b/dev-support/atlas-docker/Dockerfile.atlas-build @@ -16,14 +16,20 @@ FROM atlas-base:latest +ARG ATLAS_BUILD_JAVA_VERSION +ARG TARGETARCH + # Install necessary packages to build Atlas RUN apt-get update && apt-get -y install git maven # Set environment variables +ENV JAVA_H
[atlas] branch branch-2.0 updated: ATLAS-4792: fix to address build failure in Pro with Apple M1 chip
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 9b1349078 ATLAS-4792: fix to address build failure in Pro with Apple M1 chip 9b1349078 is described below commit 9b13490785b112b0879ed32c88898aa21459 Author: Madhan Neethiraj AuthorDate: Thu Sep 7 20:35:40 2023 -0700 ATLAS-4792: fix to address build failure in Pro with Apple M1 chip (cherry picked from commit d67cd509e5c8f9779026bcf992549a1901c92229) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 85ad1fcac..4f0d973ef 100644 --- a/pom.xml +++ b/pom.xml @@ -1810,7 +1810,7 @@ com.github.eirslett frontend-maven-plugin -1.4 +1.12.1
[atlas] branch master updated: ATLAS-4792: fix to address build failure in Pro with Apple M1 chip
This is an automated email from the ASF dual-hosted git repository. madhan 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 d67cd509e ATLAS-4792: fix to address build failure in Pro with Apple M1 chip d67cd509e is described below commit d67cd509e5c8f9779026bcf992549a1901c92229 Author: Madhan Neethiraj AuthorDate: Thu Sep 7 20:35:40 2023 -0700 ATLAS-4792: fix to address build failure in Pro with Apple M1 chip --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc9def1b4..f76d0ea04 100644 --- a/pom.xml +++ b/pom.xml @@ -1820,7 +1820,7 @@ com.github.eirslett frontend-maven-plugin -1.4 +1.12.1
[atlas] branch branch-2.0 updated: ATLAS-4785: Fix incorrect references in AtlasClientV2 label methods
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 3fddba845 ATLAS-4785: Fix incorrect references in AtlasClientV2 label methods 3fddba845 is described below commit 3fddba845cfa5673a0a605663710c416638630dd Author: Zhen Wang AuthorDate: Fri Aug 18 12:00:31 2023 +0800 ATLAS-4785: Fix incorrect references in AtlasClientV2 label methods Signed-off-by: Madhan Neethiraj --- client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java b/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java index 4970baaa9..7c8e875a1 100644 --- a/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java +++ b/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java @@ -588,7 +588,7 @@ public class AtlasClientV2 extends AtlasBaseClient { public void addLabels(String typeName, Map uniqAttributes, Set labels) throws AtlasServiceException { MultivaluedMap queryParams = attributesToQueryParams(uniqAttributes); -callAPI(formatPathParameters(API_V2.SET_LABELS_BY_UNIQUE_ATTRIBUTE, typeName), (Class) null, labels, queryParams); +callAPI(formatPathParameters(API_V2.ADD_LABELS_BY_UNIQUE_ATTRIBUTE, typeName), (Class) null, labels, queryParams); } public void removeLabels(String entityGuid, Set labels) throws AtlasServiceException { @@ -608,7 +608,7 @@ public class AtlasClientV2 extends AtlasBaseClient { public void setLabels(String typeName, Map uniqAttributes, Set labels) throws AtlasServiceException { MultivaluedMap queryParams = attributesToQueryParams(uniqAttributes); -callAPI(formatPathParameters(API_V2.ADD_LABELS_BY_UNIQUE_ATTRIBUTE, typeName), (Class) null, labels, queryParams); +callAPI(formatPathParameters(API_V2.SET_LABELS_BY_UNIQUE_ATTRIBUTE, typeName), (Class) null, labels, queryParams); }
[atlas] 02/02: Merge branch 'master' of https://gitbox.apache.org/repos/asf/atlas
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit f6697507e9607b2e4bd9840b1349b474c2525f43 Merge: adf3006b9 530d60f0c Author: Madhan Neethiraj AuthorDate: Sun Sep 3 22:15:37 2023 -0700 Merge branch 'master' of https://gitbox.apache.org/repos/asf/atlas
[atlas] 01/02: ATLAS-4785: Fix incorrect references in AtlasClientV2 label methods
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit adf3006b9411a80fb19d5264c67721480f43e33c Merge: c3d654b69 949cebe70 Author: Zhen Wang AuthorDate: Sun Sep 3 22:13:29 2023 -0700 ATLAS-4785: Fix incorrect references in AtlasClientV2 label methods Merge pull request #237 from wForget/dev Signed-off-by: Madhan Neethiraj client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[atlas] branch master updated (530d60f0c -> f6697507e)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git from 530d60f0c Merge pull request #237 from wForget/dev new adf3006b9 ATLAS-4785: Fix incorrect references in AtlasClientV2 label methods new f6697507e Merge branch 'master' of https://gitbox.apache.org/repos/asf/atlas The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
[atlas] branch master updated: ATLAS-4785: Fix incorrect references in AtlasClientV2 label methods
This is an automated email from the ASF dual-hosted git repository. madhan 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 949cebe70 ATLAS-4785: Fix incorrect references in AtlasClientV2 label methods new 530d60f0c Merge pull request #237 from wForget/dev 949cebe70 is described below commit 949cebe70a1ef105b29e08456b87a25549ad2e2a Author: wforget <643348...@qq.com> AuthorDate: Fri Aug 18 12:00:31 2023 +0800 ATLAS-4785: Fix incorrect references in AtlasClientV2 label methods --- client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java b/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java index 4970baaa9..7c8e875a1 100644 --- a/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java +++ b/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java @@ -588,7 +588,7 @@ public class AtlasClientV2 extends AtlasBaseClient { public void addLabels(String typeName, Map uniqAttributes, Set labels) throws AtlasServiceException { MultivaluedMap queryParams = attributesToQueryParams(uniqAttributes); -callAPI(formatPathParameters(API_V2.SET_LABELS_BY_UNIQUE_ATTRIBUTE, typeName), (Class) null, labels, queryParams); +callAPI(formatPathParameters(API_V2.ADD_LABELS_BY_UNIQUE_ATTRIBUTE, typeName), (Class) null, labels, queryParams); } public void removeLabels(String entityGuid, Set labels) throws AtlasServiceException { @@ -608,7 +608,7 @@ public class AtlasClientV2 extends AtlasBaseClient { public void setLabels(String typeName, Map uniqAttributes, Set labels) throws AtlasServiceException { MultivaluedMap queryParams = attributesToQueryParams(uniqAttributes); -callAPI(formatPathParameters(API_V2.ADD_LABELS_BY_UNIQUE_ATTRIBUTE, typeName), (Class) null, labels, queryParams); +callAPI(formatPathParameters(API_V2.SET_LABELS_BY_UNIQUE_ATTRIBUTE, typeName), (Class) null, labels, queryParams); }
[atlas] branch branch-2.0 updated: ATLAS-4759: Python client - do not suppress HTTP 503 (SERVICE_UNAVAILABLE)
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new b1d945076 ATLAS-4759: Python client - do not suppress HTTP 503 (SERVICE_UNAVAILABLE) b1d945076 is described below commit b1d9450761de70adf9b3ecd35b5f62dc31d70489 Author: Maxim Martynov AuthorDate: Mon Jun 5 12:33:35 2023 -0700 ATLAS-4759: Python client - do not suppress HTTP 503 (SERVICE_UNAVAILABLE) Signed-off-by: Madhan Neethiraj (cherry picked from commit b7849aeb78856f2f8e205c5e784cee84409cbc72) --- intg/src/main/python/README.md | 2 +- intg/src/main/python/apache_atlas/client/base_client.py | 2 -- intg/src/main/python/setup.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/intg/src/main/python/README.md b/intg/src/main/python/README.md index 802bf8eb7..140e6c329 100644 --- a/intg/src/main/python/README.md +++ b/intg/src/main/python/README.md @@ -16,7 +16,7 @@ Verify if apache-atlas client is installed: Package Version - -apache-atlas 0.0.12 +apache-atlas 0.0.14 ``` ## Usage diff --git a/intg/src/main/python/apache_atlas/client/base_client.py b/intg/src/main/python/apache_atlas/client/base_client.py index 3f12929b0..777839701 100644 --- a/intg/src/main/python/apache_atlas/client/base_client.py +++ b/intg/src/main/python/apache_atlas/client/base_client.py @@ -100,6 +100,4 @@ class AtlasClient: elif response.status_code == HTTPStatus.SERVICE_UNAVAILABLE: log.error("Atlas Service unavailable. HTTP Status: %s", HTTPStatus.SERVICE_UNAVAILABLE) -return None - raise AtlasServiceException(api, response) diff --git a/intg/src/main/python/setup.py b/intg/src/main/python/setup.py index f0e16d0ca..daeaf6295 100644 --- a/intg/src/main/python/setup.py +++ b/intg/src/main/python/setup.py @@ -28,7 +28,7 @@ with open("README.md", "r") as fh: setup( name='apache-atlas', -version='0.0.12', +version='0.0.14', author="Apache Atlas", author_email='d...@atlas.apache.org', description="Apache Atlas Python Client",
[atlas] branch master updated: ATLAS-4759: Python client - do not suppress HTTP 503 (SERVICE_UNAVAILABLE)
This is an automated email from the ASF dual-hosted git repository. madhan 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 b7849aeb7 ATLAS-4759: Python client - do not suppress HTTP 503 (SERVICE_UNAVAILABLE) b7849aeb7 is described below commit b7849aeb78856f2f8e205c5e784cee84409cbc72 Author: Maxim Martynov AuthorDate: Mon Jun 5 12:33:35 2023 -0700 ATLAS-4759: Python client - do not suppress HTTP 503 (SERVICE_UNAVAILABLE) Signed-off-by: Madhan Neethiraj --- intg/src/main/python/README.md | 2 +- intg/src/main/python/apache_atlas/client/base_client.py | 2 -- intg/src/main/python/setup.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/intg/src/main/python/README.md b/intg/src/main/python/README.md index 802bf8eb7..140e6c329 100644 --- a/intg/src/main/python/README.md +++ b/intg/src/main/python/README.md @@ -16,7 +16,7 @@ Verify if apache-atlas client is installed: Package Version - -apache-atlas 0.0.12 +apache-atlas 0.0.14 ``` ## Usage diff --git a/intg/src/main/python/apache_atlas/client/base_client.py b/intg/src/main/python/apache_atlas/client/base_client.py index 3f12929b0..777839701 100644 --- a/intg/src/main/python/apache_atlas/client/base_client.py +++ b/intg/src/main/python/apache_atlas/client/base_client.py @@ -100,6 +100,4 @@ class AtlasClient: elif response.status_code == HTTPStatus.SERVICE_UNAVAILABLE: log.error("Atlas Service unavailable. HTTP Status: %s", HTTPStatus.SERVICE_UNAVAILABLE) -return None - raise AtlasServiceException(api, response) diff --git a/intg/src/main/python/setup.py b/intg/src/main/python/setup.py index f0e16d0ca..daeaf6295 100644 --- a/intg/src/main/python/setup.py +++ b/intg/src/main/python/setup.py @@ -28,7 +28,7 @@ with open("README.md", "r") as fh: setup( name='apache-atlas', -version='0.0.12', +version='0.0.14', author="Apache Atlas", author_email='d...@atlas.apache.org', description="Apache Atlas Python Client",
[atlas] branch branch-2.0 updated: ATLAS-4658: Python client - simply if clauses in AtlasClient.call_api
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 8df8b41a5 ATLAS-4658: Python client - simply if clauses in AtlasClient.call_api 8df8b41a5 is described below commit 8df8b41a5b9ce7410efe388f3184d109201080d4 Author: Maxim Martynov AuthorDate: Mon Jun 5 12:07:51 2023 -0700 ATLAS-4658: Python client - simply if clauses in AtlasClient.call_api Signed-off-by: Madhan Neethiraj (cherry picked from commit ad24235f492066378842cb0c1fbf9bde43da0391) --- .../main/python/apache_atlas/client/base_client.py | 61 +- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/intg/src/main/python/apache_atlas/client/base_client.py b/intg/src/main/python/apache_atlas/client/base_client.py index b2c181ae7..3f12929b0 100644 --- a/intg/src/main/python/apache_atlas/client/base_client.py +++ b/intg/src/main/python/apache_atlas/client/base_client.py @@ -18,8 +18,6 @@ import copy import json import logging - -from requests import Session from urllib.parse import urljoin from apache_atlas.client.admin import AdminClient @@ -30,9 +28,8 @@ from apache_atlas.client.lineage import LineageClient from apache_atlas.client.relationship import RelationshipClient from apache_atlas.client.typedef import TypeDefClient from apache_atlas.exceptions import AtlasServiceException -from apache_atlas.utils import HTTPMethod -from apache_atlas.utils import HTTPStatus -from apache_atlas.utils import type_coerce +from apache_atlas.utils import HTTPStatus, type_coerce +from requests import Session log = logging.getLogger('apache_atlas') @@ -68,51 +65,41 @@ class AtlasClient: if request_obj is not None: params['data'] = json.dumps(request_obj) -if log.isEnabledFor(logging.DEBUG): -log.debug("--") -log.debug("Call : %s %s", api.method, path) -log.debug("Content-type : %s", api.consumes) -log.debug("Accept : %s", api.produces) +log.debug("--") +log.debug("Call : %s %s", api.method, path) +log.debug("Content-type : %s", api.consumes) +log.debug("Accept : %s", api.produces) -response = None - -if api.method == HTTPMethod.GET: -response = self.session.get(path, **params) -elif api.method == HTTPMethod.POST: -response = self.session.post(path, **params) -elif api.method == HTTPMethod.PUT: -response = self.session.put(path, **params) -elif api.method == HTTPMethod.DELETE: -response = self.session.delete(path, **params) - -if response is not None: -log.debug("HTTP Status: %s", response.status_code) +response = self.session.request(api.method.value, path, **params) if response is None: return None -elif response.status_code == api.expected_status: + +log.debug("HTTP Status: %s", response.status_code) + +if response.status_code == api.expected_status: if response_type is None: return None +if response.content is None: +return None + try: -if response.content is not None: -if log.isEnabledFor(logging.DEBUG): -log.debug("<== __call_api(%s,%s,%s), result = %s", vars(api), params, request_obj, response) +log.debug("<== __call_api(%s,%s,%s), result = %s", vars(api), params, request_obj, response) -log.debug(response.json()) -if response_type == str: -return json.dumps(response.json()) +log.debug(response.json()) -return type_coerce(response.json(), response_type) -else: -return None +if response_type == str: +return json.dumps(response.json()) + +return type_coerce(response.json(), response_type) except Exception as e: -log.exception("Exception occurred while parsing response with msg: %s", e) +log.exception("Exception occurred while parsing response") -raise AtlasServiceException(api, response) +raise AtlasServiceException(api, response) from e elif response.status_code == HTTPStatus.SERVICE_UNAVAILABLE: log.error("Atlas Service unavailable. HTTP Status: %s", HTTPStatus.SERVICE_UNAVAILABLE) return None -else: -raise AtlasServiceException(api, response) + +raise AtlasServiceException(api, response)
[atlas] branch master updated: ATLAS-4658: Python client - simply if clauses in AtlasClient.call_api
This is an automated email from the ASF dual-hosted git repository. madhan 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 ad24235f4 ATLAS-4658: Python client - simply if clauses in AtlasClient.call_api ad24235f4 is described below commit ad24235f492066378842cb0c1fbf9bde43da0391 Author: Maxim Martynov AuthorDate: Mon Jun 5 12:07:51 2023 -0700 ATLAS-4658: Python client - simply if clauses in AtlasClient.call_api Signed-off-by: Madhan Neethiraj --- .../main/python/apache_atlas/client/base_client.py | 61 +- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/intg/src/main/python/apache_atlas/client/base_client.py b/intg/src/main/python/apache_atlas/client/base_client.py index b2c181ae7..3f12929b0 100644 --- a/intg/src/main/python/apache_atlas/client/base_client.py +++ b/intg/src/main/python/apache_atlas/client/base_client.py @@ -18,8 +18,6 @@ import copy import json import logging - -from requests import Session from urllib.parse import urljoin from apache_atlas.client.admin import AdminClient @@ -30,9 +28,8 @@ from apache_atlas.client.lineage import LineageClient from apache_atlas.client.relationship import RelationshipClient from apache_atlas.client.typedef import TypeDefClient from apache_atlas.exceptions import AtlasServiceException -from apache_atlas.utils import HTTPMethod -from apache_atlas.utils import HTTPStatus -from apache_atlas.utils import type_coerce +from apache_atlas.utils import HTTPStatus, type_coerce +from requests import Session log = logging.getLogger('apache_atlas') @@ -68,51 +65,41 @@ class AtlasClient: if request_obj is not None: params['data'] = json.dumps(request_obj) -if log.isEnabledFor(logging.DEBUG): -log.debug("--") -log.debug("Call : %s %s", api.method, path) -log.debug("Content-type : %s", api.consumes) -log.debug("Accept : %s", api.produces) +log.debug("--") +log.debug("Call : %s %s", api.method, path) +log.debug("Content-type : %s", api.consumes) +log.debug("Accept : %s", api.produces) -response = None - -if api.method == HTTPMethod.GET: -response = self.session.get(path, **params) -elif api.method == HTTPMethod.POST: -response = self.session.post(path, **params) -elif api.method == HTTPMethod.PUT: -response = self.session.put(path, **params) -elif api.method == HTTPMethod.DELETE: -response = self.session.delete(path, **params) - -if response is not None: -log.debug("HTTP Status: %s", response.status_code) +response = self.session.request(api.method.value, path, **params) if response is None: return None -elif response.status_code == api.expected_status: + +log.debug("HTTP Status: %s", response.status_code) + +if response.status_code == api.expected_status: if response_type is None: return None +if response.content is None: +return None + try: -if response.content is not None: -if log.isEnabledFor(logging.DEBUG): -log.debug("<== __call_api(%s,%s,%s), result = %s", vars(api), params, request_obj, response) +log.debug("<== __call_api(%s,%s,%s), result = %s", vars(api), params, request_obj, response) -log.debug(response.json()) -if response_type == str: -return json.dumps(response.json()) +log.debug(response.json()) -return type_coerce(response.json(), response_type) -else: -return None +if response_type == str: +return json.dumps(response.json()) + +return type_coerce(response.json(), response_type) except Exception as e: -log.exception("Exception occurred while parsing response with msg: %s", e) +log.exception("Exception occurred while parsing response") -raise AtlasServiceException(api, response) +raise AtlasServiceException(api, response) from e elif response.status_code == HTTPStatus.SERVICE_UNAVAILABLE: log.error("Atlas Service unavailable. HTTP Status: %s", HTTPStatus.SERVICE_UNAVAILABLE) return None -else: -raise AtlasServiceException(api, response) + +raise AtlasServiceException(api, response)
[atlas] branch branch-2.0 updated: ATLAS-4744: updated version of JanusGraph to 0.6.3 and TinkerPop to 3.5.5
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new a27af6313 ATLAS-4744: updated version of JanusGraph to 0.6.3 and TinkerPop to 3.5.5 a27af6313 is described below commit a27af6313faf7598046d2fccf3d8d985a3c017d7 Author: Madhan Neethiraj AuthorDate: Mon Apr 10 13:55:41 2023 -0700 ATLAS-4744: updated version of JanusGraph to 0.6.3 and TinkerPop to 3.5.5 (cherry picked from commit 19dc92d604114095acab6e508ab967a93d0b533f) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5a77797c8..d4df84fc0 100644 --- a/pom.xml +++ b/pom.xml @@ -740,7 +740,7 @@ 4.4.13 2.11.3 2.11.3 -0.6.1 +0.6.3 0.5.3 1 3.1.0 @@ -796,7 +796,7 @@ 2C 3.0.0-M5 7.0.0 -3.5.4 +3.5.5 5.0.3 3.5.7
[atlas] branch master updated: ATLAS-4744: updated version of JanusGraph to 0.6.3 and TinkerPop to 3.5.5
This is an automated email from the ASF dual-hosted git repository. madhan 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 19dc92d60 ATLAS-4744: updated version of JanusGraph to 0.6.3 and TinkerPop to 3.5.5 19dc92d60 is described below commit 19dc92d604114095acab6e508ab967a93d0b533f Author: Madhan Neethiraj AuthorDate: Mon Apr 10 13:55:41 2023 -0700 ATLAS-4744: updated version of JanusGraph to 0.6.3 and TinkerPop to 3.5.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7077ddb23..4429e08b3 100644 --- a/pom.xml +++ b/pom.xml @@ -750,7 +750,7 @@ 4.4.13 2.11.3 2.11.3 -0.6.1 +0.6.3 0.5.3 1 3.1.0 @@ -806,7 +806,7 @@ 2C 3.0.0-M5 7.0.0 -3.5.4 +3.5.5 5.0.3 3.5.7
[atlas] branch branch-2.0 updated: ATLAS-4740: enable building Atlas using JDK versions higher than 8
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new d78c81ea6 ATLAS-4740: enable building Atlas using JDK versions higher than 8 d78c81ea6 is described below commit d78c81ea6ccf25159fbabded1ed45e0b3320b92c Author: Madhan Neethiraj AuthorDate: Thu Mar 30 14:59:00 2023 -0700 ATLAS-4740: enable building Atlas using JDK versions higher than 8 (cherry picked from commit 7ab30522583167bb663b3ee7032a7b71a28025b5) --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index baa5b44b4..5a77797c8 100644 --- a/pom.xml +++ b/pom.xml @@ -744,6 +744,9 @@ 0.5.3 1 3.1.0 +1.8 +1.8 +1.8 1.19.4 1.19 1.5.2
[atlas] branch master updated: ATLAS-4740: enable building Atlas using JDK versions higher than 8
This is an automated email from the ASF dual-hosted git repository. madhan 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 7ab305225 ATLAS-4740: enable building Atlas using JDK versions higher than 8 7ab305225 is described below commit 7ab30522583167bb663b3ee7032a7b71a28025b5 Author: Madhan Neethiraj AuthorDate: Thu Mar 30 14:59:00 2023 -0700 ATLAS-4740: enable building Atlas using JDK versions higher than 8 --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 333edaf78..7077ddb23 100644 --- a/pom.xml +++ b/pom.xml @@ -754,6 +754,9 @@ 0.5.3 1 3.1.0 +1.8 +1.8 +1.8 1.19.4 1.19 1.5.2
[atlas] branch branch-2.0 updated: ATLAS-4741: updated Storm version to 2.4.0
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 211aa719e ATLAS-4741: updated Storm version to 2.4.0 211aa719e is described below commit 211aa719e703c83327610d0c2efad1b9372f80e1 Author: Madhan Neethiraj AuthorDate: Thu Mar 30 16:51:50 2023 -0700 ATLAS-4741: updated Storm version to 2.4.0 (cherry picked from commit 92861ba9f3a12c7df364a8ae4c5ef378e9171424) --- addons/storm-bridge-shim/pom.xml | 4 addons/storm-bridge/pom.xml | 4 pom.xml | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/storm-bridge-shim/pom.xml b/addons/storm-bridge-shim/pom.xml index 571a1b252..8da3ae6a5 100755 --- a/addons/storm-bridge-shim/pom.xml +++ b/addons/storm-bridge-shim/pom.xml @@ -44,6 +44,10 @@ ${storm.version} jar + +org.apache.storm +storm-clojure + org.slf4j slf4j-log4j12 diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml index f9cd63cef..f0e57821f 100644 --- a/addons/storm-bridge/pom.xml +++ b/addons/storm-bridge/pom.xml @@ -96,6 +96,10 @@ storm-core ${storm.version} + +org.apache.storm +storm-clojure + org.slf4j log4j-over-slf4j diff --git a/pom.xml b/pom.xml index fa71ca227..baa5b44b4 100644 --- a/pom.xml +++ b/pom.xml @@ -789,7 +789,7 @@ 5.7.5 5.3.21 1.4.6.2.3.99.0-195 -2.3.0 +2.4.0 2C 3.0.0-M5 7.0.0
[atlas] branch master updated: ATLAS-4741: updated Storm version to 2.4.0
This is an automated email from the ASF dual-hosted git repository. madhan 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 92861ba9f ATLAS-4741: updated Storm version to 2.4.0 92861ba9f is described below commit 92861ba9f3a12c7df364a8ae4c5ef378e9171424 Author: Madhan Neethiraj AuthorDate: Thu Mar 30 16:51:50 2023 -0700 ATLAS-4741: updated Storm version to 2.4.0 --- addons/storm-bridge-shim/pom.xml | 4 addons/storm-bridge/pom.xml | 4 pom.xml | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/storm-bridge-shim/pom.xml b/addons/storm-bridge-shim/pom.xml index f4e75927f..cb12766fe 100755 --- a/addons/storm-bridge-shim/pom.xml +++ b/addons/storm-bridge-shim/pom.xml @@ -44,6 +44,10 @@ ${storm.version} jar + +org.apache.storm +storm-clojure + org.slf4j slf4j-log4j12 diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml index d6cec279b..00dfe33a1 100644 --- a/addons/storm-bridge/pom.xml +++ b/addons/storm-bridge/pom.xml @@ -96,6 +96,10 @@ storm-core ${storm.version} + +org.apache.storm +storm-clojure + org.slf4j log4j-over-slf4j diff --git a/pom.xml b/pom.xml index 15aa57bc4..333edaf78 100644 --- a/pom.xml +++ b/pom.xml @@ -799,7 +799,7 @@ 5.7.5 5.3.21 1.4.6.2.3.99.0-195 -2.3.0 +2.4.0 2C 3.0.0-M5 7.0.0
[atlas] branch branch-2.0 updated: Changing email and organization for Barbara Stortz
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new e08a6a193 Changing email and organization for Barbara Stortz e08a6a193 is described below commit e08a6a19356300621b00381bbb067896da0c3225 Author: Barbara AuthorDate: Tue Mar 28 13:38:22 2023 -0700 Changing email and organization for Barbara Stortz (cherry picked from commit 89bfa02062b3f7391f345b00ccd7dcf5f29ab014) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 12ba0e69f..fa71ca227 100644 --- a/pom.xml +++ b/pom.xml @@ -164,14 +164,14 @@ bstortz Barbara Stortz -bsto...@sap.com +barbara.sto...@gmail.com America/Los_Angeles committer PMC -SAP Inc. - +Microsoft + chyzer
[atlas] branch master updated: Changing email and organization for Barbara Stortz
This is an automated email from the ASF dual-hosted git repository. madhan 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 89bfa0206 Changing email and organization for Barbara Stortz new b9ba02ef4 Merge pull request #228 from Bastortz2/patch-1 89bfa0206 is described below commit 89bfa02062b3f7391f345b00ccd7dcf5f29ab014 Author: Barbara AuthorDate: Tue Mar 28 13:38:22 2023 -0700 Changing email and organization for Barbara Stortz --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 534e646eb..15aa57bc4 100644 --- a/pom.xml +++ b/pom.xml @@ -164,14 +164,14 @@ bstortz Barbara Stortz -bsto...@sap.com +barbara.sto...@gmail.com America/Los_Angeles committer PMC -SAP Inc. - +Microsoft + chyzer
[atlas] branch branch-2.0 updated: ATLAS-4657: Python client updated to not set root logging settings
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 436753723 ATLAS-4657: Python client updated to not set root logging settings 436753723 is described below commit 436753723e9419ed0c5d45db1908333def89b707 Author: Maxim Martynov AuthorDate: Mon Jan 17 23:02:22 2022 +0300 ATLAS-4657: Python client updated to not set root logging settings Signed-off-by: Madhan Neethiraj (cherry picked from commit 98900e3492c19d59c5cecbf8a440ae9f01578b31) --- intg/src/main/python/apache_atlas/__init__.py | 22 -- .../main/python/apache_atlas/client/base_client.py | 26 ++ 2 files changed, 12 insertions(+), 36 deletions(-) diff --git a/intg/src/main/python/apache_atlas/__init__.py b/intg/src/main/python/apache_atlas/__init__.py index 0c9069a63..d9984f11e 100644 --- a/intg/src/main/python/apache_atlas/__init__.py +++ b/intg/src/main/python/apache_atlas/__init__.py @@ -15,25 +15,3 @@ # 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. -import logging -from logging.config import dictConfig - -logging_config = dict( -version=1, -formatters={ -'f': {'format': '%(asctime)s %(name)-12s %(levelname)-8s %(message)s'} -}, -handlers={ -'h': {'class': 'logging.StreamHandler', - 'formatter': 'f', - 'level': logging.DEBUG} -}, -root={ -'handlers': ['h'], -'level': logging.INFO, -}, -) - -dictConfig(logging_config) - -logger = logging.getLogger() diff --git a/intg/src/main/python/apache_atlas/client/base_client.py b/intg/src/main/python/apache_atlas/client/base_client.py index bd52660e3..b2c181ae7 100644 --- a/intg/src/main/python/apache_atlas/client/base_client.py +++ b/intg/src/main/python/apache_atlas/client/base_client.py @@ -34,7 +34,7 @@ from apache_atlas.utils import HTTPMethod from apache_atlas.utils import HTTPStatus from apache_atlas.utils import type_coerce -LOG = logging.getLogger('apache_atlas') +log = logging.getLogger('apache_atlas') class AtlasClient: @@ -68,11 +68,11 @@ class AtlasClient: if request_obj is not None: params['data'] = json.dumps(request_obj) -if LOG.isEnabledFor(logging.DEBUG): -LOG.debug("--") -LOG.debug("Call : %s %s", api.method, path) -LOG.debug("Content-type : %s", api.consumes) -LOG.debug("Accept : %s", api.produces) +if log.isEnabledFor(logging.DEBUG): +log.debug("--") +log.debug("Call : %s %s", api.method, path) +log.debug("Content-type : %s", api.consumes) +log.debug("Accept : %s", api.produces) response = None @@ -86,7 +86,7 @@ class AtlasClient: response = self.session.delete(path, **params) if response is not None: -LOG.debug("HTTP Status: %s", response.status_code) +log.debug("HTTP Status: %s", response.status_code) if response is None: return None @@ -96,10 +96,10 @@ class AtlasClient: try: if response.content is not None: -if LOG.isEnabledFor(logging.DEBUG): -LOG.debug("<== __call_api(%s,%s,%s), result = %s", vars(api), params, request_obj, response) +if log.isEnabledFor(logging.DEBUG): +log.debug("<== __call_api(%s,%s,%s), result = %s", vars(api), params, request_obj, response) -LOG.debug(response.json()) +log.debug(response.json()) if response_type == str: return json.dumps(response.json()) @@ -107,13 +107,11 @@ class AtlasClient: else: return None except Exception as e: -print(e) - -LOG.exception("Exception occurred while parsing response with msg: %s", e) +log.exception("Exception occurred while parsing response with msg: %s", e) raise AtlasServiceException(api, response) elif response.status_code == HTTPStatus.SERVICE_UNAVAILABLE: -LOG.error("Atlas Service unavailable. HTTP Status: %s", HTTPStatus.SERVICE_UNAVAILABLE) +log.error("Atlas Service unavailable. HTTP Status: %s", HTTPStatus.SERVICE_UNAVAILABLE) return None else:
[atlas] branch master updated: ATLAS-4657: Python client updated to not set root logging settings
This is an automated email from the ASF dual-hosted git repository. madhan 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 98900e349 ATLAS-4657: Python client updated to not set root logging settings 98900e349 is described below commit 98900e3492c19d59c5cecbf8a440ae9f01578b31 Author: Maxim Martynov AuthorDate: Mon Jan 17 23:02:22 2022 +0300 ATLAS-4657: Python client updated to not set root logging settings Signed-off-by: Madhan Neethiraj --- intg/src/main/python/apache_atlas/__init__.py | 22 -- .../main/python/apache_atlas/client/base_client.py | 26 ++ 2 files changed, 12 insertions(+), 36 deletions(-) diff --git a/intg/src/main/python/apache_atlas/__init__.py b/intg/src/main/python/apache_atlas/__init__.py index 0c9069a63..d9984f11e 100644 --- a/intg/src/main/python/apache_atlas/__init__.py +++ b/intg/src/main/python/apache_atlas/__init__.py @@ -15,25 +15,3 @@ # 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. -import logging -from logging.config import dictConfig - -logging_config = dict( -version=1, -formatters={ -'f': {'format': '%(asctime)s %(name)-12s %(levelname)-8s %(message)s'} -}, -handlers={ -'h': {'class': 'logging.StreamHandler', - 'formatter': 'f', - 'level': logging.DEBUG} -}, -root={ -'handlers': ['h'], -'level': logging.INFO, -}, -) - -dictConfig(logging_config) - -logger = logging.getLogger() diff --git a/intg/src/main/python/apache_atlas/client/base_client.py b/intg/src/main/python/apache_atlas/client/base_client.py index bd52660e3..b2c181ae7 100644 --- a/intg/src/main/python/apache_atlas/client/base_client.py +++ b/intg/src/main/python/apache_atlas/client/base_client.py @@ -34,7 +34,7 @@ from apache_atlas.utils import HTTPMethod from apache_atlas.utils import HTTPStatus from apache_atlas.utils import type_coerce -LOG = logging.getLogger('apache_atlas') +log = logging.getLogger('apache_atlas') class AtlasClient: @@ -68,11 +68,11 @@ class AtlasClient: if request_obj is not None: params['data'] = json.dumps(request_obj) -if LOG.isEnabledFor(logging.DEBUG): -LOG.debug("--") -LOG.debug("Call : %s %s", api.method, path) -LOG.debug("Content-type : %s", api.consumes) -LOG.debug("Accept : %s", api.produces) +if log.isEnabledFor(logging.DEBUG): +log.debug("--") +log.debug("Call : %s %s", api.method, path) +log.debug("Content-type : %s", api.consumes) +log.debug("Accept : %s", api.produces) response = None @@ -86,7 +86,7 @@ class AtlasClient: response = self.session.delete(path, **params) if response is not None: -LOG.debug("HTTP Status: %s", response.status_code) +log.debug("HTTP Status: %s", response.status_code) if response is None: return None @@ -96,10 +96,10 @@ class AtlasClient: try: if response.content is not None: -if LOG.isEnabledFor(logging.DEBUG): -LOG.debug("<== __call_api(%s,%s,%s), result = %s", vars(api), params, request_obj, response) +if log.isEnabledFor(logging.DEBUG): +log.debug("<== __call_api(%s,%s,%s), result = %s", vars(api), params, request_obj, response) -LOG.debug(response.json()) +log.debug(response.json()) if response_type == str: return json.dumps(response.json()) @@ -107,13 +107,11 @@ class AtlasClient: else: return None except Exception as e: -print(e) - -LOG.exception("Exception occurred while parsing response with msg: %s", e) +log.exception("Exception occurred while parsing response with msg: %s", e) raise AtlasServiceException(api, response) elif response.status_code == HTTPStatus.SERVICE_UNAVAILABLE: -LOG.error("Atlas Service unavailable. HTTP Status: %s", HTTPStatus.SERVICE_UNAVAILABLE) +log.error("Atlas Service unavailable. HTTP Status: %s", HTTPStatus.SERVICE_UNAVAILABLE) return None else:
[atlas] branch branch-2.0 updated: ATLAS-3756: fixed build error due to restlet library dependency resolution
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 9b527dd49 ATLAS-3756: fixed build error due to restlet library dependency resolution 9b527dd49 is described below commit 9b527dd4974a317383ef81cf9de7d140ea064480 Author: Henry Saputra AuthorDate: Sun Apr 26 15:20:29 2020 -0700 ATLAS-3756: fixed build error due to restlet library dependency resolution Signed-off-by: Madhan Neethiraj (cherry picked from commit d1781a7c38e2da24cb023588dc91ef88b5cbb067) --- pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 8c40936cd..144967cda 100644 --- a/pom.xml +++ b/pom.xml @@ -886,6 +886,11 @@ Typesafe Repository https://repo.typesafe.com/typesafe/releases/ + +maven-restlet +Public online Restlet repository +https://maven.restlet.talend.com/ +
[atlas] branch master updated: ATLAS-3756: fixed build error due to restlet library dependency resolution
This is an automated email from the ASF dual-hosted git repository. madhan 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 d1781a7c3 ATLAS-3756: fixed build error due to restlet library dependency resolution d1781a7c3 is described below commit d1781a7c38e2da24cb023588dc91ef88b5cbb067 Author: Henry Saputra AuthorDate: Sun Apr 26 15:20:29 2020 -0700 ATLAS-3756: fixed build error due to restlet library dependency resolution Signed-off-by: Madhan Neethiraj --- pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 92570ee6f..44e827ac1 100644 --- a/pom.xml +++ b/pom.xml @@ -896,6 +896,11 @@ Typesafe Repository https://repo.typesafe.com/typesafe/releases/ + +maven-restlet +Public online Restlet repository +https://maven.restlet.talend.com/ +
[atlas] branch branch-2.0 updated: ATLAS-4703: updated docker .env to build using tag release-2.3.0
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 5212c1174 ATLAS-4703: updated docker .env to build using tag release-2.3.0 5212c1174 is described below commit 5212c117489edac3415dac3ffb05184a89a28659 Author: Madhan Neethiraj AuthorDate: Wed Dec 7 01:28:14 2022 -0800 ATLAS-4703: updated docker .env to build using tag release-2.3.0 --- dev-support/atlas-docker/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/atlas-docker/.env b/dev-support/atlas-docker/.env index 3582699e7..623f0477c 100644 --- a/dev-support/atlas-docker/.env +++ b/dev-support/atlas-docker/.env @@ -1,7 +1,7 @@ BUILD_HOST_SRC=true SKIPTESTS=true GIT_URL=https://github.com/apache/atlas.git -BRANCH=branch-2.0 +BRANCH=release-2.3.0 PROFILE=dist,external-hbase-solr ATLAS_VERSION=2.3.0
[atlas] branch branch-2.0 updated: ATLAS-4702: updated version in pom.xml from 2.3.0 to 2.4.0-SNAPSHOT
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 331932f55 ATLAS-4702: updated version in pom.xml from 2.3.0 to 2.4.0-SNAPSHOT 331932f55 is described below commit 331932f55b7c24dcf9ac33bc9a37c1b07aa7cd2d Author: Madhan Neethiraj AuthorDate: Wed Dec 7 01:13:15 2022 -0800 ATLAS-4702: updated version in pom.xml from 2.3.0 to 2.4.0-SNAPSHOT --- addons/falcon-bridge-shim/pom.xml| 2 +- addons/falcon-bridge/pom.xml | 2 +- addons/hbase-bridge-shim/pom.xml | 2 +- addons/hbase-bridge/pom.xml | 2 +- addons/hbase-testing-util/pom.xml| 2 +- addons/hdfs-model/pom.xml| 2 +- addons/hive-bridge-shim/pom.xml | 2 +- addons/hive-bridge/pom.xml | 2 +- addons/impala-bridge-shim/pom.xml| 2 +- addons/impala-bridge/pom.xml | 2 +- addons/impala-hook-api/pom.xml | 2 +- addons/kafka-bridge/pom.xml | 2 +- addons/sqoop-bridge-shim/pom.xml | 2 +- addons/sqoop-bridge/pom.xml | 2 +- addons/storm-bridge-shim/pom.xml | 2 +- addons/storm-bridge/pom.xml | 2 +- atlas-examples/pom.xml | 2 +- atlas-examples/sample-app/pom.xml| 2 +- authorization/pom.xml| 2 +- build-tools/pom.xml | 2 +- client/client-v1/pom.xml | 2 +- client/client-v2/pom.xml | 2 +- client/common/pom.xml| 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- dashboardv2/pom.xml | 2 +- dashboardv3/pom.xml | 2 +- distro/pom.xml | 2 +- docs/pom.xml | 2 +- graphdb/api/pom.xml | 2 +- graphdb/common/pom.xml | 2 +- graphdb/graphdb-impls/pom.xml| 2 +- graphdb/janus-hbase2/pom.xml | 2 +- graphdb/janus/pom.xml| 2 +- graphdb/pom.xml | 2 +- intg/pom.xml | 2 +- notification/pom.xml | 2 +- plugin-classloader/pom.xml | 2 +- pom.xml | 2 +- repository/pom.xml | 2 +- server-api/pom.xml | 2 +- test-tools/pom.xml | 2 +- tools/atlas-index-repair/pom.xml | 2 +- tools/classification-updater/pom.xml | 2 +- webapp/pom.xml | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) diff --git a/addons/falcon-bridge-shim/pom.xml b/addons/falcon-bridge-shim/pom.xml index 490d812a0..261165307 100755 --- a/addons/falcon-bridge-shim/pom.xml +++ b/addons/falcon-bridge-shim/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0 +2.4.0-SNAPSHOT ../../ falcon-bridge-shim diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml index 7072ab06f..81b0db332 100644 --- a/addons/falcon-bridge/pom.xml +++ b/addons/falcon-bridge/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0 +2.4.0-SNAPSHOT ../../ falcon-bridge diff --git a/addons/hbase-bridge-shim/pom.xml b/addons/hbase-bridge-shim/pom.xml index a33f78463..d9d47af63 100644 --- a/addons/hbase-bridge-shim/pom.xml +++ b/addons/hbase-bridge-shim/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0 +2.4.0-SNAPSHOT ../../ hbase-bridge-shim diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index ee4ed0471..aac1bea57 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0 +2.4.0-SNAPSHOT ../../ hbase-bridge diff --git a/addons/hbase-testing-util/pom.xml b/addons/hbase-testing-util/pom.xml index 560e4f27e..e5d8574b3 100644 --- a/addons/hbase-testing-util/pom.xml +++ b/addons/hbase-testing-util/pom.xml @@ -23,7 +23,7 @@ apache-atlas org.apache.atlas -2.3.0 +2.4.0-SNAPSHOT ../../ hbase-testing-util diff --git a/addons/hdfs-model/pom.xml b/addons/hdfs-model/pom.xml index 43362fadf..f0107eca4 100644 --- a/addons/hdfs-model/pom.xml +++ b/addons/hdfs-model/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0 +2.4.0-SNAPSHOT ../../ hdfs-model diff --git a/addons/hive-bridge-shim/pom.xml b/addons/hive-bridge-shim/pom.xml index 6c2c04aac..5cb0ad234 100755 --- a/addons/hive-bridge-shim/pom.xml +++ b/addons/hive-bridge-shim/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0 +2.4.0-SNAPSHOT ../../ hive
[atlas] branch master updated: ATLAS-4700: updated documentation for 2.3.0 release
This is an automated email from the ASF dual-hosted git repository. madhan 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 51a3dee7e ATLAS-4700: updated documentation for 2.3.0 release 51a3dee7e is described below commit 51a3dee7eaf039a5fa1324212efcc25be1761df0 Author: Madhan Neethiraj AuthorDate: Tue Dec 6 23:47:17 2022 -0800 ATLAS-4700: updated documentation for 2.3.0 release (cherry picked from commit e3da9e12a99c02d2e604ff425ce56445f40e1c9d) --- docs/docz-lib/config/menu.js | 2 +- docs/docz-lib/config/versions.js | 1 + docs/src/documents/Downloads/Downloads.md| 25 + docs/src/documents/Overview.md | 2 +- docs/src/documents/Whats-New/WhatsNew-2.3.md | 26 ++ 5 files changed, 50 insertions(+), 6 deletions(-) diff --git a/docs/docz-lib/config/menu.js b/docs/docz-lib/config/menu.js index 37acf46d4..54895c2cc 100644 --- a/docs/docz-lib/config/menu.js +++ b/docs/docz-lib/config/menu.js @@ -87,7 +87,7 @@ export default [ "Download", { name: "Whats New", -menu: ["WhatsNew-2.2", "WhatsNew-2.1", "WhatsNew-2.0", "WhatsNew-1.0"] +menu: ["WhatsNew-2.3", "WhatsNew-2.2", "WhatsNew-2.1", "WhatsNew-2.0", "WhatsNew-1.0"] }, "Migration" ] diff --git a/docs/docz-lib/config/versions.js b/docs/docz-lib/config/versions.js index 3ef55f681..9ccbee419 100644 --- a/docs/docz-lib/config/versions.js +++ b/docs/docz-lib/config/versions.js @@ -1,4 +1,5 @@ export default [ + { id: 1, href: "/2.3.0/index.html", title: "2.3.0", label: "2.3.0" }, { id: 2, href: "/2.2.0/index.html", title: "2.2.0", label: "2.2.0" }, { id: 3, href: "/2.1.0/index.html", title: "2.1.0", label: "2.1.0" }, { id: 4, href: "/2.0.0/index.html", title: "2.0.0", label: "2.0.0" }, diff --git a/docs/src/documents/Downloads/Downloads.md b/docs/src/documents/Downloads/Downloads.md index e486a1d0b..e98ef35b9 100644 --- a/docs/src/documents/Downloads/Downloads.md +++ b/docs/src/documents/Downloads/Downloads.md @@ -18,10 +18,11 @@ artifacts can be found in our published [KEYS file](https://www.apache.org/dist/ | **Version** | **Release Date** | **Tarball** | **GPG** | **Hash** | | : - : | : - : | : - : | : - : |: - :| -| 2.2.0 | 2021-08-17 | [source](https://www.apache.org/dyn/closer.cgi/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz) | [signature](https://www.apache.org/dist/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz.asc) | [SHA512](https://www.apache.org/dist/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz.sha512) | -| 2.1.0 | 2020-07-15 | [source](https://www.apache.org/dyn/closer.cgi/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz) | [signature](https://www.apache.org/dist/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz.asc) | [SHA512](https://www.apache.org/dist/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz.sha512) | -| 0.8.4 | 2019-06-21 | [source](https://www.apache.org/dyn/closer.cgi/atlas/0.8.4/apache-atlas-0.8.4-sources.tar.gz) | [signature](https://www.apache.org/dist/atlas/0.8.4/apache-atlas-0.8.4-sources.tar.gz.asc) | [SHA512](https://www.apache.org/dist/atlas/0.8.4/apache-atlas-0.8.4-sources.tar.gz.sha512) | -| 1.2.0 | 2019-06-07 | [source](https://www.apache.org/dyn/closer.cgi/atlas/1.2.0/apache-atlas-1.2.0-sources.tar.gz) | [signature](https://www.apache.org/dist/atlas/1.2.0/apache-atlas-1.2.0-sources.tar.gz.asc) | [SHA512](https://www.apache.org/dist/atlas/1.2.0/apache-atlas-1.2.0-sources.tar.gz.sha512) | +| 2.3.0 | 2022-12-06 | [source](https://www.apache.org/dyn/closer.cgi/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz) | [signature](https://www.apache.org/dist/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.asc) | [SHA512](https://www.apache.org/dist/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.sha512) | +| 2.2.0 | 2021-08-17 | [source](https://archive.apache.org/dist/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz) | [signature](https://archive.apache.org/dist/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz.asc) | [SHA512](https://archive.apache.org/dist/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz.sha512) | +| 2.1.0 | 2020-07-15 | [source](https://archive.apache.org/dist/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz) | [signature](https://archive.apache.org/dist/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz.asc) | [SHA512](https://archive.apache.org/dist/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz.sha512) | +| 0.8.4 | 2019-06-21
[atlas] branch branch-2.0 updated: ATLAS-4700: updated documentation for 2.3.0 release
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new e3da9e12a ATLAS-4700: updated documentation for 2.3.0 release e3da9e12a is described below commit e3da9e12a99c02d2e604ff425ce56445f40e1c9d Author: Madhan Neethiraj AuthorDate: Tue Dec 6 23:47:17 2022 -0800 ATLAS-4700: updated documentation for 2.3.0 release --- docs/docz-lib/config/menu.js | 2 +- docs/docz-lib/config/versions.js | 1 + docs/src/documents/Downloads/Downloads.md| 25 + docs/src/documents/Overview.md | 2 +- docs/src/documents/Whats-New/WhatsNew-2.3.md | 26 ++ 5 files changed, 50 insertions(+), 6 deletions(-) diff --git a/docs/docz-lib/config/menu.js b/docs/docz-lib/config/menu.js index 37acf46d4..54895c2cc 100644 --- a/docs/docz-lib/config/menu.js +++ b/docs/docz-lib/config/menu.js @@ -87,7 +87,7 @@ export default [ "Download", { name: "Whats New", -menu: ["WhatsNew-2.2", "WhatsNew-2.1", "WhatsNew-2.0", "WhatsNew-1.0"] +menu: ["WhatsNew-2.3", "WhatsNew-2.2", "WhatsNew-2.1", "WhatsNew-2.0", "WhatsNew-1.0"] }, "Migration" ] diff --git a/docs/docz-lib/config/versions.js b/docs/docz-lib/config/versions.js index 3ef55f681..9ccbee419 100644 --- a/docs/docz-lib/config/versions.js +++ b/docs/docz-lib/config/versions.js @@ -1,4 +1,5 @@ export default [ + { id: 1, href: "/2.3.0/index.html", title: "2.3.0", label: "2.3.0" }, { id: 2, href: "/2.2.0/index.html", title: "2.2.0", label: "2.2.0" }, { id: 3, href: "/2.1.0/index.html", title: "2.1.0", label: "2.1.0" }, { id: 4, href: "/2.0.0/index.html", title: "2.0.0", label: "2.0.0" }, diff --git a/docs/src/documents/Downloads/Downloads.md b/docs/src/documents/Downloads/Downloads.md index e486a1d0b..e98ef35b9 100644 --- a/docs/src/documents/Downloads/Downloads.md +++ b/docs/src/documents/Downloads/Downloads.md @@ -18,10 +18,11 @@ artifacts can be found in our published [KEYS file](https://www.apache.org/dist/ | **Version** | **Release Date** | **Tarball** | **GPG** | **Hash** | | : - : | : - : | : - : | : - : |: - :| -| 2.2.0 | 2021-08-17 | [source](https://www.apache.org/dyn/closer.cgi/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz) | [signature](https://www.apache.org/dist/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz.asc) | [SHA512](https://www.apache.org/dist/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz.sha512) | -| 2.1.0 | 2020-07-15 | [source](https://www.apache.org/dyn/closer.cgi/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz) | [signature](https://www.apache.org/dist/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz.asc) | [SHA512](https://www.apache.org/dist/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz.sha512) | -| 0.8.4 | 2019-06-21 | [source](https://www.apache.org/dyn/closer.cgi/atlas/0.8.4/apache-atlas-0.8.4-sources.tar.gz) | [signature](https://www.apache.org/dist/atlas/0.8.4/apache-atlas-0.8.4-sources.tar.gz.asc) | [SHA512](https://www.apache.org/dist/atlas/0.8.4/apache-atlas-0.8.4-sources.tar.gz.sha512) | -| 1.2.0 | 2019-06-07 | [source](https://www.apache.org/dyn/closer.cgi/atlas/1.2.0/apache-atlas-1.2.0-sources.tar.gz) | [signature](https://www.apache.org/dist/atlas/1.2.0/apache-atlas-1.2.0-sources.tar.gz.asc) | [SHA512](https://www.apache.org/dist/atlas/1.2.0/apache-atlas-1.2.0-sources.tar.gz.sha512) | +| 2.3.0 | 2022-12-06 | [source](https://www.apache.org/dyn/closer.cgi/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz) | [signature](https://www.apache.org/dist/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.asc) | [SHA512](https://www.apache.org/dist/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.sha512) | +| 2.2.0 | 2021-08-17 | [source](https://archive.apache.org/dist/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz) | [signature](https://archive.apache.org/dist/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz.asc) | [SHA512](https://archive.apache.org/dist/atlas/2.2.0/apache-atlas-2.2.0-sources.tar.gz.sha512) | +| 2.1.0 | 2020-07-15 | [source](https://archive.apache.org/dist/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz) | [signature](https://archive.apache.org/dist/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz.asc) | [SHA512](https://archive.apache.org/dist/atlas/2.1.0/apache-atlas-2.1.0-sources.tar.gz.sha512) | +| 0.8.4 | 2019-06-21 | [source](https://archive.apache.org/dist/atlas/0.8.4/apache-atlas-0
svn commit: r58524 - in /release/atlas/2.3.0: ./ apache-atlas-2.3.0-sources.tar.gz apache-atlas-2.3.0-sources.tar.gz.asc apache-atlas-2.3.0-sources.tar.gz.md5 apache-atlas-2.3.0-sources.tar.gz.sha512
Author: madhan Date: Wed Dec 7 06:44:05 2022 New Revision: 58524 Log: Atlas 2.3.0 Release Added: release/atlas/2.3.0/ release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz (with props) release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.asc (with props) release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.md5 release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.sha512 Added: release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz == Binary file - no diff available. Propchange: release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz -- svn:mime-type = application/x-gzip Added: release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.asc == Binary file - no diff available. Propchange: release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.md5 == --- release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.md5 (added) +++ release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.md5 Wed Dec 7 06:44:05 2022 @@ -0,0 +1,2 @@ +apache-atlas-2.3.0-sources.tar.gz: A7 1F 87 41 13 CE 38 29 63 5A D1 E9 85 B4 8D + C6 Added: release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.sha512 == --- release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.sha512 (added) +++ release/atlas/2.3.0/apache-atlas-2.3.0-sources.tar.gz.sha512 Wed Dec 7 06:44:05 2022 @@ -0,0 +1,4 @@ +apache-atlas-2.3.0-sources.tar.gz: B24C9785 F601B464 4090EF0B 4C16974F C572100B + 61F04EF2 D6C68FDA A45293E9 02483F35 74342A0E + 70C54F75 7C509D3D 7EC6A85E 494599B1 018C65D8 + 126D3480
svn commit: r58523 - /release/atlas/KEYS
Author: madhan Date: Wed Dec 7 06:42:00 2022 New Revision: 58523 Log: added signing key for Madhan Neethiraj Modified: release/atlas/KEYS Modified: release/atlas/KEYS == --- release/atlas/KEYS (original) +++ release/atlas/KEYS Wed Dec 7 06:42:00 2022 @@ -496,3 +496,60 @@ MxH4NPsOeLEruN87vsPsigCNR7RPJZ82UnaHD/su O72oTUu6olLLCFj9Utw= =P+MW -END PGP PUBLIC KEY BLOCK- +pub 4096R/B01179D4 2022-11-28 [expires: 2026-11-27] +uid Madhan Neethiraj +sig 3B01179D4 2022-11-28 Madhan Neethiraj +sub 4096R/2920487A 2022-11-28 [expires: 2026-11-27] +sig B01179D4 2022-11-28 Madhan Neethiraj + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBGOFIfgBEADIBPINa/onUDNGBeNlYYo3l8X1hX66hR7av9rtqZoTfhc3kLrm +mEKkHBoY/iqyF9rtNWzoamXWMOT+0zkfXPdKkFyddHf48g/LCX8iKL3Hig8M0LBj +fZUSaM9KLVnpbb4G3J8KEBswBFzV0IWxskgz72w3nXYfTMtwDvg2fw7rtYkO4zmm +R3oqTCAXPpY4hkCko1oQU99wqYYwDMIfgGlpQINSsLUgVLtpJgj+eQQioPxYqDoU +iDRDIRKg+Jl2Xfmzw0KA+jj+0W+KJT6XEBJmV0ClzmwGgTYRAHtd1RniNgWYfkKe +q93Dn6SVjpD616NMAIKV79MqGwpRGEi/VVoGuyn47VFOp2SPmfSyBDEG5QIiffiO +Vl3r7TT/BDUFSo3Bc1MHWocTQ7TllK4o9oIfUSuTMjjmN3+N6mrASzQA10Sue7F8 +JmD/goRm1MmTogtdIsI1Y49+CXGlC+13hmTsqSDprvzjnMBog+76IPuMhaTvDcoH +wM+5rvKkpsTCiULq0ury4tznKJcjgzWjUg1apTTtg94h7axbw1kTz9pd2qfSmXT6 +3k7q2TqivaYlI04UXDvEE/vdW58ns0jFFT+124zp5rBsrVgNpPngf2G4It7eySk1 +Xq312/ME8R4g6UVf2vvfVtGMGHFggCGaB4eOt+vaLEMNiYzAScJc2cmhKwARAQAB +tCRNYWRoYW4gTmVldGhpcmFqIDxtYWRoYW5AYXBhY2hlLm9yZz6JAj8EEwECACkF +AmOFIfgCGwMFCQeEzgAHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRD+1GfT +sBF51HMXD/wNmHdBNiaIdz5QkySxeEB1SeHfuBHf2+qz7myKOnFi0GLQsJY+hSNc +bjSNvw5cJS8IWuHzG0prU1VV9MrzDbbCHNaQIFr45rP/Ovo0SCZ9DEfTWqKwTRrM +lcl5PYCH1rH+vMngrv+V5+/tWEKIB1rBPTgen7RjCptrqjELXcQPCMFqLnBDkDhO +AlNBdRsDhoTSjAqGsFfGOq/XPkIRh9ve4RKRLsyxv+7n7vd8cJyrhVedLwiyDR/q +LELSv5CColSSVW8CI/z9AWyibKxp+7DT9UbNUF5T5hXxpub8IlY32ec9ZmLH2516 +dSCuavXbgF2CunSWomQpnOkeO8929Xk2f3sx9ybcqBtAxF5cbTYtWam5YIbrMu9o +mvzBG2VjlVo27auDwpKXOd106yhExW/thOjDERvs7ZlOuCBnfllM3qBjH38hfx4R +ywgq/Zzwl55m3E27ocibtYABS+UFIfsN9T1ownII1DJXvhms0Hv/Faqy4/jxtS0N +O/f7/RCS4f6WvICppWFw0Ak31Pbzq5BbPd2w2U7exMY5V3r285K4d/Dr5Lp8049V +JrbU1D8uQbt/mKAwFDNeuJb/AmTeaLCNoxbrG0klZc61IgCa1Axw7K4uKueE1kL+ +64gvBtWuAXWVJ9RhBJNCk4JZaRG/smO2GhAMG8ipWN/GUK4N7O2orbkCDQRjhSH4 +ARAAn9Pw/bpYikB/Oa0Q+A3ddjUvN/YaZSjL8n5TatxG0x59TZHGp5jRuJKAlzvA +z7tPNlKLZdO6ZoqV5RkqNYccnFGvG73zJOYK/SEAdS/hPTepYpd5/VeLppHzVnQA +PMs/b796LfBHCcsJxe1FaFV3NCgdPRGG6TnkeXIhcrXk9YdVb9NxaLNEjPcxWomq +eSnqvqOIYI7k3EX2vr7jOvw9Xqw98hImQlf+tjSuCD7F1O3VMGRgl4qOOdtGCk7D +lUYevYpTJThxT7KlNwqdc4npKEQlv4PFXS6389f/4Rocwei2kVjIWLuDxDIVYgaI +xtnFKqlvxi9FI7f2i8buo1sWkabgRDgNHyg5v5rJcEp90gA+vWycCy5mpw/krQcc +1VsgnhynGfjna0VY4oY8iCM6+3rUnTHAsSsVUxaIJkR78+OnpkeLKFzd4WlmdMvB +dNkB+a4Yly3YNVYDzDv/uyH6AvK5nvRkEBkBK0HHONaVb6BExuZkQ+R/9yldeMmL +XU9zPWJYTNfRt9IDNzWwro0tN7rEF7knZo1iJicnwrHYxDCMqLTdEo3IiIjUJcYU +ghuiiGfGmfFTcIDO0U4jQG0eo4u+894wFnRKV4fdkJnqKBheEt7ZCG1C3O1ouCxb +HceAwIYX2u/qVRfZFS4fII7BecOg5+lZviqYFwyIXO+sTlMAEQEAAYkCJQQYAQIA +DwUCY4Uh+AIbDAUJB4TOAAAKCRD+1GfTsBF51HzxD/sHDMN3pJw3Rcya2JL9oVeO +W3cW8cAVyvmYWwxZzEy6Yl/QcjDHFtrN8MS3ht4ZxLdsrb74cDenMwQcFX05rxi9 +6srOsn2qLloboXr8ijJGouoEE9QiQsZyBW6ENI7U2aJJdSUl3gABrY+H42lo9L2p +EEnbPYI1Hk+H3lJSkrOlIeS/DciN9QHC4SArbtUrD5RrLH+45o7RSYuv7zIRA0+G +bE5ueg/HhWhtxneuAoozn3vVUMHLlEEEVOToVP5qNE4JFyTE/IWbOQe/W8ZE+85x +qwHfbslOHDXHJUSPs0L7FbFlRGDjuEn8uoSGO8KH09KWaha2Hw+jBRv3s66DraaX +3zJ3tBx7wAQ03hjW1eI/lD7hzdEsqidqimfJIgnyJsYAGKyjkK4Ipc+eCMLf34zj +a4vydav2RJd1k7hNWTOQ+u5OHGGtpNjIyp1vqycCkHu+VpYiUHVMvzBXp/N6lWKj +QN881NjIyUkdTLK+IWed04eFiUpmKGWWSWgzEzknqM2hICcdM/UrTFnZ9Yy48pZv +CnlVGPUX7E1UgJRzh2CSTureLD5fgN8fQ6oC5l0R9PoIyGA+Tuz5MtdUpMDd1/Ps +uanIKzz39ZALOuC2zJaRGAuwHXB0f+K4prknl66dapN2kjOT11KXsh47xuC0g/HK +1vdQha0RuDPtJD7eRhO0Gg== +=Y84k +-END PGP PUBLIC KEY BLOCK-
[atlas] annotated tag release-2.3.0 created (now a669931dc)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to annotated tag release-2.3.0 in repository https://gitbox.apache.org/repos/asf/atlas.git at a669931dc (tag) tagging 4cd215e1e2a04acbcd8afe6af95f43c4979202f1 (commit) replaces release-2.3.0-rc0 by Madhan Neethiraj on Tue Dec 6 20:49:45 2022 -0800 - Log - Apache Atlas 2.3.0 release --- No new revisions were added by this update.
svn commit: r58289 - in /dev/atlas/2.3.0-rc1: ./ apache-atlas-2.3.0-sources.tar.gz apache-atlas-2.3.0-sources.tar.gz.asc apache-atlas-2.3.0-sources.tar.gz.md5 apache-atlas-2.3.0-sources.tar.gz.sha512
Author: madhan Date: Mon Nov 28 21:20:04 2022 New Revision: 58289 Log: added artifacts for Apache Atlas 2.3.0 release candidate 1 Added: dev/atlas/2.3.0-rc1/ dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz (with props) dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz.asc (with props) dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz.md5 dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz.sha512 Added: dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz == Binary file - no diff available. Propchange: dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz -- svn:mime-type = application/x-gzip Added: dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz.asc == Binary file - no diff available. Propchange: dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz.md5 == --- dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz.md5 (added) +++ dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz.md5 Mon Nov 28 21:20:04 2022 @@ -0,0 +1,2 @@ +apache-atlas-2.3.0-sources.tar.gz: A7 1F 87 41 13 CE 38 29 63 5A D1 E9 85 B4 8D + C6 Added: dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz.sha512 == --- dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz.sha512 (added) +++ dev/atlas/2.3.0-rc1/apache-atlas-2.3.0-sources.tar.gz.sha512 Mon Nov 28 21:20:04 2022 @@ -0,0 +1,4 @@ +apache-atlas-2.3.0-sources.tar.gz: B24C9785 F601B464 4090EF0B 4C16974F C572100B + 61F04EF2 D6C68FDA A45293E9 02483F35 74342A0E + 70C54F75 7C509D3D 7EC6A85E 494599B1 018C65D8 + 126D3480
svn commit: r58288 - /dev/atlas/KEYS
Author: madhan Date: Mon Nov 28 21:12:12 2022 New Revision: 58288 Log: added GPG key for Madhan Neethiraj Modified: dev/atlas/KEYS Modified: dev/atlas/KEYS == --- dev/atlas/KEYS (original) +++ dev/atlas/KEYS Mon Nov 28 21:12:12 2022 @@ -546,3 +546,60 @@ MxH4NPsOeLEruN87vsPsigCNR7RPJZ82UnaHD/su O72oTUu6olLLCFj9Utw= =P+MW -END PGP PUBLIC KEY BLOCK- +pub 4096R/B01179D4 2022-11-28 [expires: 2026-11-27] +uid Madhan Neethiraj +sig 3B01179D4 2022-11-28 Madhan Neethiraj +sub 4096R/2920487A 2022-11-28 [expires: 2026-11-27] +sig B01179D4 2022-11-28 Madhan Neethiraj + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBGOFIfgBEADIBPINa/onUDNGBeNlYYo3l8X1hX66hR7av9rtqZoTfhc3kLrm +mEKkHBoY/iqyF9rtNWzoamXWMOT+0zkfXPdKkFyddHf48g/LCX8iKL3Hig8M0LBj +fZUSaM9KLVnpbb4G3J8KEBswBFzV0IWxskgz72w3nXYfTMtwDvg2fw7rtYkO4zmm +R3oqTCAXPpY4hkCko1oQU99wqYYwDMIfgGlpQINSsLUgVLtpJgj+eQQioPxYqDoU +iDRDIRKg+Jl2Xfmzw0KA+jj+0W+KJT6XEBJmV0ClzmwGgTYRAHtd1RniNgWYfkKe +q93Dn6SVjpD616NMAIKV79MqGwpRGEi/VVoGuyn47VFOp2SPmfSyBDEG5QIiffiO +Vl3r7TT/BDUFSo3Bc1MHWocTQ7TllK4o9oIfUSuTMjjmN3+N6mrASzQA10Sue7F8 +JmD/goRm1MmTogtdIsI1Y49+CXGlC+13hmTsqSDprvzjnMBog+76IPuMhaTvDcoH +wM+5rvKkpsTCiULq0ury4tznKJcjgzWjUg1apTTtg94h7axbw1kTz9pd2qfSmXT6 +3k7q2TqivaYlI04UXDvEE/vdW58ns0jFFT+124zp5rBsrVgNpPngf2G4It7eySk1 +Xq312/ME8R4g6UVf2vvfVtGMGHFggCGaB4eOt+vaLEMNiYzAScJc2cmhKwARAQAB +tCRNYWRoYW4gTmVldGhpcmFqIDxtYWRoYW5AYXBhY2hlLm9yZz6JAj8EEwECACkF +AmOFIfgCGwMFCQeEzgAHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRD+1GfT +sBF51HMXD/wNmHdBNiaIdz5QkySxeEB1SeHfuBHf2+qz7myKOnFi0GLQsJY+hSNc +bjSNvw5cJS8IWuHzG0prU1VV9MrzDbbCHNaQIFr45rP/Ovo0SCZ9DEfTWqKwTRrM +lcl5PYCH1rH+vMngrv+V5+/tWEKIB1rBPTgen7RjCptrqjELXcQPCMFqLnBDkDhO +AlNBdRsDhoTSjAqGsFfGOq/XPkIRh9ve4RKRLsyxv+7n7vd8cJyrhVedLwiyDR/q +LELSv5CColSSVW8CI/z9AWyibKxp+7DT9UbNUF5T5hXxpub8IlY32ec9ZmLH2516 +dSCuavXbgF2CunSWomQpnOkeO8929Xk2f3sx9ybcqBtAxF5cbTYtWam5YIbrMu9o +mvzBG2VjlVo27auDwpKXOd106yhExW/thOjDERvs7ZlOuCBnfllM3qBjH38hfx4R +ywgq/Zzwl55m3E27ocibtYABS+UFIfsN9T1ownII1DJXvhms0Hv/Faqy4/jxtS0N +O/f7/RCS4f6WvICppWFw0Ak31Pbzq5BbPd2w2U7exMY5V3r285K4d/Dr5Lp8049V +JrbU1D8uQbt/mKAwFDNeuJb/AmTeaLCNoxbrG0klZc61IgCa1Axw7K4uKueE1kL+ +64gvBtWuAXWVJ9RhBJNCk4JZaRG/smO2GhAMG8ipWN/GUK4N7O2orbkCDQRjhSH4 +ARAAn9Pw/bpYikB/Oa0Q+A3ddjUvN/YaZSjL8n5TatxG0x59TZHGp5jRuJKAlzvA +z7tPNlKLZdO6ZoqV5RkqNYccnFGvG73zJOYK/SEAdS/hPTepYpd5/VeLppHzVnQA +PMs/b796LfBHCcsJxe1FaFV3NCgdPRGG6TnkeXIhcrXk9YdVb9NxaLNEjPcxWomq +eSnqvqOIYI7k3EX2vr7jOvw9Xqw98hImQlf+tjSuCD7F1O3VMGRgl4qOOdtGCk7D +lUYevYpTJThxT7KlNwqdc4npKEQlv4PFXS6389f/4Rocwei2kVjIWLuDxDIVYgaI +xtnFKqlvxi9FI7f2i8buo1sWkabgRDgNHyg5v5rJcEp90gA+vWycCy5mpw/krQcc +1VsgnhynGfjna0VY4oY8iCM6+3rUnTHAsSsVUxaIJkR78+OnpkeLKFzd4WlmdMvB +dNkB+a4Yly3YNVYDzDv/uyH6AvK5nvRkEBkBK0HHONaVb6BExuZkQ+R/9yldeMmL +XU9zPWJYTNfRt9IDNzWwro0tN7rEF7knZo1iJicnwrHYxDCMqLTdEo3IiIjUJcYU +ghuiiGfGmfFTcIDO0U4jQG0eo4u+894wFnRKV4fdkJnqKBheEt7ZCG1C3O1ouCxb +HceAwIYX2u/qVRfZFS4fII7BecOg5+lZviqYFwyIXO+sTlMAEQEAAYkCJQQYAQIA +DwUCY4Uh+AIbDAUJB4TOAAAKCRD+1GfTsBF51HzxD/sHDMN3pJw3Rcya2JL9oVeO +W3cW8cAVyvmYWwxZzEy6Yl/QcjDHFtrN8MS3ht4ZxLdsrb74cDenMwQcFX05rxi9 +6srOsn2qLloboXr8ijJGouoEE9QiQsZyBW6ENI7U2aJJdSUl3gABrY+H42lo9L2p +EEnbPYI1Hk+H3lJSkrOlIeS/DciN9QHC4SArbtUrD5RrLH+45o7RSYuv7zIRA0+G +bE5ueg/HhWhtxneuAoozn3vVUMHLlEEEVOToVP5qNE4JFyTE/IWbOQe/W8ZE+85x +qwHfbslOHDXHJUSPs0L7FbFlRGDjuEn8uoSGO8KH09KWaha2Hw+jBRv3s66DraaX +3zJ3tBx7wAQ03hjW1eI/lD7hzdEsqidqimfJIgnyJsYAGKyjkK4Ipc+eCMLf34zj +a4vydav2RJd1k7hNWTOQ+u5OHGGtpNjIyp1vqycCkHu+VpYiUHVMvzBXp/N6lWKj +QN881NjIyUkdTLK+IWed04eFiUpmKGWWSWgzEzknqM2hICcdM/UrTFnZ9Yy48pZv +CnlVGPUX7E1UgJRzh2CSTureLD5fgN8fQ6oC5l0R9PoIyGA+Tuz5MtdUpMDd1/Ps +uanIKzz39ZALOuC2zJaRGAuwHXB0f+K4prknl66dapN2kjOT11KXsh47xuC0g/HK +1vdQha0RuDPtJD7eRhO0Gg== +=Y84k +-END PGP PUBLIC KEY BLOCK-
[atlas] annotated tag release-2.3.0-rc1 created (now f64352bdc)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to annotated tag release-2.3.0-rc1 in repository https://gitbox.apache.org/repos/asf/atlas.git at f64352bdc (tag) tagging 4cd215e1e2a04acbcd8afe6af95f43c4979202f1 (commit) replaces release-2.3.0-rc0 by Madhan Neethiraj on Mon Nov 28 11:27:56 2022 -0800 - Log - Apache Atlas 2.3.0-rc1 --- No new revisions were added by this update.
[atlas] branch master updated: ATLAS-4714: exclude downloaded/generated files from source package
This is an automated email from the ASF dual-hosted git repository. madhan 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 70ae8c474 ATLAS-4714: exclude downloaded/generated files from source package 70ae8c474 is described below commit 70ae8c4742157a2ef07ba8fd187139523429a9cf Author: Madhan Neethiraj AuthorDate: Tue Nov 22 13:39:49 2022 -0800 ATLAS-4714: exclude downloaded/generated files from source package (cherry picked from commit 4cd215e1e2a04acbcd8afe6af95f43c4979202f1) --- distro/src/main/assemblies/src-package.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/distro/src/main/assemblies/src-package.xml b/distro/src/main/assemblies/src-package.xml index b53487155..038d8be52 100755 --- a/distro/src/main/assemblies/src-package.xml +++ b/distro/src/main/assemblies/src-package.xml @@ -37,13 +37,18 @@ **/*.log **/*.pyc **/test-output/** +distro/elasticsearch/** distro/hbase/** distro/solr/** +distro/zk/** **/${sys:atlas.data}/** **/atlas.data/** **/*.patch +dashboardv2/node_modules/** +dashboardv3/node_modules/** dev-support/atlas-docker/data/** dev-support/atlas-docker/dist/** +dev-support/atlas-docker/downloads/**
[atlas] branch branch-2.0 updated: ATLAS-4714: exclude downloaded/generated files from source package
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 4cd215e1e ATLAS-4714: exclude downloaded/generated files from source package 4cd215e1e is described below commit 4cd215e1e2a04acbcd8afe6af95f43c4979202f1 Author: Madhan Neethiraj AuthorDate: Tue Nov 22 13:39:49 2022 -0800 ATLAS-4714: exclude downloaded/generated files from source package --- distro/src/main/assemblies/src-package.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/distro/src/main/assemblies/src-package.xml b/distro/src/main/assemblies/src-package.xml index b53487155..038d8be52 100755 --- a/distro/src/main/assemblies/src-package.xml +++ b/distro/src/main/assemblies/src-package.xml @@ -37,13 +37,18 @@ **/*.log **/*.pyc **/test-output/** +distro/elasticsearch/** distro/hbase/** distro/solr/** +distro/zk/** **/${sys:atlas.data}/** **/atlas.data/** **/*.patch +dashboardv2/node_modules/** +dashboardv3/node_modules/** dev-support/atlas-docker/data/** dev-support/atlas-docker/dist/** +dev-support/atlas-docker/downloads/**
[atlas] annotated tag release-2.3.0-rc0 created (now 3a79c1f63)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to annotated tag release-2.3.0-rc0 in repository https://gitbox.apache.org/repos/asf/atlas.git at 3a79c1f63 (tag) tagging 125a6dba44e162f92e22c9bdbbad4ad9e017aef5 (commit) replaces release-2.2.0-rc1 by Madhan Neethiraj on Tue Nov 22 10:17:21 2022 -0800 - Log - Apache Atlas 2.3.0-rc0 --- No new revisions were added by this update.
[atlas] 01/02: ATLAS-4712: fixed docker setup for Hive to avoid 'No such file or directory error'
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 dbcd7d724cd855814b93d5291d7fb57a3b884889 Author: Madhan Neethiraj AuthorDate: Thu Nov 17 09:24:21 2022 -0800 ATLAS-4712: fixed docker setup for Hive to avoid 'No such file or directory error' (cherry picked from commit 1ba7e6d66a6a02952930e5643f85824b09d8285c) --- dev-support/atlas-docker/scripts/atlas-hive-setup.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/dev-support/atlas-docker/scripts/atlas-hive-setup.sh b/dev-support/atlas-docker/scripts/atlas-hive-setup.sh index f92b8c597..db509eac7 100755 --- a/dev-support/atlas-docker/scripts/atlas-hive-setup.sh +++ b/dev-support/atlas-docker/scripts/atlas-hive-setup.sh @@ -40,6 +40,3 @@ su -c "${HIVE_HOME}/bin/schematool -dbType postgres -initSchema" hive mkdir -p /opt/hive/logs chown -R hive:hadoop /opt/hive/ chmod g+w /opt/hive/logs - -cd ${ATLAS_HOME}/atlas-hive-plugin -./enable-hive-plugin.sh
[atlas] 02/02: [PATCH] ATLAS-3468: Exclude JTS topology suite library from being packaged
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 125a6dba44e162f92e22c9bdbbad4ad9e017aef5 Author: Sarath Subramanian AuthorDate: Thu Nov 17 09:35:37 2022 -0800 [PATCH] ATLAS-3468: Exclude JTS topology suite library from being packaged Signed-off-by: Madhan Neethiraj (cherry picked from commit cf144656ebfdb6085581a6f16dfaafac1ba8a569) --- .../repository/tagpropagation/ClassificationPropagationTest.java | 5 ++--- test-tools/pom.xml | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repository/src/test/java/org/apache/atlas/repository/tagpropagation/ClassificationPropagationTest.java b/repository/src/test/java/org/apache/atlas/repository/tagpropagation/ClassificationPropagationTest.java index 84e9bfa04..103036dcb 100644 --- a/repository/src/test/java/org/apache/atlas/repository/tagpropagation/ClassificationPropagationTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/tagpropagation/ClassificationPropagationTest.java @@ -17,7 +17,6 @@ */ package org.apache.atlas.repository.tagpropagation; -import com.vividsolutions.jts.util.Assert; import org.apache.atlas.AtlasErrorCode; import org.apache.atlas.RequestContext; import org.apache.atlas.TestModules; @@ -694,7 +693,7 @@ public class ClassificationPropagationTest extends AtlasTestBase { deletePropagatedClassification(entity, classification); fail(); } catch (AtlasBaseException ex) { -Assert.equals(ex.getAtlasErrorCode(), PROPAGATED_CLASSIFICATION_REMOVAL_NOT_SUPPORTED); +assertEquals(ex.getAtlasErrorCode(), PROPAGATED_CLASSIFICATION_REMOVAL_NOT_SUPPORTED); } } @@ -712,4 +711,4 @@ public class ClassificationPropagationTest extends AtlasTestBase { return relationshipStore.getById(relationshipGuid); } -} \ No newline at end of file +} diff --git a/test-tools/pom.xml b/test-tools/pom.xml index b35cb4869..838b970c9 100644 --- a/test-tools/pom.xml +++ b/test-tools/pom.xml @@ -75,6 +75,7 @@ com.vividsolutions jts 1.13 +test
[atlas] branch branch-2.0 updated (518e6eb5e -> 125a6dba4)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git from 518e6eb5e ATLAS-4699: updated version in pom.xml from 2.3.0-SNAPSHOT to 2.3.0 new dbcd7d724 ATLAS-4712: fixed docker setup for Hive to avoid 'No such file or directory error' new 125a6dba4 [PATCH] ATLAS-3468: Exclude JTS topology suite library from being packaged The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dev-support/atlas-docker/scripts/atlas-hive-setup.sh | 3 --- .../repository/tagpropagation/ClassificationPropagationTest.java | 5 ++--- test-tools/pom.xml | 1 + 3 files changed, 3 insertions(+), 6 deletions(-)
[atlas] 02/02: [PATCH] ATLAS-3468: Exclude JTS topology suite library from being packaged
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit cf144656ebfdb6085581a6f16dfaafac1ba8a569 Author: Sarath Subramanian AuthorDate: Thu Nov 17 09:35:37 2022 -0800 [PATCH] ATLAS-3468: Exclude JTS topology suite library from being packaged Signed-off-by: Madhan Neethiraj --- .../repository/tagpropagation/ClassificationPropagationTest.java | 5 ++--- test-tools/pom.xml | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repository/src/test/java/org/apache/atlas/repository/tagpropagation/ClassificationPropagationTest.java b/repository/src/test/java/org/apache/atlas/repository/tagpropagation/ClassificationPropagationTest.java index 84e9bfa04..103036dcb 100644 --- a/repository/src/test/java/org/apache/atlas/repository/tagpropagation/ClassificationPropagationTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/tagpropagation/ClassificationPropagationTest.java @@ -17,7 +17,6 @@ */ package org.apache.atlas.repository.tagpropagation; -import com.vividsolutions.jts.util.Assert; import org.apache.atlas.AtlasErrorCode; import org.apache.atlas.RequestContext; import org.apache.atlas.TestModules; @@ -694,7 +693,7 @@ public class ClassificationPropagationTest extends AtlasTestBase { deletePropagatedClassification(entity, classification); fail(); } catch (AtlasBaseException ex) { -Assert.equals(ex.getAtlasErrorCode(), PROPAGATED_CLASSIFICATION_REMOVAL_NOT_SUPPORTED); +assertEquals(ex.getAtlasErrorCode(), PROPAGATED_CLASSIFICATION_REMOVAL_NOT_SUPPORTED); } } @@ -712,4 +711,4 @@ public class ClassificationPropagationTest extends AtlasTestBase { return relationshipStore.getById(relationshipGuid); } -} \ No newline at end of file +} diff --git a/test-tools/pom.xml b/test-tools/pom.xml index 215882d46..3ce47b012 100644 --- a/test-tools/pom.xml +++ b/test-tools/pom.xml @@ -75,6 +75,7 @@ com.vividsolutions jts 1.13 +test
[atlas] 01/02: ATLAS-4712: fixed docker setup for Hive to avoid 'No such file or directory error'
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit 1ba7e6d66a6a02952930e5643f85824b09d8285c Author: Madhan Neethiraj AuthorDate: Thu Nov 17 09:24:21 2022 -0800 ATLAS-4712: fixed docker setup for Hive to avoid 'No such file or directory error' --- dev-support/atlas-docker/scripts/atlas-hive-setup.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/dev-support/atlas-docker/scripts/atlas-hive-setup.sh b/dev-support/atlas-docker/scripts/atlas-hive-setup.sh index f92b8c597..db509eac7 100755 --- a/dev-support/atlas-docker/scripts/atlas-hive-setup.sh +++ b/dev-support/atlas-docker/scripts/atlas-hive-setup.sh @@ -40,6 +40,3 @@ su -c "${HIVE_HOME}/bin/schematool -dbType postgres -initSchema" hive mkdir -p /opt/hive/logs chown -R hive:hadoop /opt/hive/ chmod g+w /opt/hive/logs - -cd ${ATLAS_HOME}/atlas-hive-plugin -./enable-hive-plugin.sh
[atlas] branch master updated (d9a2c91aa -> cf144656e)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git from d9a2c91aa ATLAS-4707: updated loader-utils version from 1.4.1 to 1.4.2 - #3 new 1ba7e6d66 ATLAS-4712: fixed docker setup for Hive to avoid 'No such file or directory error' new cf144656e [PATCH] ATLAS-3468: Exclude JTS topology suite library from being packaged The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dev-support/atlas-docker/scripts/atlas-hive-setup.sh | 3 --- .../repository/tagpropagation/ClassificationPropagationTest.java | 5 ++--- test-tools/pom.xml | 1 + 3 files changed, 3 insertions(+), 6 deletions(-)
[atlas] branch branch-2.0 updated: ATLAS-4699: updated version in pom.xml from 2.3.0-SNAPSHOT to 2.3.0
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 518e6eb5e ATLAS-4699: updated version in pom.xml from 2.3.0-SNAPSHOT to 2.3.0 518e6eb5e is described below commit 518e6eb5e54907ad8392d26be7929c08971ef011 Author: Madhan Neethiraj AuthorDate: Thu Nov 17 00:30:14 2022 -0800 ATLAS-4699: updated version in pom.xml from 2.3.0-SNAPSHOT to 2.3.0 --- addons/falcon-bridge-shim/pom.xml| 2 +- addons/falcon-bridge/pom.xml | 2 +- addons/hbase-bridge-shim/pom.xml | 2 +- addons/hbase-bridge/pom.xml | 2 +- addons/hbase-testing-util/pom.xml| 2 +- addons/hdfs-model/pom.xml| 2 +- addons/hive-bridge-shim/pom.xml | 2 +- addons/hive-bridge/pom.xml | 2 +- addons/impala-bridge-shim/pom.xml| 2 +- addons/impala-bridge/pom.xml | 2 +- addons/impala-hook-api/pom.xml | 2 +- addons/kafka-bridge/pom.xml | 2 +- addons/sqoop-bridge-shim/pom.xml | 2 +- addons/sqoop-bridge/pom.xml | 2 +- addons/storm-bridge-shim/pom.xml | 2 +- addons/storm-bridge/pom.xml | 2 +- atlas-examples/pom.xml | 2 +- atlas-examples/sample-app/pom.xml| 2 +- authorization/pom.xml| 2 +- build-tools/pom.xml | 2 +- client/client-v1/pom.xml | 2 +- client/client-v2/pom.xml | 2 +- client/common/pom.xml| 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- dashboardv2/pom.xml | 2 +- dashboardv3/pom.xml | 2 +- dev-support/atlas-docker/.env| 2 +- distro/pom.xml | 2 +- docs/pom.xml | 2 +- graphdb/api/pom.xml | 2 +- graphdb/common/pom.xml | 2 +- graphdb/graphdb-impls/pom.xml| 2 +- graphdb/janus-hbase2/pom.xml | 2 +- graphdb/janus/pom.xml| 2 +- graphdb/pom.xml | 2 +- intg/pom.xml | 2 +- notification/pom.xml | 2 +- plugin-classloader/pom.xml | 2 +- pom.xml | 2 +- repository/pom.xml | 2 +- server-api/pom.xml | 2 +- test-tools/pom.xml | 2 +- tools/atlas-index-repair/pom.xml | 2 +- tools/classification-updater/pom.xml | 2 +- webapp/pom.xml | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/addons/falcon-bridge-shim/pom.xml b/addons/falcon-bridge-shim/pom.xml index 981e76418..490d812a0 100755 --- a/addons/falcon-bridge-shim/pom.xml +++ b/addons/falcon-bridge-shim/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0-SNAPSHOT +2.3.0 ../../ falcon-bridge-shim diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml index 8e25111d4..7072ab06f 100644 --- a/addons/falcon-bridge/pom.xml +++ b/addons/falcon-bridge/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0-SNAPSHOT +2.3.0 ../../ falcon-bridge diff --git a/addons/hbase-bridge-shim/pom.xml b/addons/hbase-bridge-shim/pom.xml index ef3c1bad9..a33f78463 100644 --- a/addons/hbase-bridge-shim/pom.xml +++ b/addons/hbase-bridge-shim/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0-SNAPSHOT +2.3.0 ../../ hbase-bridge-shim diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index 5a0f62fb3..ee4ed0471 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0-SNAPSHOT +2.3.0 ../../ hbase-bridge diff --git a/addons/hbase-testing-util/pom.xml b/addons/hbase-testing-util/pom.xml index 947ca477f..560e4f27e 100644 --- a/addons/hbase-testing-util/pom.xml +++ b/addons/hbase-testing-util/pom.xml @@ -23,7 +23,7 @@ apache-atlas org.apache.atlas -2.3.0-SNAPSHOT +2.3.0 ../../ hbase-testing-util diff --git a/addons/hdfs-model/pom.xml b/addons/hdfs-model/pom.xml index 226b0d49b..43362fadf 100644 --- a/addons/hdfs-model/pom.xml +++ b/addons/hdfs-model/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0-SNAPSHOT +2.3.0 ../../ hdfs-model diff --git a/addons/hive-bridge-shim/pom.xml b/addons/hive-bridge-shim/pom.xml index cb4dbb3ae..6c2c04aac 100755 --- a/addons/hive-bridge-shim/pom.xml +++ b/addons/hive-bridge-shim/pom.xml @@ -22,7 +22,7 @@ apache-atlas org.apache.atlas -2.3.0-SNAPSHOT
[atlas] branch branch-2.0 updated: ATLAS-4707: updated loader-utils version from 1.4.1 to 1.4.2 - #3
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 3cfa8787a ATLAS-4707: updated loader-utils version from 1.4.1 to 1.4.2 - #3 3cfa8787a is described below commit 3cfa8787acd6ea6c84f77df155888d08bb528fad Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Nov 17 08:20:11 2022 + ATLAS-4707: updated loader-utils version from 1.4.1 to 1.4.2 - #3 Signed-off-by: Madhan Neethiraj (cherry picked from commit d9a2c91aae5c6f0273da12b753a9c66b43c5e73e) --- dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json | 6 +++--- dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json b/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json index f5f1424c4..b2f936ef7 100644 --- a/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json +++ b/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json @@ -3641,9 +3641,9 @@ "dev": true }, "loader-utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz;, - "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz;, + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "dev": true, "requires": { "big.js": "^5.2.2", diff --git a/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json b/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json index f5f1424c4..b2f936ef7 100644 --- a/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json +++ b/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json @@ -3641,9 +3641,9 @@ "dev": true }, "loader-utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz;, - "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz;, + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "dev": true, "requires": { "big.js": "^5.2.2",
[atlas] branch master updated: ATLAS-4707: updated loader-utils version from 1.4.1 to 1.4.2 - #3
This is an automated email from the ASF dual-hosted git repository. madhan 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 d9a2c91aa ATLAS-4707: updated loader-utils version from 1.4.1 to 1.4.2 - #3 d9a2c91aa is described below commit d9a2c91aae5c6f0273da12b753a9c66b43c5e73e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Nov 17 08:20:11 2022 + ATLAS-4707: updated loader-utils version from 1.4.1 to 1.4.2 - #3 Signed-off-by: Madhan Neethiraj --- dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json | 6 +++--- dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json b/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json index f5f1424c4..b2f936ef7 100644 --- a/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json +++ b/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json @@ -3641,9 +3641,9 @@ "dev": true }, "loader-utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz;, - "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz;, + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "dev": true, "requires": { "big.js": "^5.2.2", diff --git a/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json b/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json index f5f1424c4..b2f936ef7 100644 --- a/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json +++ b/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json @@ -3641,9 +3641,9 @@ "dev": true }, "loader-utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz;, - "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz;, + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "dev": true, "requires": { "big.js": "^5.2.2",
[atlas] 02/04: ATLAS-4713: docker setup updates to be in sync with component versions in project pom.xml
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit 4853487d9aa02a7121e4a01b39b6793819059aac Author: Madhan Neethiraj AuthorDate: Tue Nov 15 07:51:56 2022 -0800 ATLAS-4713: docker setup updates to be in sync with component versions in project pom.xml (cherry picked from commit 887ef24c5069c91fd1fb118d63c8ebca7f2978d5) --- dev-support/atlas-docker/.env | 4 ++-- dev-support/atlas-docker/scripts/atlas-hbase-application.properties | 2 +- dev-support/atlas-docker/scripts/atlas-hive-application.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-support/atlas-docker/.env b/dev-support/atlas-docker/.env index eb4906100..440be2a46 100644 --- a/dev-support/atlas-docker/.env +++ b/dev-support/atlas-docker/.env @@ -7,6 +7,6 @@ PROFILE=dist,external-hbase-solr ATLAS_VERSION=3.0.0-SNAPSHOT HADOOP_VERSION=3.3.0 HBASE_VERSION=2.3.3 -KAFKA_VERSION=2.5.0 +KAFKA_VERSION=2.8.1 HIVE_VERSION=3.1.2 -HIVE_HADOOP_VERSION=3.1.0 +HIVE_HADOOP_VERSION=3.1.1 diff --git a/dev-support/atlas-docker/scripts/atlas-hbase-application.properties b/dev-support/atlas-docker/scripts/atlas-hbase-application.properties index 8c5b9e088..268e5c8c4 100644 --- a/dev-support/atlas-docker/scripts/atlas-hbase-application.properties +++ b/dev-support/atlas-docker/scripts/atlas-hbase-application.properties @@ -17,7 +17,7 @@ # -atlas.rest.address=http://atlas-example.com:21000 +atlas.rest.address=http://atlas.example.com:21000 atlas.kafka.zookeeper.connect=atlas-zk.example.com:2181 atlas.kafka.bootstrap.servers=atlas-kafka.example.com:9092 diff --git a/dev-support/atlas-docker/scripts/atlas-hive-application.properties b/dev-support/atlas-docker/scripts/atlas-hive-application.properties index 8c5b9e088..268e5c8c4 100644 --- a/dev-support/atlas-docker/scripts/atlas-hive-application.properties +++ b/dev-support/atlas-docker/scripts/atlas-hive-application.properties @@ -17,7 +17,7 @@ # -atlas.rest.address=http://atlas-example.com:21000 +atlas.rest.address=http://atlas.example.com:21000 atlas.kafka.zookeeper.connect=atlas-zk.example.com:2181 atlas.kafka.bootstrap.servers=atlas-kafka.example.com:9092
[atlas] 04/04: ATLAS-3820: fix import-kafka.sh failures; updated docker setup for Kafka bridge
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit fcbc016451ae1a1dc996fbafe677a8a8806d764f Author: Madhan Neethiraj AuthorDate: Tue Nov 15 14:22:04 2022 -0800 ATLAS-3820: fix import-kafka.sh failures; updated docker setup for Kafka bridge (cherry picked from commit 2c2d9197e68b809198d6e9f1232473d1c2d9e960) --- addons/kafka-bridge/pom.xml| 72 +- addons/kafka-bridge/src/bin/import-kafka.sh| 18 +- .../org/apache/atlas/kafka/bridge/KafkaBridge.java | 2 +- dev-support/atlas-docker/.dockerignore | 1 + dev-support/atlas-docker/Dockerfile.atlas-kafka| 21 --- dev-support/atlas-docker/scripts/atlas-build.sh| 1 + .../atlas-kafka-application.properties}| 24 ++-- 7 files changed, 95 insertions(+), 44 deletions(-) diff --git a/addons/kafka-bridge/pom.xml b/addons/kafka-bridge/pom.xml index da653a766..093db7229 100644 --- a/addons/kafka-bridge/pom.xml +++ b/addons/kafka-bridge/pom.xml @@ -125,7 +125,7 @@ com.google.guava guava -12.0.1 +${guava.version} org.apache.hadoop @@ -223,6 +223,21 @@ atlas-common ${project.version} + + commons-collections + commons-collections + ${commons-collections.version} + + +commons-logging + commons-logging + ${commons-logging.version} + + +commons-lang + commons-lang + ${commons-lang.version} + org.apache.kafka kafka-clients @@ -233,11 +248,66 @@ jersey-multipart ${jersey.version} + + com.fasterxml.jackson.core + jackson-databind + ${jackson.databind.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson.version} + + +com.sun.jersey + jersey-bundle + ${jersey.version} + + + org.apache.hadoop + hadoop-auth + ${hadoop.version} + + +com.google.guava +guava +${guava.version
[atlas] branch master updated (d7a624244 -> fcbc01645)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git from d7a624244 ATLAS-2388: enabled InMemoryJAASConfigurationTest new 567ffb408 ATLAS-4445: fix import-hive.sh failure; updated hive version from 3.1.0 to 3.1.2 new 4853487d9 ATLAS-4713: docker setup updates to be in sync with component versions in project pom.xml new 7f9e980f6 ATLAS-4241: fix import-hbase errors new fcbc01645 ATLAS-3820: fix import-kafka.sh failures; updated docker setup for Kafka bridge The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: addons/hbase-bridge/pom.xml| 25 addons/hbase-bridge/src/bin/import-hbase.sh| 19 -- addons/hive-bridge/pom.xml | 5 -- addons/hive-bridge/src/bin/import-hive.sh | 4 +- addons/kafka-bridge/pom.xml| 72 +- addons/kafka-bridge/src/bin/import-kafka.sh| 18 +- .../org/apache/atlas/kafka/bridge/KafkaBridge.java | 2 +- dev-support/atlas-docker/.dockerignore | 1 + dev-support/atlas-docker/.env | 4 +- dev-support/atlas-docker/Dockerfile.atlas-kafka| 21 --- dev-support/atlas-docker/scripts/atlas-build.sh| 1 + .../scripts/atlas-hbase-application.properties | 2 +- .../scripts/atlas-hive-application.properties | 2 +- ...operties => atlas-kafka-application.properties} | 2 +- pom.xml| 2 +- 15 files changed, 137 insertions(+), 43 deletions(-) copy dev-support/atlas-docker/scripts/{atlas-hive-application.properties => atlas-kafka-application.properties} (94%)
[atlas] 03/04: ATLAS-4241: fix import-hbase errors
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit 7f9e980f6aee26523450fc40f7bfeb01a42842ab Author: Madhan Neethiraj AuthorDate: Tue Nov 15 16:46:56 2022 -0800 ATLAS-4241: fix import-hbase errors (cherry picked from commit da27bb1b497db7f234c66203255a3ded37af3631) --- addons/hbase-bridge/pom.xml | 25 + addons/hbase-bridge/src/bin/import-hbase.sh | 19 ++- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index 20063e8fa..ca598ab39 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -344,6 +344,16 @@ kafka-clients ${kafka.version} + + commons-collections + commons-collections + ${commons-collections.version} + + +commons-logging + commons-logging + ${commons-logging.version} + com.sun.jersey.contribs jersey-multipart @@ -364,6 +374,16 @@ jackson-annotations ${jackson.version} + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson.version} + commons-configuration commons-configuration @@ -374,6 +394,11 @@ jersey-json ${jersey.version} + +com.sun.jersey + jersey-bundle + ${jersey.version} + javax.ws.rs jsr311-api diff --git a/addons/hbase-bridge/src/bin/import-hbase.sh b/addons/hbase-bridge/src/bin/import-hbase.sh index a343036fa..8ae735034 100644 --- a/addons/hbase-bridge/src/bin/import-hbase.sh +++ b/addons/hbase-bridge/src/bin/import-hbase.sh @@ -97,8 +97,14 @@ fi HBASE_CP="${HBASE_CONF}" -for i in "${HBASE_HOME}/lib/"*.jar; do -HBASE_CP="${HBASE_CP}:$i" +# Multiple jars in HBASE_CP_EXCLUDE_LIST can be added using "\|" separator +# Ex: HBASE_CP_EXCLUDE_LIST="commons-configuration-1." +HBASE_CP_EXCLUDE_LIST="commons-configuration-1\|jersey-client" + +for i in "${HBASE_HOME}/lib/"*.jar "${HBASE_HOME}/lib/client-facing-thirdparty/"*.jar; do +if [ "`echo $i | grep -v \"$HBASE_CP_EXCLUDE_LIST\"`" == "$i" ]; then + HBASE_CP="${HBASE_CP}:$i" +fi done #Add hadoop conf in classpath @@ -110,11 +116,14 @@ elif [ $(command -v hadoop) ]; then HADOOP_CP=`hadoop classpath` echo $HADOOP_CP else -echo "Environment variable HADOOP_CLASSPATH or HADOOP_HOME need to be set" -exit 1 +echo "WARN: Environment variable HADOOP_CLASSPATH or HADOOP_HOME need to be set" fi -CP="${HBASE_CP}:${HADOOP_CP}:${ATLASCPPATH}" +if [ ! -z "$HADOOP_CP" ]; then + CP="${HBASE_CP}:${HADOOP_CP}:${ATLASCPPATH}" +else + CP="${HBASE_CP}:${ATLASCPPATH}" +fi # If running in cygwin, convert pathnames and classpath to Windows format. if [ "${CYGWIN}" == "true" ]
[atlas] 01/04: ATLAS-4445: fix import-hive.sh failure; updated hive version from 3.1.0 to 3.1.2
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit 567ffb4089f9f024049ad88a56faf3783ddd9258 Author: Madhan Neethiraj AuthorDate: Tue Nov 15 07:45:54 2022 -0800 ATLAS-4445: fix import-hive.sh failure; updated hive version from 3.1.0 to 3.1.2 (cherry picked from commit 1a5bf676218d371398e700c1a348a60c11c52867) --- addons/hive-bridge/pom.xml| 5 - addons/hive-bridge/src/bin/import-hive.sh | 4 ++-- pom.xml | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml index f777ca29a..35bd4e553 100755 --- a/addons/hive-bridge/pom.xml +++ b/addons/hive-bridge/pom.xml @@ -311,11 +311,6 @@ jersey-json ${jersey.version} - -javax.ws.rs -jsr311-api -${jsr.version} - diff --git a/addons/hive-bridge/src/bin/import-hive.sh b/addons/hive-bridge/src/bin/import-hive.sh index ebe6976f0..951be5ba2 100755 --- a/addons/hive-bridge/src/bin/import-hive.sh +++ b/addons/hive-bridge/src/bin/import-hive.sh @@ -92,9 +92,9 @@ fi HIVE_CP="${HIVE_CONF}" # Multiple jars in HIVE_CP_EXCLUDE_LIST can be added using "\|" separator -# Ex: HIVE_CP_EXCLUDE_LIST="javax.ws.rs-api\|jersey-multipart" +# Ex: HIVE_CP_EXCLUDE_LIST="jersey-multipart" # exclude log4j libs from hive classpath to avoid conflict -HIVE_CP_EXCLUDE_LIST="javax.ws.rs-api\|log4j-slf4j-impl\|log4j-1.2-api\|log4j-api\|log4j-core\|log4j-web" +HIVE_CP_EXCLUDE_LIST="log4j-slf4j-impl\|log4j-1.2-api\|log4j-api\|log4j-core\|log4j-web" for i in $(find "${HIVE_HOME}/lib/" -name "*.jar" | grep -v "$HIVE_CP_EXCLUDE_LIST"); do HIVE_CP="${HIVE_CP}:$i" diff --git a/pom.xml b/pom.xml index 727c66a33..496d2692e 100644 --- a/pom.xml +++ b/pom.xml @@ -744,7 +744,7 @@ ${hadoop.version} 3.3.0 2.3.3 -3.1.0 +3.1.2 0.8.1 4.5.13 4.4.13
[atlas] branch branch-2.0 updated (8ca041c98 -> 2c2d9197e)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git from 8ca041c98 ATLAS-2388: enabled InMemoryJAASConfigurationTest new 1a5bf6762 ATLAS-4445: fix import-hive.sh failure; updated hive version from 3.1.0 to 3.1.2 new 887ef24c5 ATLAS-4713: docker setup updates to be in sync with component versions in project pom.xml new da27bb1b4 ATLAS-4241: fix import-hbase errors new 2c2d9197e ATLAS-3820: fix import-kafka.sh failures; updated docker setup for Kafka bridge The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: addons/hbase-bridge/pom.xml| 25 addons/hbase-bridge/src/bin/import-hbase.sh| 19 -- addons/hive-bridge/pom.xml | 5 -- addons/hive-bridge/src/bin/import-hive.sh | 4 +- addons/kafka-bridge/pom.xml| 72 +- addons/kafka-bridge/src/bin/import-kafka.sh| 18 +- .../org/apache/atlas/kafka/bridge/KafkaBridge.java | 2 +- dev-support/atlas-docker/.dockerignore | 1 + dev-support/atlas-docker/.env | 8 +-- dev-support/atlas-docker/Dockerfile.atlas-kafka| 21 --- dev-support/atlas-docker/scripts/atlas-build.sh| 1 + .../scripts/atlas-hbase-application.properties | 2 +- .../scripts/atlas-hive-application.properties | 2 +- ...operties => atlas-kafka-application.properties} | 2 +- pom.xml| 2 +- 15 files changed, 139 insertions(+), 45 deletions(-) copy dev-support/atlas-docker/scripts/{atlas-hive-application.properties => atlas-kafka-application.properties} (94%)
[atlas] 04/04: ATLAS-3820: fix import-kafka.sh failures; updated docker setup for Kafka bridge
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 2c2d9197e68b809198d6e9f1232473d1c2d9e960 Author: Madhan Neethiraj AuthorDate: Tue Nov 15 14:22:04 2022 -0800 ATLAS-3820: fix import-kafka.sh failures; updated docker setup for Kafka bridge --- addons/kafka-bridge/pom.xml| 72 +- addons/kafka-bridge/src/bin/import-kafka.sh| 18 +- .../org/apache/atlas/kafka/bridge/KafkaBridge.java | 2 +- dev-support/atlas-docker/.dockerignore | 1 + dev-support/atlas-docker/Dockerfile.atlas-kafka| 21 --- dev-support/atlas-docker/scripts/atlas-build.sh| 1 + .../atlas-kafka-application.properties}| 24 ++-- 7 files changed, 95 insertions(+), 44 deletions(-) diff --git a/addons/kafka-bridge/pom.xml b/addons/kafka-bridge/pom.xml index 9ce22a757..31f5d5b3a 100644 --- a/addons/kafka-bridge/pom.xml +++ b/addons/kafka-bridge/pom.xml @@ -125,7 +125,7 @@ com.google.guava guava -12.0.1 +${guava.version} org.apache.hadoop @@ -223,6 +223,21 @@ atlas-common ${project.version} + + commons-collections + commons-collections + ${commons-collections.version} + + +commons-logging + commons-logging + ${commons-logging.version} + + +commons-lang + commons-lang + ${commons-lang.version} + org.apache.kafka kafka-clients @@ -233,11 +248,66 @@ jersey-multipart ${jersey.version} + + com.fasterxml.jackson.core + jackson-databind + ${jackson.databind.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson.version} + + +com.sun.jersey + jersey-bundle + ${jersey.version} + + + org.apache.hadoop + hadoop-auth + ${hadoop.version} + + +com.google.guava +guava +${guava.version} + + + org.apache.httpcomponents
[atlas] 02/04: ATLAS-4713: docker setup updates to be in sync with component versions in project pom.xml
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 887ef24c5069c91fd1fb118d63c8ebca7f2978d5 Author: Madhan Neethiraj AuthorDate: Tue Nov 15 07:51:56 2022 -0800 ATLAS-4713: docker setup updates to be in sync with component versions in project pom.xml --- dev-support/atlas-docker/.env | 8 .../atlas-docker/scripts/atlas-hbase-application.properties | 2 +- .../atlas-docker/scripts/atlas-hive-application.properties| 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-support/atlas-docker/.env b/dev-support/atlas-docker/.env index 19175c2ed..ca597ac04 100644 --- a/dev-support/atlas-docker/.env +++ b/dev-support/atlas-docker/.env @@ -1,12 +1,12 @@ BUILD_HOST_SRC=true SKIPTESTS=true GIT_URL=https://github.com/apache/atlas.git -BRANCH=release-2.2.0-rc1 +BRANCH=branch-2.0 PROFILE=dist,external-hbase-solr -ATLAS_VERSION=2.2.0 +ATLAS_VERSION=2.3.0-SNAPSHOT HADOOP_VERSION=3.3.0 HBASE_VERSION=2.3.3 -KAFKA_VERSION=2.5.0 +KAFKA_VERSION=2.8.1 HIVE_VERSION=3.1.2 -HIVE_HADOOP_VERSION=3.1.0 +HIVE_HADOOP_VERSION=3.1.1 diff --git a/dev-support/atlas-docker/scripts/atlas-hbase-application.properties b/dev-support/atlas-docker/scripts/atlas-hbase-application.properties index 8c5b9e088..268e5c8c4 100644 --- a/dev-support/atlas-docker/scripts/atlas-hbase-application.properties +++ b/dev-support/atlas-docker/scripts/atlas-hbase-application.properties @@ -17,7 +17,7 @@ # -atlas.rest.address=http://atlas-example.com:21000 +atlas.rest.address=http://atlas.example.com:21000 atlas.kafka.zookeeper.connect=atlas-zk.example.com:2181 atlas.kafka.bootstrap.servers=atlas-kafka.example.com:9092 diff --git a/dev-support/atlas-docker/scripts/atlas-hive-application.properties b/dev-support/atlas-docker/scripts/atlas-hive-application.properties index 8c5b9e088..268e5c8c4 100644 --- a/dev-support/atlas-docker/scripts/atlas-hive-application.properties +++ b/dev-support/atlas-docker/scripts/atlas-hive-application.properties @@ -17,7 +17,7 @@ # -atlas.rest.address=http://atlas-example.com:21000 +atlas.rest.address=http://atlas.example.com:21000 atlas.kafka.zookeeper.connect=atlas-zk.example.com:2181 atlas.kafka.bootstrap.servers=atlas-kafka.example.com:9092
[atlas] 01/04: ATLAS-4445: fix import-hive.sh failure; updated hive version from 3.1.0 to 3.1.2
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 1a5bf676218d371398e700c1a348a60c11c52867 Author: Madhan Neethiraj AuthorDate: Tue Nov 15 07:45:54 2022 -0800 ATLAS-4445: fix import-hive.sh failure; updated hive version from 3.1.0 to 3.1.2 --- addons/hive-bridge/pom.xml| 5 - addons/hive-bridge/src/bin/import-hive.sh | 4 ++-- pom.xml | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml index 856e5d95d..80a2252c5 100755 --- a/addons/hive-bridge/pom.xml +++ b/addons/hive-bridge/pom.xml @@ -311,11 +311,6 @@ jersey-json ${jersey.version} - -javax.ws.rs -jsr311-api -${jsr.version} - diff --git a/addons/hive-bridge/src/bin/import-hive.sh b/addons/hive-bridge/src/bin/import-hive.sh index ebe6976f0..951be5ba2 100755 --- a/addons/hive-bridge/src/bin/import-hive.sh +++ b/addons/hive-bridge/src/bin/import-hive.sh @@ -92,9 +92,9 @@ fi HIVE_CP="${HIVE_CONF}" # Multiple jars in HIVE_CP_EXCLUDE_LIST can be added using "\|" separator -# Ex: HIVE_CP_EXCLUDE_LIST="javax.ws.rs-api\|jersey-multipart" +# Ex: HIVE_CP_EXCLUDE_LIST="jersey-multipart" # exclude log4j libs from hive classpath to avoid conflict -HIVE_CP_EXCLUDE_LIST="javax.ws.rs-api\|log4j-slf4j-impl\|log4j-1.2-api\|log4j-api\|log4j-core\|log4j-web" +HIVE_CP_EXCLUDE_LIST="log4j-slf4j-impl\|log4j-1.2-api\|log4j-api\|log4j-core\|log4j-web" for i in $(find "${HIVE_HOME}/lib/" -name "*.jar" | grep -v "$HIVE_CP_EXCLUDE_LIST"); do HIVE_CP="${HIVE_CP}:$i" diff --git a/pom.xml b/pom.xml index ca221fe29..4cc2201c1 100644 --- a/pom.xml +++ b/pom.xml @@ -734,7 +734,7 @@ ${hadoop.version} 3.3.0 2.3.3 -3.1.0 +3.1.2 0.8.1 4.5.13 4.4.13
[atlas] 03/04: ATLAS-4241: fix import-hbase errors
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 da27bb1b497db7f234c66203255a3ded37af3631 Author: Madhan Neethiraj AuthorDate: Tue Nov 15 16:46:56 2022 -0800 ATLAS-4241: fix import-hbase errors --- addons/hbase-bridge/pom.xml | 25 + addons/hbase-bridge/src/bin/import-hbase.sh | 19 ++- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index f51a7d6f1..5a0f62fb3 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -344,6 +344,16 @@ kafka-clients ${kafka.version} + + commons-collections + commons-collections + ${commons-collections.version} + + +commons-logging + commons-logging + ${commons-logging.version} + com.sun.jersey.contribs jersey-multipart @@ -364,6 +374,16 @@ jackson-annotations ${jackson.version} + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson.version} + commons-configuration commons-configuration @@ -374,6 +394,11 @@ jersey-json ${jersey.version} + +com.sun.jersey + jersey-bundle + ${jersey.version} + javax.ws.rs jsr311-api diff --git a/addons/hbase-bridge/src/bin/import-hbase.sh b/addons/hbase-bridge/src/bin/import-hbase.sh index a343036fa..8ae735034 100644 --- a/addons/hbase-bridge/src/bin/import-hbase.sh +++ b/addons/hbase-bridge/src/bin/import-hbase.sh @@ -97,8 +97,14 @@ fi HBASE_CP="${HBASE_CONF}" -for i in "${HBASE_HOME}/lib/"*.jar; do -HBASE_CP="${HBASE_CP}:$i" +# Multiple jars in HBASE_CP_EXCLUDE_LIST can be added using "\|" separator +# Ex: HBASE_CP_EXCLUDE_LIST="commons-configuration-1." +HBASE_CP_EXCLUDE_LIST="commons-configuration-1\|jersey-client" + +for i in "${HBASE_HOME}/lib/"*.jar "${HBASE_HOME}/lib/client-facing-thirdparty/"*.jar; do +if [ "`echo $i | grep -v \"$HBASE_CP_EXCLUDE_LIST\"`" == "$i" ]; then + HBASE_CP="${HBASE_CP}:$i" +fi done #Add hadoop conf in classpath @@ -110,11 +116,14 @@ elif [ $(command -v hadoop) ]; then HADOOP_CP=`hadoop classpath` echo $HADOOP_CP else -echo "Environment variable HADOOP_CLASSPATH or HADOOP_HOME need to be set" -exit 1 +echo "WARN: Environment variable HADOOP_CLASSPATH or HADOOP_HOME need to be set" fi -CP="${HBASE_CP}:${HADOOP_CP}:${ATLASCPPATH}" +if [ ! -z "$HADOOP_CP" ]; then + CP="${HBASE_CP}:${HADOOP_CP}:${ATLASCPPATH}" +else + CP="${HBASE_CP}:${ATLASCPPATH}" +fi # If running in cygwin, convert pathnames and classpath to Windows format. if [ "${CYGWIN}" == "true" ]
[atlas] branch branch-2.0 updated: ATLAS-2388: enabled InMemoryJAASConfigurationTest
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 8ca041c98 ATLAS-2388: enabled InMemoryJAASConfigurationTest 8ca041c98 is described below commit 8ca041c982968fb1e769cd7ba20f9d342adebba3 Author: Peter Gergo Barna AuthorDate: Fri Mar 23 13:46:38 2018 +0100 ATLAS-2388: enabled InMemoryJAASConfigurationTest Signed-off-by: Madhan Neethiraj (cherry picked from commit d7a6242442085032a17bc60fd0b13bf62c3ebc1c) --- .../apache/atlas/security/InMemoryJAASConfigurationTest.java | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/intg/src/test/java/org/apache/atlas/security/InMemoryJAASConfigurationTest.java b/intg/src/test/java/org/apache/atlas/security/InMemoryJAASConfigurationTest.java index b0f24de52..71e00fe5f 100644 --- a/intg/src/test/java/org/apache/atlas/security/InMemoryJAASConfigurationTest.java +++ b/intg/src/test/java/org/apache/atlas/security/InMemoryJAASConfigurationTest.java @@ -27,8 +27,7 @@ import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.Configuration; -//Unstable test. Disabling -@Test(enabled=false) +@Test(enabled=true) public class InMemoryJAASConfigurationTest { private static final String ATLAS_JAAS_PROP_FILE = "atlas-jaas.properties"; @@ -38,7 +37,7 @@ public class InMemoryJAASConfigurationTest { InMemoryJAASConfiguration.init(ATLAS_JAAS_PROP_FILE); } -@Test(enabled=false) +@Test(enabled=true) public void testGetAppConfigurationEntryStringForKafkaClient() { AppConfigurationEntry[] entries = Configuration.getConfiguration().getAppConfigurationEntry("KafkaClient"); @@ -49,10 +48,9 @@ public class InMemoryJAASConfigurationTest { String[] components = principal.split("[/@]"); Assert.assertEquals(3, components.length); Assert.assertEquals(false, StringUtils.equalsIgnoreCase(components[1], "_HOST")); - } -@Test(enabled=false) +@Test(enabled=true) public void testGetAppConfigurationEntryStringForMyClient() { AppConfigurationEntry[] entries = Configuration.getConfiguration().getAppConfigurationEntry("myClient"); @@ -70,7 +68,7 @@ public class InMemoryJAASConfigurationTest { Assert.assertEquals(2, components.length); } -@Test(enabled=false) +@Test(enabled=true) public void testGetAppConfigurationEntryStringForUnknownClient() { AppConfigurationEntry[] entries = Configuration.getConfiguration().getAppConfigurationEntry("UnknownClient");
[atlas] branch master updated: ATLAS-2388: enabled InMemoryJAASConfigurationTest
This is an automated email from the ASF dual-hosted git repository. madhan 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 d7a624244 ATLAS-2388: enabled InMemoryJAASConfigurationTest d7a624244 is described below commit d7a6242442085032a17bc60fd0b13bf62c3ebc1c Author: Peter Gergo Barna AuthorDate: Fri Mar 23 13:46:38 2018 +0100 ATLAS-2388: enabled InMemoryJAASConfigurationTest Signed-off-by: Madhan Neethiraj --- .../apache/atlas/security/InMemoryJAASConfigurationTest.java | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/intg/src/test/java/org/apache/atlas/security/InMemoryJAASConfigurationTest.java b/intg/src/test/java/org/apache/atlas/security/InMemoryJAASConfigurationTest.java index b0f24de52..71e00fe5f 100644 --- a/intg/src/test/java/org/apache/atlas/security/InMemoryJAASConfigurationTest.java +++ b/intg/src/test/java/org/apache/atlas/security/InMemoryJAASConfigurationTest.java @@ -27,8 +27,7 @@ import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.Configuration; -//Unstable test. Disabling -@Test(enabled=false) +@Test(enabled=true) public class InMemoryJAASConfigurationTest { private static final String ATLAS_JAAS_PROP_FILE = "atlas-jaas.properties"; @@ -38,7 +37,7 @@ public class InMemoryJAASConfigurationTest { InMemoryJAASConfiguration.init(ATLAS_JAAS_PROP_FILE); } -@Test(enabled=false) +@Test(enabled=true) public void testGetAppConfigurationEntryStringForKafkaClient() { AppConfigurationEntry[] entries = Configuration.getConfiguration().getAppConfigurationEntry("KafkaClient"); @@ -49,10 +48,9 @@ public class InMemoryJAASConfigurationTest { String[] components = principal.split("[/@]"); Assert.assertEquals(3, components.length); Assert.assertEquals(false, StringUtils.equalsIgnoreCase(components[1], "_HOST")); - } -@Test(enabled=false) +@Test(enabled=true) public void testGetAppConfigurationEntryStringForMyClient() { AppConfigurationEntry[] entries = Configuration.getConfiguration().getAppConfigurationEntry("myClient"); @@ -70,7 +68,7 @@ public class InMemoryJAASConfigurationTest { Assert.assertEquals(2, components.length); } -@Test(enabled=false) +@Test(enabled=true) public void testGetAppConfigurationEntryStringForUnknownClient() { AppConfigurationEntry[] entries = Configuration.getConfiguration().getAppConfigurationEntry("UnknownClient");
[atlas] branch branch-2.0 updated: ATLAS-4707: updated loader-utils version from 1.4.0 to 1.4.1 - #2
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 5af989867 ATLAS-4707: updated loader-utils version from 1.4.0 to 1.4.1 - #2 5af989867 is described below commit 5af98986722e382a0d7dc6c4ed88a9869385d120 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Nov 8 15:46:46 2022 + ATLAS-4707: updated loader-utils version from 1.4.0 to 1.4.1 - #2 Signed-off-by: Madhan Neethiraj (cherry picked from commit 2135188cc8a6f24e4a879b1783433c9945fe7ec2) --- dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json | 6 +++--- dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json b/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json index 890350198..f5f1424c4 100644 --- a/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json +++ b/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json @@ -3641,9 +3641,9 @@ "dev": true }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz;, - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz;, + "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", "dev": true, "requires": { "big.js": "^5.2.2", diff --git a/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json b/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json index 890350198..f5f1424c4 100644 --- a/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json +++ b/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json @@ -3641,9 +3641,9 @@ "dev": true }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz;, - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz;, + "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", "dev": true, "requires": { "big.js": "^5.2.2",
[atlas] branch master updated: ATLAS-4707: updated loader-utils version from 1.4.0 to 1.4.1 - #2
This is an automated email from the ASF dual-hosted git repository. madhan 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 2135188cc ATLAS-4707: updated loader-utils version from 1.4.0 to 1.4.1 - #2 2135188cc is described below commit 2135188cc8a6f24e4a879b1783433c9945fe7ec2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Nov 8 15:46:46 2022 + ATLAS-4707: updated loader-utils version from 1.4.0 to 1.4.1 - #2 Signed-off-by: Madhan Neethiraj --- dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json | 6 +++--- dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json b/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json index 890350198..f5f1424c4 100644 --- a/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json +++ b/dashboardv2/public/js/external_lib/atlas-lineage/package-lock.json @@ -3641,9 +3641,9 @@ "dev": true }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz;, - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz;, + "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", "dev": true, "requires": { "big.js": "^5.2.2", diff --git a/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json b/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json index 890350198..f5f1424c4 100644 --- a/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json +++ b/dashboardv3/public/js/external_lib/atlas-lineage/package-lock.json @@ -3641,9 +3641,9 @@ "dev": true }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz;, - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz;, + "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", "dev": true, "requires": { "big.js": "^5.2.2",
[atlas] branch branch-2.0 updated: ATLAS-4709: Python client 0.0.12 release
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 6490db743 ATLAS-4709: Python client 0.0.12 release 6490db743 is described below commit 6490db743c148a6fbb57ef6c114d1584eb0cf0ed Author: Madhan Neethiraj AuthorDate: Tue Nov 8 10:38:13 2022 -0800 ATLAS-4709: Python client 0.0.12 release (cherry picked from commit d40c1b09f533bce6fd27e97489885c10887fe4ec) --- intg/src/main/python/README.md | 2 +- intg/src/main/python/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/intg/src/main/python/README.md b/intg/src/main/python/README.md index e38e28b63..802bf8eb7 100644 --- a/intg/src/main/python/README.md +++ b/intg/src/main/python/README.md @@ -16,7 +16,7 @@ Verify if apache-atlas client is installed: Package Version - -apache-atlas 0.0.11 +apache-atlas 0.0.12 ``` ## Usage diff --git a/intg/src/main/python/setup.py b/intg/src/main/python/setup.py index 35d79fed2..f0e16d0ca 100644 --- a/intg/src/main/python/setup.py +++ b/intg/src/main/python/setup.py @@ -28,7 +28,7 @@ with open("README.md", "r") as fh: setup( name='apache-atlas', -version='0.0.11', +version='0.0.12', author="Apache Atlas", author_email='d...@atlas.apache.org', description="Apache Atlas Python Client",
[atlas] branch master updated: ATLAS-4709: Python client 0.0.12 release
This is an automated email from the ASF dual-hosted git repository. madhan 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 d40c1b09f ATLAS-4709: Python client 0.0.12 release d40c1b09f is described below commit d40c1b09f533bce6fd27e97489885c10887fe4ec Author: Madhan Neethiraj AuthorDate: Tue Nov 8 10:38:13 2022 -0800 ATLAS-4709: Python client 0.0.12 release --- intg/src/main/python/README.md | 2 +- intg/src/main/python/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/intg/src/main/python/README.md b/intg/src/main/python/README.md index e38e28b63..802bf8eb7 100644 --- a/intg/src/main/python/README.md +++ b/intg/src/main/python/README.md @@ -16,7 +16,7 @@ Verify if apache-atlas client is installed: Package Version - -apache-atlas 0.0.11 +apache-atlas 0.0.12 ``` ## Usage diff --git a/intg/src/main/python/setup.py b/intg/src/main/python/setup.py index 35d79fed2..f0e16d0ca 100644 --- a/intg/src/main/python/setup.py +++ b/intg/src/main/python/setup.py @@ -28,7 +28,7 @@ with open("README.md", "r") as fh: setup( name='apache-atlas', -version='0.0.11', +version='0.0.12', author="Apache Atlas", author_email='d...@atlas.apache.org', description="Apache Atlas Python Client",
[atlas] 01/04: ATLAS-4704: Remove os.path.join causing incorrect windows path
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 956cac4b783741f4db93ce9bbeea99c6e49e2806 Author: Dov Benyomin Sohacheski AuthorDate: Wed Oct 19 08:44:00 2022 +0300 ATLAS-4704: Remove os.path.join causing incorrect windows path Signed-off-by: Madhan Neethiraj (cherry picked from commit b9ff08fee7646f10083da2f8672b932a34aa4a7f) --- intg/src/main/python/apache_atlas/client/base_client.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/intg/src/main/python/apache_atlas/client/base_client.py b/intg/src/main/python/apache_atlas/client/base_client.py index 2402611ce..bd52660e3 100644 --- a/intg/src/main/python/apache_atlas/client/base_client.py +++ b/intg/src/main/python/apache_atlas/client/base_client.py @@ -18,9 +18,9 @@ import copy import json import logging -import os from requests import Session +from urllib.parse import urljoin from apache_atlas.client.admin import AdminClient from apache_atlas.client.discovery import DiscoveryClient @@ -42,7 +42,7 @@ class AtlasClient: session = Session() session.auth = auth -self.host = host +self.host = host.rstrip('/') self.session = session self.request_params = {'headers': {}} self.typedef = TypeDefClient(self) @@ -57,7 +57,7 @@ class AtlasClient: def call_api(self, api, response_type=None, query_params=None, request_obj=None): params = copy.deepcopy(self.request_params) -path = os.path.join(self.host, api.path) +path = urljoin(self.host, api.path.lstrip('/')) params['headers']['Accept'] = api.consumes params['headers']['Content-type'] = api.produces
[atlas] 04/04: ATLAS-4706: code clean in the entity store v2 class
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 7cb38028564bdc4bb799e0c022504cbb574a562e Author: zhuangchong AuthorDate: Mon May 16 14:35:08 2022 +0800 ATLAS-4706: code clean in the entity store v2 class Signed-off-by: Madhan Neethiraj (cherry picked from commit f497d7224f5dd1fcb73c8523a800e2b6ae26c274) --- .../org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java index d0e95e462..656c9d14b 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java @@ -399,7 +399,7 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore { throw new AtlasBaseException(AtlasErrorCode.UNKNOWN_TYPENAME, objectId.getTypeName()); } -guid = AtlasGraphUtilsV2.getGuidByUniqueAttributes(graph, typeRegistry.getEntityTypeByName(objectId.getTypeName()), objectId.getUniqueAttributes()); +guid = AtlasGraphUtilsV2.getGuidByUniqueAttributes(graph, entityType, objectId.getUniqueAttributes()); } AtlasEntity entity = updatedEntityInfo.getEntity();
[atlas] 03/04: ATLAS-4705: Remove unnecessary single quote at the end of flink_model.json
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 5c2434ca396108378bd6c04e9ab8efc07f02fca1 Author: yanxu3 AuthorDate: Sun Nov 6 23:11:45 2022 -0800 ATLAS-4705: Remove unnecessary single quote at the end of flink_model.json Signed-off-by: Madhan Neethiraj (cherry picked from commit 4774ed61d5de579d3c9bad9162115e8c6cbb57a6) --- addons/models/1000-Hadoop/1110-flink_model.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/models/1000-Hadoop/1110-flink_model.json b/addons/models/1000-Hadoop/1110-flink_model.json index 029600fa3..35c0af1ba 100644 --- a/addons/models/1000-Hadoop/1110-flink_model.json +++ b/addons/models/1000-Hadoop/1110-flink_model.json @@ -103,4 +103,4 @@ "propagateTags": "NONE" } ] -}' \ No newline at end of file +}
[atlas] 02/04: ATLAS-4676: do not expect response body to be a valid JSON
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 0ccd96aa047a95fa754e0893d9b829c74c9a5e15 Author: Maxim Martynov AuthorDate: Fri Sep 16 17:32:39 2022 +0300 ATLAS-4676: do not expect response body to be a valid JSON Signed-off-by: Madhan Neethiraj (cherry picked from commit a43ed6c11d3ca3c8a63b86981c3241365eb60b79) --- intg/src/main/python/apache_atlas/exceptions.py | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/intg/src/main/python/apache_atlas/exceptions.py b/intg/src/main/python/apache_atlas/exceptions.py index 092a45f3e..812ba1fbd 100644 --- a/intg/src/main/python/apache_atlas/exceptions.py +++ b/intg/src/main/python/apache_atlas/exceptions.py @@ -26,15 +26,14 @@ class AtlasServiceException(Exception): """ def __init__(self, api, response): -msg = "" +body = "" -if api: -msg = "Metadata service API {method} : {path} failed".format(**{'method': api.method, 'path': api.path}) +if response.content: +try: +body = response.json() +except Exception: +body = response.content -if response.content is not None: -status = response.status_code if response.status_code is not None else -1 -msg = "Metadata service API with url {url} and method {method} : failed with status {status} and " \ - "Response Body is :{response}". \ -format(**{'url': response.url, 'method': api.method, 'status': status, 'response': response.json()}) +msg = "Metadata service API {method} {path} failed with status {status}. Response body is: {body}".format(**{'method': api.method, 'path': api.path, 'status': response.status_code, 'body': body}) Exception.__init__(self, msg)
[atlas] branch branch-2.0 updated (5ff630a0b -> 7cb380285)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git from 5ff630a0b ATLAS-4642: replace use of static volatile member from plugin classloader new 956cac4b7 ATLAS-4704: Remove os.path.join causing incorrect windows path new 0ccd96aa0 ATLAS-4676: do not expect response body to be a valid JSON new 5c2434ca3 ATLAS-4705: Remove unnecessary single quote at the end of flink_model.json new 7cb380285 ATLAS-4706: code clean in the entity store v2 class The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: addons/models/1000-Hadoop/1110-flink_model.json | 2 +- intg/src/main/python/apache_atlas/client/base_client.py | 6 +++--- intg/src/main/python/apache_atlas/exceptions.py | 15 +++ .../repository/store/graph/v2/AtlasEntityStoreV2.java | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-)
[atlas] 04/04: ATLAS-4706: code clean in the entity store v2 class
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit f497d7224f5dd1fcb73c8523a800e2b6ae26c274 Author: zhuangchong AuthorDate: Mon May 16 14:35:08 2022 +0800 ATLAS-4706: code clean in the entity store v2 class Signed-off-by: Madhan Neethiraj --- .../org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java index d0e95e462..656c9d14b 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java @@ -399,7 +399,7 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore { throw new AtlasBaseException(AtlasErrorCode.UNKNOWN_TYPENAME, objectId.getTypeName()); } -guid = AtlasGraphUtilsV2.getGuidByUniqueAttributes(graph, typeRegistry.getEntityTypeByName(objectId.getTypeName()), objectId.getUniqueAttributes()); +guid = AtlasGraphUtilsV2.getGuidByUniqueAttributes(graph, entityType, objectId.getUniqueAttributes()); } AtlasEntity entity = updatedEntityInfo.getEntity();
[atlas] 02/04: ATLAS-4676: do not expect response body to be a valid JSON
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit a43ed6c11d3ca3c8a63b86981c3241365eb60b79 Author: Maxim Martynov AuthorDate: Fri Sep 16 17:32:39 2022 +0300 ATLAS-4676: do not expect response body to be a valid JSON Signed-off-by: Madhan Neethiraj --- intg/src/main/python/apache_atlas/exceptions.py | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/intg/src/main/python/apache_atlas/exceptions.py b/intg/src/main/python/apache_atlas/exceptions.py index 092a45f3e..812ba1fbd 100644 --- a/intg/src/main/python/apache_atlas/exceptions.py +++ b/intg/src/main/python/apache_atlas/exceptions.py @@ -26,15 +26,14 @@ class AtlasServiceException(Exception): """ def __init__(self, api, response): -msg = "" +body = "" -if api: -msg = "Metadata service API {method} : {path} failed".format(**{'method': api.method, 'path': api.path}) +if response.content: +try: +body = response.json() +except Exception: +body = response.content -if response.content is not None: -status = response.status_code if response.status_code is not None else -1 -msg = "Metadata service API with url {url} and method {method} : failed with status {status} and " \ - "Response Body is :{response}". \ -format(**{'url': response.url, 'method': api.method, 'status': status, 'response': response.json()}) +msg = "Metadata service API {method} {path} failed with status {status}. Response body is: {body}".format(**{'method': api.method, 'path': api.path, 'status': response.status_code, 'body': body}) Exception.__init__(self, msg)
[atlas] 01/04: ATLAS-4704: Remove os.path.join causing incorrect windows path
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit b9ff08fee7646f10083da2f8672b932a34aa4a7f Author: Dov Benyomin Sohacheski AuthorDate: Wed Oct 19 08:44:00 2022 +0300 ATLAS-4704: Remove os.path.join causing incorrect windows path Signed-off-by: Madhan Neethiraj --- intg/src/main/python/apache_atlas/client/base_client.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/intg/src/main/python/apache_atlas/client/base_client.py b/intg/src/main/python/apache_atlas/client/base_client.py index 2402611ce..bd52660e3 100644 --- a/intg/src/main/python/apache_atlas/client/base_client.py +++ b/intg/src/main/python/apache_atlas/client/base_client.py @@ -18,9 +18,9 @@ import copy import json import logging -import os from requests import Session +from urllib.parse import urljoin from apache_atlas.client.admin import AdminClient from apache_atlas.client.discovery import DiscoveryClient @@ -42,7 +42,7 @@ class AtlasClient: session = Session() session.auth = auth -self.host = host +self.host = host.rstrip('/') self.session = session self.request_params = {'headers': {}} self.typedef = TypeDefClient(self) @@ -57,7 +57,7 @@ class AtlasClient: def call_api(self, api, response_type=None, query_params=None, request_obj=None): params = copy.deepcopy(self.request_params) -path = os.path.join(self.host, api.path) +path = urljoin(self.host, api.path.lstrip('/')) params['headers']['Accept'] = api.consumes params['headers']['Content-type'] = api.produces
[atlas] branch master updated (a0a5c596f -> f497d7224)
This is an automated email from the ASF dual-hosted git repository. madhan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git from a0a5c596f ATLAS-4692: upgraded Apache Commons Text to 1.10.0 new b9ff08fee ATLAS-4704: Remove os.path.join causing incorrect windows path new a43ed6c11 ATLAS-4676: do not expect response body to be a valid JSON new 4774ed61d ATLAS-4706: Remove unnecessary single quote at the end of flink_model.json new f497d7224 ATLAS-4706: code clean in the entity store v2 class The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: addons/models/1000-Hadoop/1110-flink_model.json | 2 +- intg/src/main/python/apache_atlas/client/base_client.py | 6 +++--- intg/src/main/python/apache_atlas/exceptions.py | 15 +++ .../repository/store/graph/v2/AtlasEntityStoreV2.java | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-)
[atlas] 03/04: ATLAS-4706: Remove unnecessary single quote at the end of flink_model.json
This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git commit 4774ed61d5de579d3c9bad9162115e8c6cbb57a6 Author: yanxu3 AuthorDate: Sun Nov 6 23:11:45 2022 -0800 ATLAS-4706: Remove unnecessary single quote at the end of flink_model.json Signed-off-by: Madhan Neethiraj --- addons/models/1000-Hadoop/1110-flink_model.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/models/1000-Hadoop/1110-flink_model.json b/addons/models/1000-Hadoop/1110-flink_model.json index 029600fa3..35c0af1ba 100644 --- a/addons/models/1000-Hadoop/1110-flink_model.json +++ b/addons/models/1000-Hadoop/1110-flink_model.json @@ -103,4 +103,4 @@ "propagateTags": "NONE" } ] -}' \ No newline at end of file +}
[atlas] branch branch-2.0 updated: ATLAS-4642: replace use of static volatile member from plugin classloader
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 The following commit(s) were added to refs/heads/branch-2.0 by this push: new 5ff630a0b ATLAS-4642: replace use of static volatile member from plugin classloader 5ff630a0b is described below commit 5ff630a0b6dd5a1a35b75bc4cf8c0213ee341d0a Author: Madhan Neethiraj AuthorDate: Tue Feb 22 23:13:51 2022 -0800 ATLAS-4642: replace use of static volatile member from plugin classloader (cherry picked from commit 218dd81db9f3ea87f75833bee6acee1c70e2b1df) --- .../plugin/classloader/AtlasPluginClassLoader.java | 36 ++ .../classloader/AtlasPluginClassLoaderUtil.java| 10 +++--- .../classloader/AtlasPluginClassLoaderTest.java| 2 +- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/plugin-classloader/src/main/java/org/apache/atlas/plugin/classloader/AtlasPluginClassLoader.java b/plugin-classloader/src/main/java/org/apache/atlas/plugin/classloader/AtlasPluginClassLoader.java index fc75a7ebc..0a71bf160 100644 --- a/plugin-classloader/src/main/java/org/apache/atlas/plugin/classloader/AtlasPluginClassLoader.java +++ b/plugin-classloader/src/main/java/org/apache/atlas/plugin/classloader/AtlasPluginClassLoader.java @@ -30,6 +30,8 @@ import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; /** * AtlasPluginClassLoader to use plugin classpath first, before component classpath. @@ -37,39 +39,43 @@ import java.util.Enumeration; public final class AtlasPluginClassLoader extends URLClassLoader { private static final Logger LOG = LoggerFactory.getLogger(AtlasPluginClassLoader.class); -private static volatile AtlasPluginClassLoader me = null; +private static final Map pluginClassLoaders = new HashMap<>(); private final ThreadLocal preActivateClassLoader = new ThreadLocal<>(); - -private final MyClassLoader componentClassLoader; +private final MyClassLoadercomponentClassLoader; private AtlasPluginClassLoader(String pluginType, Class pluginClass) throws URISyntaxException { -this(AtlasPluginClassLoaderUtil.getPluginImplLibPath(pluginType, pluginClass)); +this(AtlasPluginClassLoaderUtil.getPluginImplLibPath(pluginType, pluginClass), pluginClass); } //visible for testing -AtlasPluginClassLoader(String libraryPath) { -super(AtlasPluginClassLoaderUtil.getFilesInDirectories(new String[]{libraryPath}), null); +AtlasPluginClassLoader(String[] libraryPath, Class pluginShimClass) { +super(AtlasPluginClassLoaderUtil.getFilesInDirectories(libraryPath), null); componentClassLoader = AccessController.doPrivileged(new PrivilegedAction() { public MyClassLoader run() { -return new MyClassLoader(Thread.currentThread().getContextClassLoader()); +return new MyClassLoader(pluginShimClass); } }); } public static AtlasPluginClassLoader getInstance(final String pluginType, final Class pluginClass) throws PrivilegedActionException { -AtlasPluginClassLoader ret = me; +AtlasPluginClassLoader ret = pluginClassLoaders.get(pluginType); + if (ret == null) { synchronized (AtlasPluginClassLoader.class) { -ret = me; +ret = pluginClassLoaders.get(pluginType); + if (ret == null) { - me = AccessController.doPrivileged(new PrivilegedExceptionAction() { + ret = AccessController.doPrivileged(new PrivilegedExceptionAction() { public AtlasPluginClassLoader run() throws URISyntaxException { return new AtlasPluginClassLoader(pluginType, pluginClass); } }); -ret = me; + +if (ret != null) { +pluginClassLoaders.put(pluginType, ret); +} } } } @@ -332,13 +338,17 @@ public final class AtlasPluginClassLoader extends URLClassLoader { } static class MyClassLoader extends ClassLoader { -public MyClassLoader(ClassLoader realClassLoader) { -super(realClassLoader); +public MyClassLoader(Class pluginShimClass) { +super(getParentClassLoaderToUse(pluginShimClass)); } @Override public Class findClass(String name) throws ClassNotFoundException { //NOPMD return super.findClass(name); } + +private static