[archiva] branch archiva-2.x updated: upgrade to redback 2.6.2 (#77)

[olamy]

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

olamy pushed a commit to branch archiva-2.x
in repository https://gitbox.apache.org/repos/asf/archiva.git


The following commit(s) were added to refs/heads/archiva-2.x by this push:
     new 9077002f1 upgrade to redback 2.6.2 (#77)
9077002f1 is described below

commit 9077002f127b39998921e407139d0eb92bfe4db2
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sun Apr 17 09:57:12 2022 +1000

    upgrade to redback 2.6.2 (#77)
    
    * upgrade to redback 2.6.2
    
    Signed-off-by: Olivier Lamy <ol...@apache.org>
    
    * cleanup index if existing
    
    Signed-off-by: Olivier Lamy <ol...@apache.org>
---
 .../ArchivaRepositoryScanningTaskExecutorAbstractTest.java       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git 
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
 
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
index 1698f078a..3a9f2160d 100644
--- 
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
+++ 
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
@@ -96,15 +96,12 @@ public abstract class 
ArchivaRepositoryScanningTaskExecutorAbstractTest
         // set the timestamps to a time well in the past
         Calendar cal = Calendar.getInstance();
         cal.add( Calendar.YEAR, -1 );
-        for ( File f : (List<File>) FileUtils.getFiles( repoDir, "**", null ) )
+        for ( File f : FileUtils.getFiles( repoDir, "**", null ) )
         {
             f.setLastModified( cal.getTimeInMillis() );
         }
-        // TODO: test they are excluded instead
-        for ( String dir : (List<String>) FileUtils.getDirectoryNames( 
repoDir, "**/.svn", null, false ) )
-        {
-            FileUtils.deleteDirectory( new File( repoDir, dir ) );
-        }
+
+        FileUtils.deleteDirectory(new File(repoDir, ".indexer"));
 
         assertTrue( "Default Test Repository should exist.", repoDir.exists() 
&& repoDir.isDirectory() );