archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject [08/31] archiva git commit: some progress
Date Sat, 19 Aug 2017 11:40:48 GMT
some progress

Signed-off-by: olivier lamy <olamy@apache.org>


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

Branch: refs/heads/master
Commit: 7480b7ffe247268dc434a3eb079cb1e34c6bb73b
Parents: 2243004
Author: olivier lamy <olamy@apache.org>
Authored: Mon Jul 17 18:41:14 2017 +1000
Committer: olivier lamy <olamy@apache.org>
Committed: Mon Jul 17 18:41:14 2017 +1000

----------------------------------------------------------------------
 .../indexer/search/AbstractMavenRepositorySearch.java       | 9 ++++++---
 .../scheduler/indexing/ArchivaIndexingTaskExecutor.java     | 4 +++-
 archiva-modules/plugins/problem-reports/pom.xml             | 2 +-
 archiva-modules/plugins/stage-repository-merge/pom.xml      | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/7480b7ff/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
index 58fdf68..cab896b 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/AbstractMavenRepositorySearch.java
@@ -38,6 +38,7 @@ import org.apache.maven.index.NexusIndexer;
 import org.apache.maven.index.QueryCreator;
 import org.apache.maven.index.ScanningResult;
 import org.apache.maven.index.context.IndexingContext;
+import org.apache.maven.index.shaded.lucene.index.IndexUpgrader;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 import org.junit.After;
@@ -242,13 +243,13 @@ public abstract class AbstractMavenRepositorySearch
         @Override
         public void scanningStarted( IndexingContext ctx )
         {
-
+            //
         }
 
         @Override
         public void scanningFinished( IndexingContext ctx, ScanningResult result )
         {
-
+            // no op
         }
 
         @Override
@@ -260,7 +261,9 @@ public abstract class AbstractMavenRepositorySearch
         @Override
         public void artifactDiscovered( ArtifactContext ac )
         {
-            log.debug( "artifactDiscovered {}:{}", ac.getArtifact().getPath(), ac.getArtifactInfo()
);
+            log.debug( "artifactDiscovered {}:{}", //
+                       ac.getArtifact() == null ? "" : ac.getArtifact().getPath(), //
+                       ac.getArtifact() == null ? "" : ac.getArtifactInfo() );
         }
     }
 

http://git-wip-us.apache.org/repos/asf/archiva/blob/7480b7ff/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
index b585fb7..478473e 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
@@ -232,7 +232,9 @@ public class ArchivaIndexingTaskExecutor
             if ( !repository.isSkipPackedIndexCreation() )
             {
 
-                IndexPackingRequest request = new IndexPackingRequest( context, context.getIndexDirectoryFile()
);
+                IndexPackingRequest request = new IndexPackingRequest( context, //
+                                                                       context.acquireIndexSearcher().getIndexReader(),
//
+                                                                       context.getIndexDirectoryFile()
);
                 indexPacker.packIndex( request );
                 context.updateTimestamp( true );
 

http://git-wip-us.apache.org/repos/asf/archiva/blob/7480b7ff/archiva-modules/plugins/problem-reports/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml
index 20db52b..d08bccb 100644
--- a/archiva-modules/plugins/problem-reports/pom.xml
+++ b/archiva-modules/plugins/problem-reports/pom.xml
@@ -112,7 +112,7 @@
         <executions>
           <execution>
             <id>test-repository</id>
-            <phase>generate-test-resources</phase>
+            <phase>process-test-classes</phase>
             <goals>
               <goal>unpack-dependencies</goal>
             </goals>

http://git-wip-us.apache.org/repos/asf/archiva/blob/7480b7ff/archiva-modules/plugins/stage-repository-merge/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml
index d425434..4023b24 100644
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -153,7 +153,7 @@
         <executions>
           <execution>
             <id>test-repository</id>
-            <phase>generate-test-resources</phase>
+            <phase>process-test-classes</phase>
             <goals>
               <goal>unpack-dependencies</goal>
             </goals>


Mime
View raw message