You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2018/03/30 13:08:40 UTC

[1/4] archiva git commit: Removing NexusIndexer references

Repository: archiva
Updated Branches:
  refs/heads/master 9cd3c6134 -> 385985032


Removing NexusIndexer references


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/ee953f8d
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/ee953f8d
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/ee953f8d

Branch: refs/heads/master
Commit: ee953f8d131ef04bcc17ca1fe3263b3c4bd333aa
Parents: 9cd3c61
Author: Martin Stockhammer <ma...@apache.org>
Authored: Fri Mar 30 12:47:39 2018 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Fri Mar 30 12:47:39 2018 +0200

----------------------------------------------------------------------
 .../core/AbstractArtifactConsumerTest.java         | 17 -----------------
 .../repository/AbstractRepositoryPurgeTest.java    | 15 ---------------
 ...leanupReleasedSnapshotsRepositoryPurgeTest.java |  2 --
 3 files changed, 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/ee953f8d/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java
index b473b1d..dae8575 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java
@@ -27,9 +27,6 @@ import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
 import org.apache.archiva.consumers.functors.ConsumerWantsFilePredicate;
 import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.index.NexusIndexer;
-import org.apache.maven.index.context.IndexingContext;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,7 +34,6 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 
 import javax.inject.Inject;
-
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -58,9 +54,6 @@ public abstract class AbstractArtifactConsumerTest
     @Inject
     ArchivaConfiguration archivaConfiguration;
 
-    @Inject
-    protected NexusIndexer nexusIndexer;
-
 
     @Before
     public void setUp()
@@ -74,16 +67,6 @@ public abstract class AbstractArtifactConsumerTest
         repoLocation = Paths.get( "target/test-" + getName() + "/test-repo" );
     }
 
-    @After
-    public void tearDown()
-        throws Exception
-    {
-        for ( IndexingContext indexingContext : nexusIndexer.getIndexingContexts().values() )
-        {
-            nexusIndexer.removeIndexingContext( indexingContext, false );
-        }
-    }
-
 
     @Test
     public void testConsumption()

http://git-wip-us.apache.org/repos/asf/archiva/blob/ee953f8d/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
index 345d257..d02e99e 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
@@ -110,17 +110,12 @@ public abstract class AbstractRepositoryPurgeTest
     @Inject
     protected ApplicationContext applicationContext;
 
-    @Inject
-    protected NexusIndexer nexusIndexer;
-
 
     @Before
     public void setUp()
         throws Exception
     {
 
-        removeMavenIndexes();
-
         listenerControl = EasyMock.createControl();
 
         listener = listenerControl.createMock( RepositoryListener.class );
@@ -136,20 +131,11 @@ public abstract class AbstractRepositoryPurgeTest
     public void tearDown()
         throws Exception
     {
-        removeMavenIndexes();
         config = null;
         repo = null;
 
     }
 
-    protected void removeMavenIndexes()
-        throws Exception
-    {
-        for ( IndexingContext indexingContext : nexusIndexer.getIndexingContexts().values() )
-        {
-            nexusIndexer.removeIndexingContext( indexingContext, false );
-        }
-    }
 
     protected static String fixPath( String path )
     {
@@ -214,7 +200,6 @@ public abstract class AbstractRepositoryPurgeTest
     protected String prepareTestRepos()
         throws Exception
     {
-        removeMavenIndexes();
         Path testDir = Paths.get( AbstractRepositoryPurgeTest.fixPath( getTestRepoRoot().toAbsolutePath().toString() ) );
         org.apache.archiva.common.utils.FileUtils.deleteDirectory( testDir );
         Path sourceDir = Paths.get( Paths.get( "target/test-classes/" + TEST_REPO_ID ).toAbsolutePath().toString() );

http://git-wip-us.apache.org/repos/asf/archiva/blob/ee953f8d/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
index 1ef4bf9..2ee46ed 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
@@ -98,7 +98,6 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
 
         ( (DefaultManagedRepositoryAdmin) applicationContext.getBean(
             ManagedRepositoryAdmin.class ) ).setArchivaConfiguration( archivaConfiguration );
-        removeMavenIndexes();
     }
 
     @Test
@@ -106,7 +105,6 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
         throws Exception
     {
         RepositoryRegistry repositoryRegistry = applicationContext.getBean( RepositoryRegistry.class );
-        ManagedRepository managedRepository = repositoryRegistry.getManagedRepository( TEST_REPO_ID );
         repositoryRegistry.removeRepository( TEST_REPO_ID );
         repositoryRegistry.putRepository(
             getRepoConfiguration( TEST_REPO_ID, TEST_REPO_NAME ));


[4/4] archiva git commit: Switching to ubuntu:xenial

Posted by ma...@apache.org.
Switching to ubuntu:xenial


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/38598503
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/38598503
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/38598503

Branch: refs/heads/master
Commit: 385985032ca3037cb531b231557f5ec4f3102c0d
Parents: 42376e8
Author: Martin Stockhammer <ma...@apache.org>
Authored: Fri Mar 30 15:07:38 2018 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Fri Mar 30 15:07:38 2018 +0200

----------------------------------------------------------------------
 src/ci/docker/webtest/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/38598503/src/ci/docker/webtest/Dockerfile
----------------------------------------------------------------------
diff --git a/src/ci/docker/webtest/Dockerfile b/src/ci/docker/webtest/Dockerfile
index 8a7c2d0..4c5a729 100644
--- a/src/ci/docker/webtest/Dockerfile
+++ b/src/ci/docker/webtest/Dockerfile
@@ -23,7 +23,7 @@
 #  Currently only chrome browser is installed into the image.
 #  Uses selenium version 2.53.1
 
-FROM ubuntu:yakkety
+FROM ubuntu:xenial
 MAINTAINER Apache Archiva <de...@archiva.apache.org>
 
 ENV DEBIAN_FRONTEND noninteractive


[2/4] archiva git commit: Changing log statement

Posted by ma...@apache.org.
Changing log statement


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/4ca2dc8f
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/4ca2dc8f
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/4ca2dc8f

Branch: refs/heads/master
Commit: 4ca2dc8ff9e56e6df60aec4a0f4cd274587bcd52
Parents: ee953f8
Author: Martin Stockhammer <ma...@apache.org>
Authored: Fri Mar 30 12:47:58 2018 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Fri Mar 30 12:47:58 2018 +0200

----------------------------------------------------------------------
 .../archiva/indexer/maven/search/MavenRepositorySearch.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/4ca2dc8f/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java
index c861a9b..4ae2529 100644
--- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/search/MavenRepositorySearch.java
@@ -256,10 +256,10 @@ public class MavenRepositorySearch
         {
             throw new RepositorySearchException( "No search fields set." );
         }
-        System.err.println("CLAUSES "+q.getClauses());
         if (q.getClauses()!=null) {
+            log.debug("CLAUSES ", q.getClauses());
             for (BooleanClause cl : q.getClauses()) {
-                System.err.println("Clause "+cl);
+                log.debug("Clause ",cl);
             }
         }
 


[3/4] archiva git commit: Removing unused dependencies

Posted by ma...@apache.org.
Removing unused dependencies


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/42376e8f
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/42376e8f
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/42376e8f

Branch: refs/heads/master
Commit: 42376e8fbf5e26d3c5ec75bb668230c9e56b070a
Parents: 4ca2dc8
Author: Martin Stockhammer <ma...@apache.org>
Authored: Fri Mar 30 13:41:05 2018 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Fri Mar 30 13:41:05 2018 +0200

----------------------------------------------------------------------
 .../core/repository/AbstractRepositoryPurgeTest.java    |  2 --
 .../archiva/consumers/lucene/NexusIndexerConsumer.java  |  6 +-----
 .../src/main/resources/META-INF/spring-context.xml      |  5 -----
 .../consumers/lucene/NexusIndexerConsumerTest.java      | 12 ++++++------
 .../indexer/merger/TemporaryGroupIndexCleaner.java      | 10 ++--------
 5 files changed, 9 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/42376e8f/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
index d02e99e..27173cf 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
@@ -32,8 +32,6 @@ import org.apache.archiva.repository.features.ArtifactCleanupFeature;
 import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.index.NexusIndexer;
-import org.apache.maven.index.context.IndexingContext;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 import org.junit.After;

http://git-wip-us.apache.org/repos/asf/archiva/blob/42376e8f/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
index 6cadd27..efd5e7e 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
@@ -19,7 +19,6 @@ package org.apache.archiva.consumers.lucene;
  * under the License.
  */
 
-import org.apache.archiva.admin.model.RepositoryAdminException;
 import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
 import org.apache.archiva.common.utils.PathUtil;
 import org.apache.archiva.configuration.ArchivaConfiguration;
@@ -80,8 +79,6 @@ public class NexusIndexerConsumer
 
     private IndexingContext indexingContext;
 
-    private NexusIndexer nexusIndexer;
-
     private List<String> includes = new ArrayList<>( 0 );
 
     private ManagedRepository repository;
@@ -94,12 +91,11 @@ public class NexusIndexerConsumer
     public NexusIndexerConsumer(
         @Named( value = "archivaTaskScheduler#indexing" ) ArchivaTaskScheduler<ArtifactIndexingTask> scheduler,
         @Named( value = "archivaConfiguration" ) ArchivaConfiguration configuration, FileTypes filetypes,
-        List<IndexCreator> indexCreators, ManagedRepositoryAdmin managedRepositoryAdmin, NexusIndexer nexusIndexer )
+        List<IndexCreator> indexCreators, ManagedRepositoryAdmin managedRepositoryAdmin)
     {
         this.configuration = configuration;
         this.filetypes = filetypes;
         this.scheduler = scheduler;
-        this.nexusIndexer = nexusIndexer;
         this.allIndexCreators = indexCreators;
         this.managedRepositoryAdmin = managedRepositoryAdmin;
     }

http://git-wip-us.apache.org/repos/asf/archiva/blob/42376e8f/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml
index a93c21a..0609595 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/resources/META-INF/spring-context.xml
@@ -32,9 +32,4 @@
 
   <alias name="knownRepositoryContentConsumer#index-content" alias="indexerConsumer"/>
 
-  <bean id="logger" class="org.apache.archiva.common.utils.Slf4JPlexusLogger">
-    <constructor-arg type="java.lang.Class">
-      <value>org.apache.maven.index.DefaultNexusIndexer</value>
-    </constructor-arg>
-  </bean>
 </beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/archiva/blob/42376e8f/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
index 2efebfb..d0fcada 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
@@ -31,7 +31,6 @@ import org.apache.archiva.repository.RepositoryRegistry;
 import org.apache.archiva.scheduler.ArchivaTaskScheduler;
 import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
 import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
-import org.apache.maven.index.NexusIndexer;
 import org.apache.maven.index.context.IndexCreator;
 import org.junit.After;
 import org.junit.Before;
@@ -46,7 +45,11 @@ import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * NexusIndexerConsumerTest
@@ -97,9 +100,6 @@ public class NexusIndexerConsumerTest
     private ApplicationContext applicationContext;
 
     @Inject
-    private NexusIndexer nexusIndexer;
-
-    @Inject
     private List<IndexCreator> indexCreators;
 
     @Inject
@@ -124,7 +124,7 @@ public class NexusIndexerConsumerTest
 
         nexusIndexerConsumer =
             new NexusIndexerConsumer( scheduler, configuration, filetypes, indexCreators,
-                                      managedRepositoryAdmin, nexusIndexer );
+                                      managedRepositoryAdmin);
 
         // initialize to set the file types to be processed
         nexusIndexerConsumer.initialize();

http://git-wip-us.apache.org/repos/asf/archiva/blob/42376e8f/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java
index dc7f5c0..583ddd2 100644
--- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java
+++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java
@@ -18,9 +18,6 @@ package org.apache.archiva.indexer.merger;
  * under the License.
  */
 
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
-import org.apache.maven.index.NexusIndexer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -41,13 +38,10 @@ public class TemporaryGroupIndexCleaner
     @Inject
     private IndexMerger indexMerger;
 
-    private NexusIndexer indexer;
 
-    @Inject
-    public TemporaryGroupIndexCleaner( NexusIndexer nexusIndexer )
-        throws PlexusSisuBridgeException
+    public TemporaryGroupIndexCleaner( )
     {
-        this.indexer = nexusIndexer;
+
     }
 
     // 900000