diff options
Diffstat (limited to 'archiva-modules')
4 files changed, 11 insertions, 6 deletions
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 58fdf68d5..cab896bdb 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() ); } } 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 b585fb782..478473e9a 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 ); diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml index 20db52b92..d08bccb6b 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> diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index d425434e0..4023b24a1 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> |