You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2026/02/13 04:22:00 UTC

(atlas) branch atlas-2.5 updated (e27501f66 -> b77decb1b)

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

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


    from e27501f66 ATLAS-5200: updated HBase version to 2.6.4; replaced hbase library dependencies with shaded version (#514)
     new 209fed413 ATLAS-5204: fix flaky test InMemoryAuditRepositoryTest.testDeleteEventsV2() (#515)
     new b77decb1b ATLAS-5217: updated atlas-testtools dependency scope to test (#522)

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:
 pom.xml                                                |  6 ------
 repository/pom.xml                                     |  1 +
 .../repository/audit/AuditRepositoryTestBase.java      |  6 ++++--
 test-tools/pom.xml                                     |  6 ------
 webapp/pom.xml                                         | 18 ++++++++----------
 5 files changed, 13 insertions(+), 24 deletions(-)


(atlas) 01/02: ATLAS-5204: fix flaky test InMemoryAuditRepositoryTest.testDeleteEventsV2() (#515)

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 209fed413a66b2c4c4b518ce1b527b14c7d0e584
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Thu Feb 12 18:36:06 2026 -0800

    ATLAS-5204: fix flaky test InMemoryAuditRepositoryTest.testDeleteEventsV2() (#515)
    
    (cherry picked from commit e9ace5950f752dcf7c8ba9556e8468a3be73af63)
---
 .../org/apache/atlas/repository/audit/AuditRepositoryTestBase.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/repository/src/test/java/org/apache/atlas/repository/audit/AuditRepositoryTestBase.java b/repository/src/test/java/org/apache/atlas/repository/audit/AuditRepositoryTestBase.java
index 332e05b85..82f5862cc 100644
--- a/repository/src/test/java/org/apache/atlas/repository/audit/AuditRepositoryTestBase.java
+++ b/repository/src/test/java/org/apache/atlas/repository/audit/AuditRepositoryTestBase.java
@@ -188,7 +188,9 @@ public class AuditRepositoryTestBase {
     public void testDeleteEventsV2() throws Exception {
         String      id1       = "id1" + rand();
         int         ttlInDays = 1;
-        long        ts        = System.currentTimeMillis() - (ttlInDays * DateUtils.MILLIS_PER_DAY);
+        long        now       = System.currentTimeMillis();
+        long        bufferMs  = 5 * DateUtils.MILLIS_PER_MINUTE; // buffer to avoid failure in TTL based delete in env with faster/lightly-loaded env
+        long        ts        = now - (ttlInDays * DateUtils.MILLIS_PER_DAY) - bufferMs;
         AtlasEntity entity    = new AtlasEntity(rand());
 
         int                      j              = 0;
@@ -231,7 +233,7 @@ public class AuditRepositoryTestBase {
         assertNotEquals(remainingEvents.get(3), events.get(0));
         assertFalse(remainingEvents.contains(events.get(0)));
 
-        EntityAuditEventV2 latestEvent = new EntityAuditEventV2(id1, System.currentTimeMillis(), "User-b", EntityAuditEventV2.EntityAuditActionV2.ENTITY_DELETE, "details" + j++, entity);
+        EntityAuditEventV2 latestEvent = new EntityAuditEventV2(id1, now, "User-b", EntityAuditEventV2.EntityAuditActionV2.ENTITY_DELETE, "details" + j++, entity);
         eventRepository.putEventsV2(latestEvent);
         List<EntityAuditEventV2> allEvents = eventRepository.listEventsV2(id1, null, "timestamp", false, 0, (short) -1);
 


(atlas) 02/02: ATLAS-5217: updated atlas-testtools dependency scope to test (#522)

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit b77decb1ba7c05ddc8026d3312714e98d97124d7
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Thu Feb 12 20:17:36 2026 -0800

    ATLAS-5217: updated atlas-testtools dependency scope to test (#522)
    
    (cherry picked from commit ca244f6e614098e78b3b19991826a8ab4f89ee7e)
---
 pom.xml            |  6 ------
 repository/pom.xml |  1 +
 test-tools/pom.xml |  6 ------
 webapp/pom.xml     | 18 ++++++++----------
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 68dea329c..72c6336a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -900,12 +900,6 @@
                 <version>${slf4j.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>log4j-over-slf4j</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-
             <!-- Logging -->
             <dependency>
                 <groupId>org.slf4j</groupId>
diff --git a/repository/pom.xml b/repository/pom.xml
index 25b3b46fd..135ac4af1 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -403,6 +403,7 @@
                     <groupId>org.apache.atlas</groupId>
                     <artifactId>atlas-testtools</artifactId>
                     <version>${project.version}</version>
+                    <scope>test</scope>
                     <exclusions>
                         <exclusion>
                             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/test-tools/pom.xml b/test-tools/pom.xml
index 5c278eee4..b3380db97 100644
--- a/test-tools/pom.xml
+++ b/test-tools/pom.xml
@@ -121,12 +121,6 @@
             <version>1.13</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index a249ffc04..97c8a6f83 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -212,12 +212,6 @@
             <artifactId>atlas-server-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.atlas</groupId>
-            <artifactId>atlas-testtools</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
@@ -388,10 +382,6 @@
             <artifactId>mockito-all</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-        </dependency>
         <!-- Required for Spring configuration processing -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -480,6 +470,14 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.atlas</groupId>
+            <artifactId>atlas-testtools</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>