You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2017/07/24 04:57:46 UTC
[1/5] archiva git commit: some progress
Repository: archiva
Updated Branches:
refs/heads/feature/jcr_oak 22430044a -> f15eb37cb
some progress
Signed-off-by: olivier lamy <ol...@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/feature/jcr_oak
Commit: 7480b7ffe247268dc434a3eb079cb1e34c6bb73b
Parents: 2243004
Author: olivier lamy <ol...@apache.org>
Authored: Mon Jul 17 18:41:14 2017 +1000
Committer: olivier lamy <ol...@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>
[4/5] archiva git commit: more progress on oak lucene shaded
Posted by ol...@apache.org.
more progress on oak lucene shaded
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/8a76b996
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/8a76b996
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/8a76b996
Branch: refs/heads/feature/jcr_oak
Commit: 8a76b9964151f850885e4d784fa86358d0148199
Parents: 003d579
Author: olivier lamy <ol...@apache.org>
Authored: Mon Jul 24 14:56:21 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Mon Jul 24 14:56:21 2017 +1000
----------------------------------------------------------------------
.../consumers/lucene/NexusIndexerConsumer.java | 12 +--
.../lucene/NexusIndexerConsumerTest.java | 8 +-
.../indexer/merger/DefaultIndexMerger.java | 24 +++---
.../indexer/search/MavenRepositorySearch.java | 64 ++++++----------
.../search/AbstractMavenRepositorySearch.java | 17 ++---
.../search/MavenRepositorySearchTest.java | 4 +-
.../common/plexusbridge/MavenIndexerUtils.java | 77 --------------------
.../managed/DefaultManagedRepositoryAdmin.java | 25 -------
.../DefaultDownloadRemoteIndexScheduler.java | 5 --
.../ArchivaIndexingTaskExecutorTest.java | 50 ++++++-------
.../services/DefaultRepositoriesService.java | 6 +-
.../resources/META-INF/spring-context-test.xml | 2 +
.../resources/spring-context-test-common.xml | 2 +
.../test/resources/spring-context-with-jcr.xml | 2 +
.../webdav/util/MavenIndexerCleaner.java | 14 +---
.../jcr/JcrRepositorySessionFactory.java | 2 +-
.../src/test/resources/log4j2-test.xml | 9 +--
pom.xml | 6 ++
18 files changed, 89 insertions(+), 240 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/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 c85a8fb..69b9ba5 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
@@ -22,9 +22,6 @@ package org.apache.archiva.consumers.lucene;
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
-import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.ConfigurationNames;
import org.apache.archiva.configuration.FileTypes;
@@ -32,13 +29,13 @@ import org.apache.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.archiva.redback.components.registry.Registry;
+import org.apache.archiva.redback.components.registry.RegistryListener;
+import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
import org.apache.archiva.scheduler.ArchivaTaskScheduler;
import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
-import org.apache.archiva.redback.components.registry.RegistryListener;
-import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -88,14 +85,13 @@ public class NexusIndexerConsumer
public NexusIndexerConsumer(
@Named( value = "archivaTaskScheduler#indexing" ) ArchivaTaskScheduler<ArtifactIndexingTask> scheduler,
@Named( value = "archivaConfiguration" ) ArchivaConfiguration configuration, FileTypes filetypes,
- MavenIndexerUtils mavenIndexerUtils,
- ManagedRepositoryAdmin managedRepositoryAdmin, NexusIndexer nexusIndexer )
+ List<IndexCreator> indexCreators, ManagedRepositoryAdmin managedRepositoryAdmin, NexusIndexer nexusIndexer )
{
this.configuration = configuration;
this.filetypes = filetypes;
this.scheduler = scheduler;
this.nexusIndexer = nexusIndexer;
- this.allIndexCreators = mavenIndexerUtils.getAllIndexCreators();
+ this.allIndexCreators = indexCreators;
this.managedRepositoryAdmin = managedRepositoryAdmin;
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/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 b5e688b..91d0c10 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
@@ -22,7 +22,6 @@ package org.apache.archiva.consumers.lucene;
import junit.framework.TestCase;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
-import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.FileTypes;
import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
@@ -31,6 +30,7 @@ import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
import org.apache.maven.index.NexusIndexer;
+import org.apache.maven.index.context.IndexCreator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -99,7 +99,7 @@ public class NexusIndexerConsumerTest
private NexusIndexer nexusIndexer;
@Inject
- private MavenIndexerUtils mavenIndexerUtils;
+ private List<IndexCreator> indexCreators;
@Inject
private ManagedRepositoryAdmin managedRepositoryAdmin;
@@ -119,11 +119,11 @@ public class NexusIndexerConsumerTest
FileTypes filetypes = applicationContext.getBean( FileTypes.class );
nexusIndexerConsumer =
- new NexusIndexerConsumer( scheduler, configuration, filetypes, mavenIndexerUtils,
+ new NexusIndexerConsumer( scheduler, configuration, filetypes, indexCreators,
managedRepositoryAdmin, nexusIndexer );
// initialize to set the file types to be processed
- ( (NexusIndexerConsumer) nexusIndexerConsumer ).initialize();
+ nexusIndexerConsumer.initialize();
repositoryConfig = new ManagedRepository();
repositoryConfig.setId( "test-repo" );
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
index 663f0b6..de9342c 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
@@ -18,11 +18,10 @@ package org.apache.archiva.indexer.merger;
* under the License.
*/
-import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.time.StopWatch;
import org.apache.maven.index.NexusIndexer;
+import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException;
import org.apache.maven.index.packer.IndexPacker;
@@ -50,23 +49,22 @@ public class DefaultIndexMerger
private Logger log = LoggerFactory.getLogger( getClass() );
- private MavenIndexerUtils mavenIndexerUtils;
+ private final NexusIndexer indexer;
- private NexusIndexer indexer;
+ private final IndexPacker indexPacker;
- private IndexPacker indexPacker;
+ private final List<IndexCreator> indexCreators;
private List<TemporaryGroupIndex> temporaryGroupIndexes = new CopyOnWriteArrayList<>();
- private List<String> runningGroups = new CopyOnWriteArrayList<String>();
+ private List<String> runningGroups = new CopyOnWriteArrayList<>();
@Inject
- public DefaultIndexMerger( NexusIndexer nexusIndexer, IndexPacker indexPacker, MavenIndexerUtils mavenIndexerUtils )
- throws PlexusSisuBridgeException
+ public DefaultIndexMerger( NexusIndexer nexusIndexer, IndexPacker indexPacker, List<IndexCreator> indexCreators )
{
this.indexer = nexusIndexer;
- this.mavenIndexerUtils = mavenIndexerUtils;
this.indexPacker = indexPacker;
+ this.indexCreators = indexCreators;
}
@Override
@@ -96,7 +94,7 @@ public class DefaultIndexMerger
File indexLocation = new File( mergedIndexDirectory, indexMergerRequest.getMergedIndexPath() );
IndexingContext indexingContext =
indexer.addIndexingContext( tempRepoId, tempRepoId, mergedIndexDirectory, indexLocation, null, null,
- mavenIndexerUtils.getAllIndexCreators() );
+ indexCreators );
for ( String repoId : indexMergerRequest.getRepositoriesIds() )
{
@@ -127,11 +125,7 @@ public class DefaultIndexMerger
stopWatch.getTime() );
return indexingContext;
}
- catch ( IOException e )
- {
- throw new IndexMergerException( e.getMessage(), e );
- }
- catch ( UnsupportedExistingLuceneIndexException e )
+ catch ( IOException | UnsupportedExistingLuceneIndexException e )
{
throw new IndexMergerException( e.getMessage(), e );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
index 64db785..827eda0 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
@@ -24,11 +24,9 @@ import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.beans.ProxyConnector;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin;
-import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.archiva.indexer.util.SearchUtil;
import org.apache.commons.lang.StringUtils;
-
import org.apache.maven.index.ArtifactInfo;
import org.apache.maven.index.FlatSearchRequest;
import org.apache.maven.index.FlatSearchResponse;
@@ -77,8 +75,6 @@ public class MavenRepositorySearch
private ProxyConnectorAdmin proxyConnectorAdmin;
- private MavenIndexerUtils mavenIndexerUtils;
-
protected MavenRepositorySearch()
{
// for test purpose
@@ -86,14 +82,12 @@ public class MavenRepositorySearch
@Inject
public MavenRepositorySearch( NexusIndexer nexusIndexer, ManagedRepositoryAdmin managedRepositoryAdmin,
- MavenIndexerUtils mavenIndexerUtils, ProxyConnectorAdmin proxyConnectorAdmin,
- QueryCreator queryCreator)
+ ProxyConnectorAdmin proxyConnectorAdmin, QueryCreator queryCreator )
throws PlexusSisuBridgeException
{
this.indexer = nexusIndexer;
this.queryCreator = queryCreator;
this.managedRepositoryAdmin = managedRepositoryAdmin;
- this.mavenIndexerUtils = mavenIndexerUtils;
this.proxyConnectorAdmin = proxyConnectorAdmin;
}
@@ -162,11 +156,9 @@ public class MavenRepositorySearch
BooleanQuery q = new BooleanQuery();
if ( StringUtils.isNotBlank( searchFields.getGroupId() ) )
{
- q.add( indexer.constructQuery( MAVEN.GROUP_ID, searchFields.isExactSearch()
- ? new SourcedSearchExpression( searchFields.getGroupId() )
- : new UserInputSearchExpression( searchFields.getGroupId() )
- ), BooleanClause.Occur.MUST
- );
+ q.add( indexer.constructQuery( MAVEN.GROUP_ID, searchFields.isExactSearch() ? new SourcedSearchExpression(
+ searchFields.getGroupId() ) : new UserInputSearchExpression( searchFields.getGroupId() ) ),
+ BooleanClause.Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getArtifactId() ) )
@@ -174,69 +166,64 @@ public class MavenRepositorySearch
q.add( indexer.constructQuery( MAVEN.ARTIFACT_ID,
searchFields.isExactSearch()
? new SourcedSearchExpression( searchFields.getArtifactId() )
- : new UserInputSearchExpression( searchFields.getArtifactId() )
- ), BooleanClause.Occur.MUST
- );
+ : new UserInputSearchExpression( searchFields.getArtifactId() ) ),
+ BooleanClause.Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getVersion() ) )
{
q.add( indexer.constructQuery( MAVEN.VERSION, searchFields.isExactSearch() ? new SourcedSearchExpression(
- searchFields.getVersion() ) : new SourcedSearchExpression( searchFields.getVersion() ) ), BooleanClause.Occur.MUST );
+ searchFields.getVersion() ) : new SourcedSearchExpression( searchFields.getVersion() ) ),
+ BooleanClause.Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getPackaging() ) )
{
q.add( indexer.constructQuery( MAVEN.PACKAGING, searchFields.isExactSearch() ? new SourcedSearchExpression(
searchFields.getPackaging() ) : new UserInputSearchExpression( searchFields.getPackaging() ) ),
- BooleanClause.Occur.MUST
- );
+ BooleanClause.Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getClassName() ) )
{
q.add( indexer.constructQuery( MAVEN.CLASSNAMES,
- new UserInputSearchExpression( searchFields.getClassName() ) ), BooleanClause.Occur.MUST );
+ new UserInputSearchExpression( searchFields.getClassName() ) ),
+ BooleanClause.Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getBundleSymbolicName() ) )
{
q.add( indexer.constructQuery( OSGI.SYMBOLIC_NAME,
new UserInputSearchExpression( searchFields.getBundleSymbolicName() ) ),
- BooleanClause.Occur.MUST
- );
+ BooleanClause.Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getBundleVersion() ) )
{
q.add( indexer.constructQuery( OSGI.VERSION,
new UserInputSearchExpression( searchFields.getBundleVersion() ) ),
- BooleanClause.Occur.MUST
- );
+ BooleanClause.Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getBundleExportPackage() ) )
{
q.add( indexer.constructQuery( OSGI.EXPORT_PACKAGE,
new UserInputSearchExpression( searchFields.getBundleExportPackage() ) ),
- Occur.MUST
- );
+ Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getBundleExportService() ) )
{
q.add( indexer.constructQuery( OSGI.EXPORT_SERVICE,
new UserInputSearchExpression( searchFields.getBundleExportService() ) ),
- Occur.MUST
- );
+ Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getBundleImportPackage() ) )
{
q.add( indexer.constructQuery( OSGI.IMPORT_PACKAGE,
new UserInputSearchExpression( searchFields.getBundleImportPackage() ) ),
- Occur.MUST
- );
+ Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getBundleName() ) )
@@ -249,24 +236,21 @@ public class MavenRepositorySearch
{
q.add( indexer.constructQuery( OSGI.IMPORT_PACKAGE,
new UserInputSearchExpression( searchFields.getBundleImportPackage() ) ),
- Occur.MUST
- );
+ Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getBundleRequireBundle() ) )
{
q.add( indexer.constructQuery( OSGI.REQUIRE_BUNDLE,
new UserInputSearchExpression( searchFields.getBundleRequireBundle() ) ),
- Occur.MUST
- );
+ Occur.MUST );
}
if ( StringUtils.isNotBlank( searchFields.getClassifier() ) )
{
q.add( indexer.constructQuery( MAVEN.CLASSIFIER, searchFields.isExactSearch() ? new SourcedSearchExpression(
searchFields.getClassifier() ) : new UserInputSearchExpression( searchFields.getClassifier() ) ),
- Occur.MUST
- );
+ Occur.MUST );
}
else if ( searchFields.isExactSearch() )
{
@@ -283,7 +267,8 @@ public class MavenRepositorySearch
searchFields.getRepositories(), searchFields.isIncludePomArtifacts() );
}
- private static class NullSearch implements SearchTyped, SearchExpression
+ private static class NullSearch
+ implements SearchTyped, SearchExpression
{
private static final NullSearch INSTANCE = new NullSearch();
@@ -476,13 +461,6 @@ public class MavenRepositorySearch
}
-
- protected List<? extends IndexCreator> getAllIndexCreators()
- {
- return mavenIndexerUtils.getAllIndexCreators();
- }
-
-
private SearchResults convertToSearchResults( FlatSearchResponse response, SearchResultLimits limits,
List<? extends ArtifactInfoFilter> artifactInfoFilters,
List<String> selectedRepos, boolean includePoms )
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/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 cab896b..e3b96f0 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
@@ -22,7 +22,6 @@ package org.apache.archiva.indexer.search;
import junit.framework.TestCase;
import org.apache.archiva.admin.repository.managed.DefaultManagedRepositoryAdmin;
import org.apache.archiva.admin.repository.proxyconnector.DefaultProxyConnectorAdmin;
-import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.utils.FileUtil;
import org.apache.archiva.configuration.ArchivaConfiguration;
@@ -37,8 +36,8 @@ import org.apache.maven.index.ArtifactScanningListener;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.QueryCreator;
import org.apache.maven.index.ScanningResult;
+import org.apache.maven.index.context.IndexCreator;
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;
@@ -85,7 +84,7 @@ public abstract class AbstractMavenRepositorySearch
PlexusSisuBridge plexusSisuBridge;
@Inject
- MavenIndexerUtils mavenIndexerUtils;
+ List<IndexCreator> indexCreators;
@Inject
NexusIndexer nexusIndexer;
@@ -106,7 +105,7 @@ public abstract class AbstractMavenRepositorySearch
FileUtils.deleteDirectory( new File( FileUtil.getBasedir(), "/target/repos/" + TEST_REPO_2 + "/.indexer" ) );
assertFalse( new File( FileUtil.getBasedir(), "/target/repos/" + TEST_REPO_2 + "/.indexer" ).exists() );
- archivaConfigControl = EasyMock.createControl( );
+ archivaConfigControl = EasyMock.createControl();
archivaConfig = archivaConfigControl.createMock( ArchivaConfiguration.class );
@@ -116,12 +115,11 @@ public abstract class AbstractMavenRepositorySearch
DefaultProxyConnectorAdmin defaultProxyConnectorAdmin = new DefaultProxyConnectorAdmin();
defaultProxyConnectorAdmin.setArchivaConfiguration( archivaConfig );
- search = new MavenRepositorySearch( nexusIndexer, defaultManagedRepositoryAdmin, mavenIndexerUtils,
- defaultProxyConnectorAdmin, queryCreator );
+ search = new MavenRepositorySearch( nexusIndexer, defaultManagedRepositoryAdmin, defaultProxyConnectorAdmin,
+ queryCreator );
- defaultManagedRepositoryAdmin.setMavenIndexerUtils( mavenIndexerUtils );
defaultManagedRepositoryAdmin.setIndexer( nexusIndexer );
- defaultManagedRepositoryAdmin.setIndexCreators( mavenIndexerUtils.getAllIndexCreators() );
+ defaultManagedRepositoryAdmin.setIndexCreators( indexCreators );
config = new Configuration();
config.addManagedRepository( createRepositoryConfig( TEST_REPO_1 ) );
@@ -204,8 +202,7 @@ public abstract class AbstractMavenRepositorySearch
context = nexusIndexer.addIndexingContext( repository, repository, repo, indexDirectory,
repo.toURI().toURL().toExternalForm(),
- indexDirectory.toURI().toURL().toString(),
- search.getAllIndexCreators() );
+ indexDirectory.toURI().toURL().toString(), indexCreators );
// minimize datas in memory
// context.getIndexWriter().setMaxBufferedDocs( -1 );
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
index 8fb3728..77cddb8 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
@@ -871,13 +871,13 @@ public class MavenRepositorySearchTest
File indexDirectory = new File( repo, ".index" );
FileUtils.copyDirectoryStructure( new File( "src/test/repo-release" ), repo );
- IndexUpgrader.main( new String[]{indexDirectory.getAbsolutePath()} );
+ IndexUpgrader.main( new String[]{ indexDirectory.getAbsolutePath() } );
createIndex( "repo-release", Collections.emptyList(), false );
nexusIndexer.addIndexingContext( REPO_RELEASE, REPO_RELEASE, repo, indexDirectory,
repo.toURI().toURL().toExternalForm(),
- indexDirectory.toURI().toURL().toString(), search.getAllIndexCreators() );
+ indexDirectory.toURI().toURL().toString(), indexCreators );
SearchResultLimits limits = new SearchResultLimits( SearchResultLimits.ALL_PAGES );
limits.setPageSize( 300 );
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java
deleted file mode 100644
index 7f86da4..0000000
--- a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/java/org/apache/archiva/common/plexusbridge/MavenIndexerUtils.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.apache.archiva.common.plexusbridge;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.index.context.IndexCreator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Olivier Lamy
- * @since 1.4-M1
- */
-@Service( "mavenIndexerUtils" )
-public class MavenIndexerUtils
-{
-
- private Logger log = LoggerFactory.getLogger( getClass() );
-
- private List<? extends IndexCreator> allIndexCreators;
-
- private ApplicationContext applicationContext;
-
- @Inject
- public MavenIndexerUtils(ApplicationContext applicationContext, Map<String, IndexCreator> indexers)
- {
- this.applicationContext = applicationContext;
- }
-
- @PostConstruct
- public void initialize()
- {
- allIndexCreators = new ArrayList<>( applicationContext.getBeansOfType( IndexCreator.class ).values());
-
- if ( allIndexCreators == null || allIndexCreators.isEmpty() )
- {
- throw new RuntimeException( "cannot initiliaze IndexCreators" );
- }
-
- log.debug( "allIndexCreators {}", allIndexCreators );
- }
-
- public List<? extends IndexCreator> getAllIndexCreators()
- {
- return allIndexCreators;
- }
-
- public void setAllIndexCreators( List<IndexCreator> allIndexCreators )
- {
- this.allIndexCreators = allIndexCreators;
- }
-}
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
index ad90b4e..7ba503c 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
@@ -23,9 +23,6 @@ import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.admin.repository.AbstractRepositoryAdmin;
-import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.configuration.ProxyConnectorConfiguration;
@@ -96,9 +93,6 @@ public class DefaultManagedRepositoryAdmin
private RepositoryStatisticsManager repositoryStatisticsManager;
@Inject
- private MavenIndexerUtils mavenIndexerUtils;
-
- @Inject
protected RoleManager roleManager;
@Inject
@@ -116,15 +110,6 @@ public class DefaultManagedRepositoryAdmin
public void initialize()
throws RepositoryAdminException, RoleManagerException
{
-// try
-// {
-// indexCreators = mavenIndexerUtils.getAllIndexCreators();
-// indexer = plexusSisuBridge.lookup( NexusIndexer.class );
-// }
-// catch ( PlexusSisuBridgeException e )
-// {
-// throw new RepositoryAdminException( e.getMessage(), e );
-// }
// initialize index context on start and check roles here
for ( ManagedRepository managedRepository : getManagedRepositories() )
{
@@ -817,16 +802,6 @@ public class DefaultManagedRepositoryAdmin
this.repositoryTaskScheduler = repositoryTaskScheduler;
}
- public MavenIndexerUtils getMavenIndexerUtils()
- {
- return mavenIndexerUtils;
- }
-
- public void setMavenIndexerUtils( MavenIndexerUtils mavenIndexerUtils )
- {
- this.mavenIndexerUtils = mavenIndexerUtils;
- }
-
public NexusIndexer getIndexer()
{
return indexer;
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
index a3930c6..b1f3955 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
@@ -25,8 +25,6 @@ import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin;
import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin;
import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin;
import org.apache.archiva.common.ArchivaException;
-import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.ConfigurationEvent;
@@ -84,9 +82,6 @@ public class DefaultDownloadRemoteIndexScheduler
private NetworkProxyAdmin networkProxyAdmin;
@Inject
- private MavenIndexerUtils mavenIndexerUtils;
-
- @Inject
private NexusIndexer nexusIndexer;
@Inject
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
index 044ed87..b9ad48c 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
@@ -22,14 +22,13 @@ package org.apache.archiva.scheduler.indexing;
import junit.framework.TestCase;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
-import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.maven.index.ArtifactInfo;
import org.apache.maven.index.FlatSearchRequest;
import org.apache.maven.index.FlatSearchResponse;
import org.apache.maven.index.MAVEN;
import org.apache.maven.index.NexusIndexer;
+import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.expr.SourcedSearchExpression;
import org.apache.maven.index.expr.StringSearchExpression;
@@ -37,7 +36,9 @@ import org.apache.maven.index.shaded.lucene.search.BooleanClause;
import org.apache.maven.index.shaded.lucene.search.BooleanQuery;
import org.apache.maven.index.shaded.lucene.search.IndexSearcher;
import org.apache.maven.index.shaded.lucene.search.TopDocs;
+import org.apache.maven.index.updater.DefaultIndexUpdater;
import org.apache.maven.index.updater.IndexUpdateRequest;
+import org.apache.maven.index.updater.IndexUpdater;
import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.Before;
@@ -46,19 +47,10 @@ import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import javax.inject.Inject;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.util.List;
import java.util.Set;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
/**
* ArchivaIndexingTaskExecutorTest
@@ -77,11 +69,14 @@ public class ArchivaIndexingTaskExecutorTest
private NexusIndexer indexer;
@Inject
- MavenIndexerUtils mavenIndexerUtils;
+ List<IndexCreator> indexCreators;
@Inject
ManagedRepositoryAdmin managedRepositoryAdmin;
+ @Inject
+ private IndexUpdater indexUpdater;
+
@Before
@Override
public void setUp()
@@ -153,12 +148,12 @@ public class ArchivaIndexingTaskExecutorTest
if ( !indexer.getIndexingContexts().containsKey( repositoryConfig.getId() ) )
{
- IndexingContext context = indexer.addIndexingContext( repositoryConfig.getId(), repositoryConfig.getId(),
- new File( repositoryConfig.getLocation() ),
- new File( repositoryConfig.getLocation(),
- ".indexer" ), null, null,
- mavenIndexerUtils.getAllIndexCreators()
- );
+ IndexingContext context = indexer.addIndexingContext( repositoryConfig.getId(), //
+ repositoryConfig.getId(), //
+ new File( repositoryConfig.getLocation() ), //
+ new File( repositoryConfig.getLocation(), ".indexer" )
+ //
+ , null, null, indexCreators );
context.setSearchable( true );
}
@@ -260,8 +255,7 @@ public class ArchivaIndexingTaskExecutorTest
BooleanClause.Occur.SHOULD );
q.add( indexer.constructQuery( MAVEN.ARTIFACT_ID,
new SourcedSearchExpression( "archiva-index-methods-jar-test" ) ),
- BooleanClause.Occur.SHOULD
- );
+ BooleanClause.Occur.SHOULD );
assertTrue( new File( repositoryConfig.getLocation(), ".indexer" ).exists() );
assertFalse( new File( repositoryConfig.getLocation(), ".index" ).exists() );
@@ -317,17 +311,17 @@ public class ArchivaIndexingTaskExecutorTest
// test packed index file creation
//no more zip
//Assertions.assertThat(new File( indexerDirectory, "nexus-maven-repository-index.zip" )).exists();
- Assertions.assertThat(new File( indexerDirectory, "nexus-maven-repository-index.properties" )).exists();
- Assertions.assertThat(new File( indexerDirectory, "nexus-maven-repository-index.gz" )).exists();
+ Assertions.assertThat( new File( indexerDirectory, "nexus-maven-repository-index.properties" ) ).exists();
+ Assertions.assertThat( new File( indexerDirectory, "nexus-maven-repository-index.gz" ) ).exists();
// unpack .zip index
File destDir = new File( repositoryConfig.getLocation(), ".indexer/tmp" );
- unzipIndex( indexerDirectory.getPath(), destDir.getPath() );
+ //unzipIndex( indexerDirectory.getPath(), destDir.getPath() );
- TrackingFetcher fetcher = new TrackingFetcher( remoteRepo );
- updateRequest = new IndexUpdateRequest( testContext, fetcher );
- updateRequest.setLocalIndexCacheDir( localCacheDir );
- updater.fetchAndUpdateIndex( updateRequest );
+ DefaultIndexUpdater.FileFetcher fetcher = new DefaultIndexUpdater.FileFetcher( indexerDirectory );
+ IndexUpdateRequest updateRequest = new IndexUpdateRequest( getIndexingContext(), fetcher );
+ //updateRequest.setLocalIndexCacheDir( indexerDirectory );
+ indexUpdater.fetchAndUpdateIndex( updateRequest );
BooleanQuery q = new BooleanQuery();
q.add( indexer.constructQuery( MAVEN.GROUP_ID, new StringSearchExpression( "org.apache.archiva" ) ),
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
index e0660c2..bbb7416 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
@@ -23,16 +23,15 @@ import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.admin.ArchivaAdministration;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
-import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.archiva.checksum.ChecksumAlgorithm;
import org.apache.archiva.checksum.ChecksummedFile;
-import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.utils.VersionComparator;
import org.apache.archiva.common.utils.VersionUtil;
import org.apache.archiva.maven2.metadata.MavenMetadataReader;
import org.apache.archiva.maven2.model.Artifact;
import org.apache.archiva.metadata.model.ArtifactMetadata;
+import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
@@ -126,9 +125,6 @@ public class DefaultRepositoriesService
private PlexusSisuBridge plexusSisuBridge;
@Inject
- private MavenIndexerUtils mavenIndexerUtils;
-
- @Inject
private SecuritySystem securitySystem;
@Inject
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
index 49c0748..830a3e6 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
@@ -75,6 +75,7 @@
<property name="queue" ref="taskQueue#repository-scanning"/>
</bean>
+ <!--
<bean id="repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown">
<constructor-arg ref="config"/>
</bean>
@@ -83,6 +84,7 @@
<constructor-arg value="${basedir}/src/test/repository.xml"/>
<constructor-arg value="${appserver.base}/jcr"/>
</bean>
+ -->
<bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
init-method="initialize">
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
index 3e8195d..d62446b 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
@@ -72,6 +72,7 @@
<property name="queue" ref="taskQueue#repository-scanning"/>
</bean>
+ <!--
<bean id="repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown">
<constructor-arg ref="config"/>
</bean>
@@ -79,6 +80,7 @@
<constructor-arg value="${basedir}/src/test/repository.xml"/>
<constructor-arg value="${appserver.base}/jcr"/>
</bean>
+ -->
<alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
<alias name="userConfiguration#archiva" alias="userConfiguration#default"/>
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
index 1e02fbc..6b72d33 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
@@ -28,6 +28,7 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"
default-lazy-init="true">
+ <!--
<bean id="repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown">
<constructor-arg ref="config"/>
</bean>
@@ -35,6 +36,7 @@
<constructor-arg value="${basedir}/src/test/repository.xml"/>
<constructor-arg value="${appserver.base}/jcr"/>
</bean>
+ -->
<alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
index 079828f..cd59302 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
@@ -18,23 +18,18 @@ package org.apache.archiva.webdav.util;
* 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.apache.maven.index.context.IndexingContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import java.io.IOException;
/**
* @author Olivier Lamy
@@ -46,15 +41,16 @@ public class MavenIndexerCleaner
Logger log = LoggerFactory.getLogger( getClass() );
- private PlexusSisuBridge plexusSisuBridge;
@Inject
private ApplicationContext applicationContext;
+ @Inject
+ NexusIndexer nexusIndexer;
+
@PostConstruct
public void startup()
{
- plexusSisuBridge = applicationContext.getBean( PlexusSisuBridge.class );
cleanupIndex();
}
@@ -70,9 +66,6 @@ public class MavenIndexerCleaner
{
try
{
- WebApplicationContext wacu =
- WebApplicationContextUtils.getRequiredWebApplicationContext( servletContextEvent.getServletContext() );
- plexusSisuBridge = wacu.getBean( PlexusSisuBridge.class );
cleanupIndex();
}
@@ -103,7 +96,6 @@ public class MavenIndexerCleaner
log.info( "cleanup IndexingContext" );
try
{
- NexusIndexer nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class );
for ( IndexingContext context : nexusIndexer.getIndexingContexts().values() )
{
nexusIndexer.removeIndexingContext( context, true );
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
index ed86463..fa50279 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
@@ -98,7 +98,7 @@ public class JcrRepositorySessionFactory
throws Exception
{
- // skip initialisation if not cassandra
+ // skip initialisation if not jcr
if ( !StringUtils.equals( repositorySessionFactoryBean.getId(), "jcr" ) )
{
return;
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml b/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
index 74dd077..50dab92 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
@@ -19,7 +19,7 @@
-->
-<configuration status="debug">
+<configuration>
@@ -31,11 +31,8 @@
</appenders>
<loggers>
-
-
- <logger name="org.apache.jackrabbit" level="trace"/>
-
- <root level="debug" includeLocation="true">
+ <logger name="org.apache.jackrabbit" level="info"/>
+ <root level="info" includeLocation="true">
<appender-ref ref="console"/>
</root>
</loggers>
http://git-wip-us.apache.org/repos/asf/archiva/blob/8a76b996/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8d0e542..46a0022 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,6 +291,12 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jcr</artifactId>
<version>${jcr-oak.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
[2/5] archiva git commit: more progress on new maven indexer version
Posted by ol...@apache.org.
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
index 1f07c52..044ed87 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
@@ -25,10 +25,6 @@ import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
-import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.TopDocs;
import org.apache.maven.index.ArtifactInfo;
import org.apache.maven.index.FlatSearchRequest;
import org.apache.maven.index.FlatSearchResponse;
@@ -37,6 +33,12 @@ import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.expr.SourcedSearchExpression;
import org.apache.maven.index.expr.StringSearchExpression;
+import org.apache.maven.index.shaded.lucene.search.BooleanClause;
+import org.apache.maven.index.shaded.lucene.search.BooleanQuery;
+import org.apache.maven.index.shaded.lucene.search.IndexSearcher;
+import org.apache.maven.index.shaded.lucene.search.TopDocs;
+import org.apache.maven.index.updater.IndexUpdateRequest;
+import org.assertj.core.api.Assertions;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -54,6 +56,7 @@ import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Set;
+import java.util.zip.GZIPInputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -70,10 +73,8 @@ public class ArchivaIndexingTaskExecutorTest
private ManagedRepository repositoryConfig;
- private NexusIndexer indexer;
-
@Inject
- PlexusSisuBridge plexusSisuBridge;
+ private NexusIndexer indexer;
@Inject
MavenIndexerUtils mavenIndexerUtils;
@@ -98,8 +99,6 @@ public class ArchivaIndexingTaskExecutorTest
repositoryConfig.setSnapshots( false );
repositoryConfig.setReleases( true );
- indexer = plexusSisuBridge.lookup( NexusIndexer.class );
-
managedRepositoryAdmin.createIndexContext( repositoryConfig );
}
@@ -147,10 +146,10 @@ public class ArchivaIndexingTaskExecutorTest
BooleanQuery q = new BooleanQuery();
q.add( indexer.constructQuery( MAVEN.GROUP_ID, new StringSearchExpression( "org.apache.archiva" ) ),
- Occur.SHOULD );
+ BooleanClause.Occur.SHOULD );
q.add(
indexer.constructQuery( MAVEN.ARTIFACT_ID, new StringSearchExpression( "archiva-index-methods-jar-test" ) ),
- Occur.SHOULD );
+ BooleanClause.Occur.SHOULD );
if ( !indexer.getIndexingContexts().containsKey( repositoryConfig.getId() ) )
{
@@ -173,9 +172,9 @@ public class ArchivaIndexingTaskExecutorTest
Set<ArtifactInfo> results = response.getResults();
ArtifactInfo artifactInfo = results.iterator().next();
- assertEquals( "org.apache.archiva", artifactInfo.groupId );
- assertEquals( "archiva-index-methods-jar-test", artifactInfo.artifactId );
- assertEquals( "test-repo", artifactInfo.repository );
+ assertEquals( "org.apache.archiva", artifactInfo.getGroupId() );
+ assertEquals( "archiva-index-methods-jar-test", artifactInfo.getArtifactId() );
+ assertEquals( "test-repo", artifactInfo.getRepository() );
}
@@ -195,10 +194,10 @@ public class ArchivaIndexingTaskExecutorTest
BooleanQuery q = new BooleanQuery();
q.add( indexer.constructQuery( MAVEN.GROUP_ID, new StringSearchExpression( "org.apache.archiva" ) ),
- Occur.SHOULD );
+ BooleanClause.Occur.SHOULD );
q.add(
indexer.constructQuery( MAVEN.ARTIFACT_ID, new StringSearchExpression( "archiva-index-methods-jar-test" ) ),
- Occur.SHOULD );
+ BooleanClause.Occur.SHOULD );
IndexingContext ctx = indexer.getIndexingContexts().get( repositoryConfig.getId() );
@@ -231,7 +230,7 @@ public class ArchivaIndexingTaskExecutorTest
BooleanQuery q = new BooleanQuery();
q.add( indexer.constructQuery( MAVEN.GROUP_ID, new SourcedSearchExpression( "org.apache.archiva" ) ),
- Occur.SHOULD );
+ BooleanClause.Occur.SHOULD );
//q.add(
// indexer.constructQuery( MAVEN.ARTIFACT_ID, new SourcedSearchExpression( "archiva-index-methods-jar-test" ) ),
// Occur.SHOULD );
@@ -258,9 +257,10 @@ public class ArchivaIndexingTaskExecutorTest
q = new BooleanQuery();
q.add( indexer.constructQuery( MAVEN.GROUP_ID, new SourcedSearchExpression( "org.apache.archiva" ) ),
- Occur.SHOULD );
+ BooleanClause.Occur.SHOULD );
q.add( indexer.constructQuery( MAVEN.ARTIFACT_ID,
- new SourcedSearchExpression( "archiva-index-methods-jar-test" ) ), Occur.SHOULD
+ new SourcedSearchExpression( "archiva-index-methods-jar-test" ) ),
+ BooleanClause.Occur.SHOULD
);
assertTrue( new File( repositoryConfig.getLocation(), ".indexer" ).exists() );
@@ -315,20 +315,26 @@ public class ArchivaIndexingTaskExecutorTest
assertTrue( indexerDirectory.exists() );
// test packed index file creation
- assertTrue( new File( indexerDirectory, "nexus-maven-repository-index.zip" ).exists() );
- assertTrue( new File( indexerDirectory, "nexus-maven-repository-index.properties" ).exists() );
- assertTrue( new File( indexerDirectory, "nexus-maven-repository-index.gz" ).exists() );
+ //no more zip
+ //Assertions.assertThat(new File( indexerDirectory, "nexus-maven-repository-index.zip" )).exists();
+ Assertions.assertThat(new File( indexerDirectory, "nexus-maven-repository-index.properties" )).exists();
+ Assertions.assertThat(new File( indexerDirectory, "nexus-maven-repository-index.gz" )).exists();
// unpack .zip index
File destDir = new File( repositoryConfig.getLocation(), ".indexer/tmp" );
unzipIndex( indexerDirectory.getPath(), destDir.getPath() );
+ TrackingFetcher fetcher = new TrackingFetcher( remoteRepo );
+ updateRequest = new IndexUpdateRequest( testContext, fetcher );
+ updateRequest.setLocalIndexCacheDir( localCacheDir );
+ updater.fetchAndUpdateIndex( updateRequest );
+
BooleanQuery q = new BooleanQuery();
q.add( indexer.constructQuery( MAVEN.GROUP_ID, new StringSearchExpression( "org.apache.archiva" ) ),
- Occur.SHOULD );
+ BooleanClause.Occur.SHOULD );
q.add(
indexer.constructQuery( MAVEN.ARTIFACT_ID, new StringSearchExpression( "archiva-index-methods-jar-test" ) ),
- Occur.SHOULD );
+ BooleanClause.Occur.SHOULD );
FlatSearchRequest request = new FlatSearchRequest( q, getIndexingContext() );
FlatSearchResponse response = indexer.searchFlat( request );
@@ -336,42 +342,11 @@ public class ArchivaIndexingTaskExecutorTest
Set<ArtifactInfo> results = response.getResults();
ArtifactInfo artifactInfo = results.iterator().next();
- assertEquals( "org.apache.archiva", artifactInfo.groupId );
- assertEquals( "archiva-index-methods-jar-test", artifactInfo.artifactId );
- assertEquals( "test-repo", artifactInfo.repository );
+ assertEquals( "org.apache.archiva", artifactInfo.getGroupId() );
+ assertEquals( "archiva-index-methods-jar-test", artifactInfo.getArtifactId() );
+ assertEquals( "test-repo", artifactInfo.getRepository() );
assertEquals( 1, response.getTotalHits() );
}
- private void unzipIndex( String indexDir, String destDir )
- throws IOException
- {
- final int buff = 2048;
-
- Files.createDirectories( Paths.get( destDir ) );
-
- try (InputStream fin = Files.newInputStream( Paths.get( indexDir, "nexus-maven-repository-index.zip" ) ))
- {
- ZipInputStream in = new ZipInputStream( new BufferedInputStream( fin ) );
- ZipEntry entry;
-
- while ( ( entry = in.getNextEntry() ) != null )
- {
- int count;
- byte data[] = new byte[buff];
- try (OutputStream fout = Files.newOutputStream( Paths.get( destDir, entry.getName() ) ))
- {
- try (BufferedOutputStream out = new BufferedOutputStream( fout, buff ))
- {
-
- while ( ( count = in.read( data, 0, buff ) ) != -1 )
- {
- out.write( data, 0, count );
- }
- }
- }
- }
-
- }
- }
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java
index 7e95b4f..c74c495 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java
@@ -23,13 +23,13 @@ import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.utils.FileUtil;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
import org.apache.maven.index.FlatSearchRequest;
import org.apache.maven.index.FlatSearchResponse;
import org.apache.maven.index.MAVEN;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.expr.StringSearchExpression;
+import org.apache.maven.index.shaded.lucene.search.BooleanClause;
+import org.apache.maven.index.shaded.lucene.search.BooleanQuery;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
@@ -75,8 +75,6 @@ public class DownloadRemoteIndexTaskTest
DefaultDownloadRemoteIndexScheduler downloadRemoteIndexScheduler;
@Inject
- PlexusSisuBridge plexusSisuBridge;
-
NexusIndexer nexusIndexer;
@Before
@@ -90,7 +88,6 @@ public class DownloadRemoteIndexTaskTest
this.server.start();
this.port = serverConnector.getLocalPort();
log.info( "start server on port {}", this.port );
- nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class );
}
protected void createContext( Server server, File repositoryDirectory )
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
index f823042..1da71bc 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
@@ -53,8 +53,6 @@ public class ArchivaStartup
private DefaultRepositoryArchivaTaskScheduler repositoryTaskScheduler;
- private PlexusSisuBridge plexusSisuBridge;
-
private NexusIndexer nexusIndexer;
@Override
@@ -74,18 +72,10 @@ public class ArchivaStartup
tqeIndexing = wac.getBean( "taskQueueExecutor#indexing", ThreadedTaskQueueExecutor.class );
- plexusSisuBridge = wac.getBean( PlexusSisuBridge.class );
+ nexusIndexer = wac.getBean( NexusIndexer.class );
try
{
- nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class );
- }
- catch ( PlexusSisuBridgeException e )
- {
- throw new RuntimeException( "Unable to get NexusIndexer: " + e.getMessage(), e );
- }
- try
- {
securitySync.startup();
repositoryTaskScheduler.startup();
Banner.display( (String) archivaRuntimeProperties.get( "archiva.version" ) );
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-web/archiva-webdav/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 044b964..1a28879 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -103,6 +103,10 @@
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-webdav</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/plugins/maven2-repository/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml
index 4c97843..ab01552 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -277,7 +277,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/003d5794/archiva-modules/plugins/metadata-store-jcr/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index 94eba17..fc6976c 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -28,9 +28,6 @@
<artifactId>metadata-store-jcr</artifactId>
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: JCR Storage for Metadata</name>
- <properties>
- <jcr-oak.version>1.7.2</jcr-oak.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -65,12 +62,10 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jcr</artifactId>
- <version>${jcr-oak.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${jcr-oak.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -124,6 +119,7 @@
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
@@ -169,6 +165,7 @@
<artifactId>lucene-analyzers-common</artifactId>
<version>${lucene.version}</version>
</dependency>
+
</dependencies>
<build>
<testResources>
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
index 1c51dfc..ed86463 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
@@ -36,6 +36,8 @@ import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
@@ -54,7 +56,6 @@ public class JcrRepositorySessionFactory
private Map<String, MetadataFacetFactory> metadataFacetFactories;
- @Inject
private Repository repository;
// Lazy evaluation to avoid problems with circular dependencies during initialization
@@ -123,6 +124,11 @@ public class JcrRepositorySessionFactory
JcrMetadataRepository metadataRepository = null;
try
{
+ RepositoryFactory factory = new RepositoryFactory();
+ // FIXME this need to be configurable
+ Path directoryPath = Paths.get(System.getProperty( "appserver.base" ), "data/jcr");
+ factory.setRepositoryPath( directoryPath );
+ repository = factory.createRepository();
metadataRepository = new JcrMetadataRepository( metadataFacetFactories, repository );
JcrMetadataRepository.initialize( metadataRepository.getJcrSession() );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml b/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
index e3fa80b..c07cc52 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
@@ -19,8 +19,8 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 48fbb9c..8d0e542 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<lucene.version>4.10.4</lucene.version>
- <jackrabbit.version>2.14.1</jackrabbit.version>
+
+ <jcr-oak.version>1.7.2</jcr-oak.version>
+ <jackrabbit.version>2.15.4</jackrabbit.version>
<cxf.version>3.0.3</cxf.version>
<derbyVersion>10.13.1.1</derbyVersion>
@@ -286,6 +288,36 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-jcr</artifactId>
+ <version>${jcr-oak.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment-tar</artifactId>
+ <version>${jcr-oak.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-lucene</artifactId>
+ <version>${jcr-oak.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-misc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-facet</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-webdav</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-reader</artifactId>
<version>${maven.indexer.version}</version>
[3/5] archiva git commit: more progress on new maven indexer version
Posted by ol...@apache.org.
more progress on new maven indexer version
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/003d5794
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/003d5794
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/003d5794
Branch: refs/heads/feature/jcr_oak
Commit: 003d5794a823d57b58ec26663fe145f31649ce31
Parents: 7480b7f
Author: olivier lamy <ol...@apache.org>
Authored: Mon Jul 24 10:12:23 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Mon Jul 24 10:12:23 2017 +1000
----------------------------------------------------------------------
.../lucene/NexusIndexerConsumerTest.java | 14 +-
.../search/MavenRepositorySearchTest.java | 23 +-
.../src/test/repo-release/.index/_7.fdt | Bin 358889 -> 0 bytes
.../src/test/repo-release/.index/_7.fdx | Bin 3324 -> 0 bytes
.../src/test/repo-release/.index/_7.fnm | 5 -
.../src/test/repo-release/.index/_7.frq | 262 -------------------
.../src/test/repo-release/.index/_7.nrm | 1 -
.../src/test/repo-release/.index/_7.prx | Bin 48973 -> 0 bytes
.../src/test/repo-release/.index/_7.tii | Bin 852 -> 0 bytes
.../src/test/repo-release/.index/_7.tis | Bin 67003 -> 0 bytes
.../src/test/repo-release/.index/_8.fdt | Bin 0 -> 86211 bytes
.../src/test/repo-release/.index/_8.fdx | Bin 0 -> 114 bytes
.../src/test/repo-release/.index/_8.fnm | Bin 0 -> 2157 bytes
.../src/test/repo-release/.index/_8.nvd | Bin 0 -> 2330 bytes
.../src/test/repo-release/.index/_8.nvm | Bin 0 -> 261 bytes
.../src/test/repo-release/.index/_8.si | Bin 0 -> 371 bytes
.../test/repo-release/.index/_8_Lucene41_0.doc | Bin 0 -> 21619 bytes
.../test/repo-release/.index/_8_Lucene41_0.pos | Bin 0 -> 40037 bytes
.../test/repo-release/.index/_8_Lucene41_0.tim | Bin 0 -> 91607 bytes
.../test/repo-release/.index/_8_Lucene41_0.tip | Bin 0 -> 1250 bytes
.../src/test/repo-release/.index/segments.gen | Bin 20 -> 36 bytes
.../src/test/repo-release/.index/segments_8 | Bin 279 -> 0 bytes
.../src/test/repo-release/.index/segments_9 | Bin 0 -> 102 bytes
.../indexing/ArchivaIndexingTaskExecutor.java | 13 +-
.../indexing/ArtifactIndexingTask.java | 8 +-
.../DefaultDownloadRemoteIndexScheduler.java | 29 +-
.../indexing/DefaultIndexUpdateSideEffect.java | 47 ++++
.../indexing/DownloadRemoteIndexTask.java | 27 +-
.../ArchivaIndexingTaskExecutorTest.java | 91 +++----
.../indexing/DownloadRemoteIndexTaskTest.java | 7 +-
.../archiva/web/startup/ArchivaStartup.java | 12 +-
.../archiva-web/archiva-webdav/pom.xml | 4 +
.../plugins/maven2-repository/pom.xml | 2 +-
.../plugins/metadata-store-jcr/pom.xml | 7 +-
.../jcr/JcrRepositorySessionFactory.java | 8 +-
.../META-INF/spring-context.xml | 4 +-
pom.xml | 34 ++-
37 files changed, 180 insertions(+), 418 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/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 5ce2781..b5e688b 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
@@ -23,13 +23,14 @@ import junit.framework.TestCase;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.FileTypes;
+import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
import org.apache.archiva.scheduler.ArchivaTaskScheduler;
import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
+import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
-import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
+import org.apache.maven.index.NexusIndexer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +46,6 @@ import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* NexusIndexerConsumerTest
@@ -58,7 +58,7 @@ public class NexusIndexerConsumerTest
private final class ArchivaTaskSchedulerStub
implements ArchivaTaskScheduler<ArtifactIndexingTask>
{
- Set<File> indexed = new HashSet<File>();
+ Set<File> indexed = new HashSet<>();
@Override
public void queueTask( ArtifactIndexingTask task )
@@ -96,7 +96,7 @@ public class NexusIndexerConsumerTest
private ApplicationContext applicationContext;
@Inject
- private PlexusSisuBridge plexusSisuBridge;
+ private NexusIndexer nexusIndexer;
@Inject
private MavenIndexerUtils mavenIndexerUtils;
@@ -119,8 +119,8 @@ public class NexusIndexerConsumerTest
FileTypes filetypes = applicationContext.getBean( FileTypes.class );
nexusIndexerConsumer =
- new NexusIndexerConsumer( scheduler, configuration, filetypes, plexusSisuBridge, mavenIndexerUtils,
- managedRepositoryAdmin );
+ new NexusIndexerConsumer( scheduler, configuration, filetypes, mavenIndexerUtils,
+ managedRepositoryAdmin, nexusIndexer );
// initialize to set the file types to be processed
( (NexusIndexerConsumer) nexusIndexerConsumer ).initialize();
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
index 4b0d993..8fb3728 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
@@ -22,6 +22,7 @@ package org.apache.archiva.indexer.search;
import org.apache.archiva.common.utils.FileUtil;
import org.apache.archiva.indexer.util.SearchUtil;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
+import org.apache.maven.index.shaded.lucene.index.IndexUpgrader;
import org.codehaus.plexus.util.FileUtils;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -29,10 +30,7 @@ import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -40,8 +38,8 @@ import java.util.Collections;
import java.util.List;
-@RunWith(ArchivaSpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" })
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class MavenRepositorySearchTest
extends AbstractMavenRepositorySearch
{
@@ -290,13 +288,13 @@ public class MavenRepositorySearchTest
archivaConfigControl.replay();
- SearchResults results = search.search( "user", selectedRepos, "org", limits, Collections.<String>emptyList() );
+ SearchResults results = search.search( "user", selectedRepos, "org", limits, Collections.emptyList() );
archivaConfigControl.verify();
assertNotNull( results );
assertEquals( 1, results.getHits().size() );
- assertEquals( "total hits not 8 for page1 " + results, 8, results.getTotalHits() );
+ assertEquals( "total hits not 9 for page1 " + results, 9, results.getTotalHits() );
assertEquals( "returned hits not 1 for page1 " + results, 1, results.getReturnedHitsCount() );
assertEquals( limits, results.getLimits() );
@@ -317,7 +315,7 @@ public class MavenRepositorySearchTest
assertNotNull( results );
assertEquals( "hits not 1", 1, results.getHits().size() );
- assertEquals( "total hits not 8 for page 2 " + results, 8, results.getTotalHits() );
+ assertEquals( "total hits not 9 for page 2 " + results, 9, results.getTotalHits() );
assertEquals( "returned hits not 1 for page2 " + results, 1, results.getReturnedHitsCount() );
assertEquals( limits, results.getLimits() );
}
@@ -873,7 +871,9 @@ public class MavenRepositorySearchTest
File indexDirectory = new File( repo, ".index" );
FileUtils.copyDirectoryStructure( new File( "src/test/repo-release" ), repo );
- createIndex( "repo-release", Collections.<File>emptyList(), false );
+ IndexUpgrader.main( new String[]{indexDirectory.getAbsolutePath()} );
+
+ createIndex( "repo-release", Collections.emptyList(), false );
nexusIndexer.addIndexingContext( REPO_RELEASE, REPO_RELEASE, repo, indexDirectory,
repo.toURI().toURL().toExternalForm(),
@@ -886,8 +886,9 @@ public class MavenRepositorySearchTest
archivaConfigControl.replay();
- SearchResults searchResults = search.search( null, Arrays.asList( REPO_RELEASE ), "org.example", limits,
- Collections.<String>emptyList() );
+ SearchResults searchResults = search.search( null, Arrays.asList( REPO_RELEASE ), //
+ "org.example", limits, //
+ Collections.emptyList() );
log.info( "results: {}", searchResults.getHits().size() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdt
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdt b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdt
deleted file mode 100644
index 9c708ca..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdx
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdx b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdx
deleted file mode 100644
index 9c6ebd9..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fnm
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fnm b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fnm
deleted file mode 100644
index b57e721..0000000
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fnm
+++ /dev/null
@@ -1,5 +0,0 @@
-����
-DESCRIPTORIDXINFOumigavgroupId
-artifactIdversionp1c
-classnamesBundle-SymbolicNameBundle-VersionExport-PackageExport-Service Bundle-NameImport-PackageRequire-Bundle
-rootGroupsrootGroupsList allGroups
allGroupsList
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.frq
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.frq b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.frq
deleted file mode 100644
index d966170..0000000
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.frq
+++ /dev/null
@@ -1,262 +0,0 @@
-���Y�%��5��������yq����u�W�
������������������I�����������������_�����#��s���������������+�������������1?�������;w��������������������������i��g��K!�)������U�����������������A�3�������'�{���������������������9���������������m�������������������������=��Q��e���������������
���}�����������7 E������������������M�k�������������-�����������/������GO���]��c�����o��C������������ �[� ���� �S������������������ �� 1e �K^X�������� 1e �K^X�� ���������������������������������������������������������������������������������
���� ��� ����������{�����si_[W��OIC;3+# %
7/ 1
3
1u� %
7
J]9$/@�� �� 1e �K^X�������� 1e �K^X�� �����������������������������������1�W������������������������������������������������������� ���
����������{�����si_[�W# 5
'>"7,%%*(��OIC;3+#
-
A�
)
`L
/ +
)
1YO�
'G?+ (,<�
3 )(( ! !1
7A�
9
|� %
7/ 1
3
1u�
7
9MF$#5:!1
7A�
9
|� %
7/ 1
3
1u� %
7
J]9$/@�� 9 �`� t(6� I* P� E
=
9SV*64� u77�*�� u77�*�� t.6� K* P� H�������
���s�r���'%
_%
=
�eI�� �s���� u77�*������������a� u17�*�
-
<
9-S%V*6 4r��'1_% = �{I���������������� u77�*�����1�W�� '$
_%
=
; ( tl M* `i:� u77�*������������������������������������������������
=
9SV*64�r�����������������
��s'1_%
=
�{I�
=
�
#
1Bn��
=
9SV*64W'1_%
=
�{I�
!
3
.%(*$ "# ��OI;3#
=
9SV*64� u77�*�'$
_%
=
�dI�
-&0^$ < :!7!� \*~�� 9 �
3 )(( ! ���������� �������������
3� - -$(q 1���������������
3 )(( ! ��������
����� u75� X������������������������������������
3 )(( ! �������������������s
3 )(( !
3
)(( ! W
3 )(( ! ��OI;3# � ## ### t 6 4 � � �X � 1e 9(&4>h0 P L
-
- 1e
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9(
-
-
-
-
-
-&
-
-4
-
-
-
-
-
-
-
-
-
->!h0 � �P L � 1e 9(&4> h0 r �P dL r�� u75� X�
Y�t64� x �X ��
=
9SV * 64 � qW��V���
��W���� u77� * � �� '1_%
=
!!�N 'XV�Z8���
F
-
-
-
-
-
-
-
-
-
4
-
-
c
4
-
-
d �%m#� / � �! � �% �"�
3 )(( ! W��������0 > r� "> 1� 2����V������V��1 ?
s�!
u
� ! ?
s#!
!
z\ 6 Z "�W��� u15� X �W�[9���W���� u/5� X��1 ?
s�
!
#?
1��
- <
9 5S H � �' �1 J< yW�[?����V�q(W�� 1e �C ^XW�[?�V�Z01 ?
s�
!
"?
1� 1 ?
s�
!
""
0 � W�[?0 > r� "R � -�
> r 4 1 z c^$ P2F.�I� $ 9A
1)
� �!W�[?W�[?�V�Z>0 > r� 9< � <V��W��W�[?����V�Z8� 1e �K^X�W�Z?W���V �Z
-� � ! /!!, $r!4W���V�Z>PW�[?�
-
-
-
-
- ,(
-
- !
-
- !9!(,d 8$V 1"./9+:W�����y
7?1 ?
s�!
#S
1��W����W���� � �W��
=
9 S.V * 6!4$
- < 9 4S :V >* @6 84 =1 ?
s�!
[
� V
-�
-Z>
-�W�[?�W�[?�����W�[?0 " r� #+ � -�W��� 1e 6
Y=K^XV�Z9�W��Q�W�Z?���s�+W0 > r� t 0
� .1 ?
s�
!
#>
1��� ) !�� �� u /7� * � ��9����D� A)� %o W��V����������0W�Z?W���9W�Z9Q�0 > rG� "# 0� J0 > rF� a � <�W�[>Q���pD � 4A+ )� V"J7W�������1 ?
s�!
"S
0�W� k/W��
=
9 SV * 6 4&W����V����W���
-
- /
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-&
-
-
-
-
-
-J
- &
-
-
-
-
-
-
-
-
-
-# v� C � � .! j � � � t � q �1 ?
s�!
u
� ��r�t1 ?
s�!
u
� V��W��V��W�[?�W�Z?V
-�
-�
-W���� �W�[?V� dZ>W��W�� 1e �K^X��W��V���W �[�1 ?
s�!
#S
� W�Z8� '1_% = ; 0 �N B X ���1�W��W��s���9� u17� * �!W�[?W��������
! ?
s 4
!
1
z"^ P"H!W�[?�V�j.� u17� * �
-
-
-
-
-
-
-
-
-%+ $ $ %+# �1 ?
s�!
u
� W�[?���V��W�Z?�V���1 ?
s�
!
a
� ����
-���E� 5A1)� VJ�������V��� ����V��W�� )
=
5
?k, =CV�Z(Q1 ?
s�
!
" (
0���W�Z?�V��W�����W�[?�1
- 11�
- 111111111120 �111�%2�11[ �)!�( � �( c' �* � �!!�"!�!� � �
-
-
-
-
-
-
-
n
-
-�
- n
-
-- � �%�#� 6J � �! � �% �"�� 1e (
(=h/ * 0' (C+W�����W��W��W����
=
9SV*64��W����V��V������� t06� -* 1� 4W���W��W��W���r�t�V��������V�Z>Q�����W�[)�W��1
- 11�
- 111111111120 �111�%2�11[ �)!�( � �( c' �* � �!!�"!�!� ��V�[>���
3 )(( ! �r�ue�V�Z0QW�������
=
9SV * 64'�0 > r� "R 0� .�
! % @B/9#! $!5B..��V���V�[> 1e
9) '5>h0 P J$�
]0 > r� "8 0� !���� u 5� X �
-
- 2 $* &( & &( # 3 %% ! "��W�[?Q�
=
9SH '1 :%�V��V � Z>
=
9SV*641 ?
s�
!
#(
1����'1_%
=
�{I� )
I �
")
0j��
=
9 S$V * 6 45V�Z>V�Z8
3 )(( ! W�[9 1e
9) '7>h: * |W�Z9W�Z9�V����V���1 ?
s�
!
"8
�#��W�Z?Q
<
� " 0B n '� 0�1 ?
s�
!
")
� 1 ?
s�!
9=
� W��
=
9SV * 64 ���W�����W�[9Q�1 ?
s�
!
"(
0�)W�[?W�� 1e �C ^X���V����
-
- 1e
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9(
-
-
-
-
-
-&
-
-4
-
-
-
-
-
-
-
-
-
->!h0 � �P L �� u15� X
=
9SV * 64 ��W��W��W�������
- & '" ( + �0 > r� t 0
-� [� 1 ?
s�!
u
� �[?��V��1 ?
s�!
u
� , RM 0 T W ' I [ m U N � C hW�Z
-?��V���D� 4A)�!* �'W���V���t 1e �K^X
-
-
-
-
-
-
- 9
-
-
-
-% !!/ * + @ -!u 1e �K^X
� ' /($/�@ "
-
-
-
-2�
-
-6
-
-.D8 / � �t64� X u 1e �K^X 1e �K^X 1e
9)'5>h0 PL
� ' /($/�@ #
3� 7 /D8/�uu %
5�
7
/S1�Jutu 1e �K^X
-
-
-
-
-
-
-
- 8
-
-
-
-% .! :/ 3 . ; @ +-' 1e �K^Xuut
-0d �J^ X "
-
-
-
-2�
-
-6
-
-.D 8 / � u
-0d �J^ -X 0�������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
�������������{wsoica_][YWUOIC=;93-+)#
��� �� 1e �K^X��
������ 1e �K^X�� ��
! !
,%'+," ( (������������������������������������������������������������������������������
������������������w�����oca]YU��OI=9-)# ��������������������W��������������������������������SM7'!���������������������������������������uQK5% ���������������������� ������������������������������������������������������������������
������������������������������������������������������sOI;3#
3 )(( ! !1
7A�
9
|� %
7/ 1
3
1u�
7
9MF$ # 5:!1
7A�
9
|� %
7/ 1
3
1u� %
7
J]9 $ /@��8�����������
-��������������������������������0�W����������������������������������������������������������������~����r�� u77� XV
!
3 .%
(*$ "# ��NH:2" ���0���0
���0 a
! !
,%'+," ( (������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
�������������������������������������������������������������������������������������������������������������������}{ywqousmkigeca_][YUWSQOMKIGECA?=9;1/-753+)'%#!
;�% A80� ){%% 1;70tI�
*(/
' ���0
;�%
A80� ){%% 1;70tI
*(/ (
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.nrm
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.nrm b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.nrm
deleted file mode 100644
index 6579c29..0000000
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.nrm
+++ /dev/null
@@ -1 +0,0 @@
-NRM�|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy|||xx||||y|y|yyxx||||||yxyyy|||y|yyyxxx||||||y|yxyx|yyyxxxyy||yyxx||||||yxyyy|||y|yyy|||yyy|||yyyxxxyyy|||yyy|||y|y|||||||yyy|||yyy|||yyy|||yyy|||xxxxxxyyyxxxxxxxxxyyyxxxyyy|||yyy|||yyxxyy||y|y|y|y|y|y|y|y|y|yyy|||y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|xyxyxyy|yy||yy||yy||yy||y|y|y|y|y|yx||y|yyyxxx||||||yyy|||yyy|||y|y|y|y|y|y|yy||yyxxyy||y|||||yy||y|yy||yy||y|||||||yyy|||yyy|||xyxyxyxyxyxyxyxyxyy|xyy|||xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxyxyxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||y|y||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||y|y|y|y|y|y|y|y|y|||y|||y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|||||||||||||||||||||||||||||||||||||||||||||||||||||||||y|y|y|y|y|y||||||||||||||||||||||||||y||||||||||||||||||||||||||y|y|y|y|y|y|y|y|y|y|||||||uvvvv|u|u||||vvvvvv|||||vvv|v||||||vvvvvv|w|||||||||||||vv||||vvvvvv|||||vvv|v|||vvv|||vvv|||||||||vvv|||vvv|v|vvvvvvv|||vvv|||vvvuuuvvvuuuvvv||||||||||||||||||||||||uuuvvvuuuvvv||||||vv|t|t|t|t|u|u|u|u|u|||tvv|t|t|t|t|t|t|t|t|t|t|t|t|t|t|u|u|t|t|t|t|t|t|t|t|t|t|t|t|t||vv||vv||vv||vv|v|w|v|v|v||vv|v||||||vvvvvv|||vvv|||vvv|t|t|t|t|t|t||wv||||||vv|vvvvv||wv|v||uv||vv|vvvvvvv|||vvv|||vvv|t|t|t|t|t|t|t|t|t|t|uu||
||wxxxx|y|y||xxxx|xx||x|||xx||x|||xxxxx|xx||y|x|x||||xxx||xx||xxxx|xx||x|||xx||x|||xx||||xx||||xxx|||xx||||xx||x|xxx|xx||||xx||||xx|xxyxx|xxyxx||||xxx|||xxx|||xxx|||xxxxxyxx|xxyxx|||xx||xx|x|x|x|x|y|y|y|y|y|||xx||x|x|x|x|x|x|x|x|x|x|x|x|x|x|y|y|x|x|x|x|x|x|x|x|x|x|x|x|x||xx||xx||xx||xx|x|y|x|x|x|xxx|x|||xxxxx|xx||||xx||||xx||x|x|x|x|x|x||yx||xx||xx|xx|x|||y||x||yx||xx|xxx|xx||||xx||||xx||x|x|x|x|x|x|x|x|x|x|xx||||xxxxx|x|x||xxxyxxyx|x|||xxx|x|||xxxxyxxyx|x|x|x||||xxx||xx||xxxyxxyx|x|||xxx|x|||xxx|||xxx|||xxx|||xxx|||xxx|x|xxyxxyx|||xxx|||xxxyyxxyxyyxxyx|||xxx|||xxx|||xxx|||xxxyyxxyxyyxxyx||xx||xx|x|x|x|x|x|x|x|x|x|||xyx|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x||xx||xx||xx||xx|x|x|x|x|x|xxx|x|||xxxxyxxyx|||xxx|||xxx|x|x|x|x|x|x||xy||xx||xx|xyxyx||xx|x||xy||xx|xxyxxyx|||xxx|||xxx|x|x|x|x|x|x|x|x|x|x|xy||||trrrr|q|q||||rwwrww|||||tww|t||||||rwwrww|u|||||||||||||qw||||rwwrww|||||tww|t|||tww|||tww|||||||||tww|||tww|t|trwwrww|||tww|||twwvvvrwwvvvrww|||||||||||||||||||||||
|vvvrwwvvvrww||||||tw|q|q|q|q|x|x|x|x|x|||qww|q|q|q|q|q|q|q|q|w|w|w|w|w|q|q|q|q|q|q|q|q|q|q|q|q|q|q|q|q||tw||tw||tw||tw|t|u|t|t|t||rr|t||||||rwwrww|||tww|||tww|q|q|q|q|q|q||tt||||||tw|twwww||xw|q||qw||tw|trwwrww|||tww|||tww|q|q|q|q|q|q|q|q|q|q|rv||||uuuuu|u|u||||uuuuuu|||||uuu|u||||||uuuuuu|u|||||||||||||uu||||uuuuuu|||||uuu|u|||uuu|||uuu|||||||||uuu|||uuu|u|uuuuuuu|||uuu|||uuuuuuuuuuuuuuu||||||||||||||||||||||||uuuuuuuuuuuu||||||uu|u|u|u|u|u|u|u|u|u|||uuu|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u||uu||uu||uu||uu|u|u|u|u|u||uu|u||||||uuuuuu|||uuu|||uuu|u|u|u|u|u|u||uu||||||uu|uuuuu||uu|u||uu||uu|uuuuuuu|||uuu|||uuu|u|u|u|u|u|u|u|u|u|u|uu||||x||||||||||xx|||||||x|||||||||||xxx|||||||||x|x||||xxx||||||xx|||||||x|||||||||||||||||||||||xxx||||||||||||||||||||||||||||||||||yyy|||yyy||||||xxx|||xxx|||xxx|||xxxyyy|||yyy|||||xx|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||y|y|y|||||||||||||||||||||||||||||x|||||||xxx||||||||||||||||||||||||||
||||||||||xx|||||||||||||||||||||||||||||||||||||||||||||y|y|y|y|y|y|y|y|y|||yy||||knnnn|l|l||rrnrtnrt|r|||krt|k|||rrrnrtnrt|g|r|r||||rrr||mr||rrnrtnrt|r|||krt|k|||krt|||krt|||rrr|||krt|||krt|k|knrtnrt|||krt|||krtrrtnrtrrtnrt|||rrr|||rrr|||rrr|||rrrrrtnrtrrtnrt||rr||kr|l|l|l|l|m|m|m|m|m|||lmm|l|l|l|l|l|l|l|l|m|m|m|m|m|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l||mr||mr||mr||mr|m|m|n|n|g|rnn|k|||rrrnrtnrt|||krt|||krt|l|l|l|l|l|l||eo||rr||mr|lrtrt||tt|m||lm||kr|gnrtnrt|||krt|||krt|l|l|l|l|l|l|l|l|l|l|ir||||||||||w|w||ss|tt|tu|s||||tt|||||sss|tt|tu|||s|s||||sss|||p||ss|tt|tu|s||||tt||||||tt||||tt|||sss||||tt||||tt|||||tt|tu||||tt||||ttttt|ttttu|tu|||sss|||sss|||sss|||sssttt|ttttu|tu||ss|||t|w|w|w|w|w|w|w|w|w|||www|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|||||||||||||||||||||||||||s|||||||sss|tt|tu||||tt||||tt|w|w|w|w|w|w||||||ss||||||tttu||tt||||ww|||||||tt|tu||||tt||||tt|w|w|w|w|w|w|w|w|w|w||s||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.prx
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.prx b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.prx
deleted file mode 100644
index 601fb22..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.prx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tii
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tii b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tii
deleted file mode 100644
index 52941c7..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tii and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tis
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tis b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tis
deleted file mode 100644
index d018fa6..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tis and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdt
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdt b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdt
new file mode 100644
index 0000000..9ab6d4d
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdt differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdx
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdx b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdx
new file mode 100644
index 0000000..a26fbfa
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdx differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fnm
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fnm b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fnm
new file mode 100644
index 0000000..b9f9243
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fnm differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvd
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvd b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvd
new file mode 100644
index 0000000..d832c2f
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvd differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvm
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvm b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvm
new file mode 100644
index 0000000..a27cff8
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvm differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.si
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.si b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.si
new file mode 100644
index 0000000..2539c76
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.si differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc
new file mode 100644
index 0000000..0a2394b
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos
new file mode 100644
index 0000000..4d9bbaa
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim
new file mode 100644
index 0000000..ac84752
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip
new file mode 100644
index 0000000..d94d9c9
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments.gen
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments.gen b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments.gen
index e76c903..077a451 100644
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments.gen and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments.gen differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_8
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_8 b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_8
deleted file mode 100644
index 8d4ef95..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_8 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_9
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_9 b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_9
new file mode 100644
index 0000000..a01b84f
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_9 differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/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 478473e..67d05d1 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
@@ -51,7 +51,7 @@ import java.io.IOException;
* all performed by this executor. Add and update artifact in index tasks are added in the indexing task queue by the
* NexusIndexerConsumer while remove artifact from index tasks are added by the LuceneCleanupRemoveIndexedConsumer.
*/
-@Service ( "taskExecutor#indexing" )
+@Service( "taskExecutor#indexing" )
public class ArchivaIndexingTaskExecutor
implements TaskExecutor
{
@@ -112,9 +112,10 @@ public class ArchivaIndexingTaskExecutor
{
try
{
- log.debug( "Creating indexing context on resource: {}", ( indexingTask.getResourceFile() == null
- ? "none"
- : indexingTask.getResourceFile().getPath() ) );
+ log.debug( "Creating indexing context on resource: {}", //
+ ( indexingTask.getResourceFile() == null
+ ? "none"
+ : indexingTask.getResourceFile().getPath() ) );
context = managedRepositoryAdmin.createIndexContext( repository );
}
catch ( RepositoryAdminException e )
@@ -233,8 +234,10 @@ public class ArchivaIndexingTaskExecutor
{
IndexPackingRequest request = new IndexPackingRequest( context, //
- context.acquireIndexSearcher().getIndexReader(), //
+ context.acquireIndexSearcher().getIndexReader(),
+ //
context.getIndexDirectoryFile() );
+
indexPacker.packIndex( request );
context.updateTimestamp( true );
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
index 0029bc0..2da5ab7 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
@@ -20,8 +20,8 @@ package org.apache.archiva.scheduler.indexing;
*/
import org.apache.archiva.admin.model.beans.ManagedRepository;
-import org.apache.maven.index.context.IndexingContext;
import org.apache.archiva.redback.components.taskqueue.Task;
+import org.apache.maven.index.context.IndexingContext;
import java.io.File;
@@ -80,7 +80,13 @@ public class ArtifactIndexingTask
public void setExecuteOnEntireRepo( boolean executeOnEntireRepo )
{
+ this.executeOnEntireRepo( executeOnEntireRepo );
+ }
+
+ public ArtifactIndexingTask executeOnEntireRepo( boolean executeOnEntireRepo )
+ {
this.executeOnEntireRepo = executeOnEntireRepo;
+ return this;
}
@Override
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
index 42a6b72..a3930c6 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
@@ -57,7 +57,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
* @author Olivier Lamy
* @since 1.4-M1
*/
-@Service ("downloadRemoteIndexScheduler#default")
+@Service( "downloadRemoteIndexScheduler#default" )
public class DefaultDownloadRemoteIndexScheduler
implements ConfigurationListener, DownloadRemoteIndexScheduler
{
@@ -65,7 +65,7 @@ public class DefaultDownloadRemoteIndexScheduler
private Logger log = LoggerFactory.getLogger( getClass() );
@Inject
- @Named (value = "taskScheduler#indexDownloadRemote")
+ @Named( value = "taskScheduler#indexDownloadRemote" )
private TaskScheduler taskScheduler;
@Inject
@@ -84,15 +84,15 @@ public class DefaultDownloadRemoteIndexScheduler
private NetworkProxyAdmin networkProxyAdmin;
@Inject
- private PlexusSisuBridge plexusSisuBridge;
-
- @Inject
private MavenIndexerUtils mavenIndexerUtils;
+ @Inject
private NexusIndexer nexusIndexer;
+ @Inject
private IndexUpdater indexUpdater;
+ @Inject
private IndexPacker indexPacker;
// store ids about currently running remote download : updated in DownloadRemoteIndexTask
@@ -106,12 +106,6 @@ public class DefaultDownloadRemoteIndexScheduler
archivaConfiguration.addListener( this );
// TODO add indexContexts even if null
- nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class );
-
- indexUpdater = plexusSisuBridge.lookup( IndexUpdater.class );
-
- this.indexPacker = plexusSisuBridge.lookup( IndexPacker.class );
-
for ( RemoteRepository remoteRepository : remoteRepositoryAdmin.getRemoteRepositories() )
{
String contextKey = "remote-" + remoteRepository.getId();
@@ -180,11 +174,14 @@ public class DefaultDownloadRemoteIndexScheduler
}
}
- DownloadRemoteIndexTaskRequest downloadRemoteIndexTaskRequest =
- new DownloadRemoteIndexTaskRequest().setRemoteRepository( remoteRepository ).setNetworkProxy(
- networkProxy ).setFullDownload( fullDownload ).setWagonFactory(
- wagonFactory ).setRemoteRepositoryAdmin( remoteRepositoryAdmin ).setIndexUpdater(
- indexUpdater ).setIndexPacker( this.indexPacker );
+ DownloadRemoteIndexTaskRequest downloadRemoteIndexTaskRequest = new DownloadRemoteIndexTaskRequest() //
+ .setRemoteRepository( remoteRepository ) //
+ .setNetworkProxy( networkProxy ) //
+ .setFullDownload( fullDownload ) //
+ .setWagonFactory( wagonFactory ) //
+ .setRemoteRepositoryAdmin( remoteRepositoryAdmin ) //
+ .setIndexUpdater( indexUpdater ) //
+ .setIndexPacker( this.indexPacker );
if ( now )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultIndexUpdateSideEffect.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultIndexUpdateSideEffect.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultIndexUpdateSideEffect.java
new file mode 100644
index 0000000..d6a29c9
--- /dev/null
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultIndexUpdateSideEffect.java
@@ -0,0 +1,47 @@
+package org.apache.archiva.scheduler.indexing;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.index.context.IndexingContext;
+import org.apache.maven.index.shaded.lucene.store.Directory;
+import org.apache.maven.index.updater.IndexUpdateSideEffect;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+/**
+ * Not doing much but required at least one implementation
+ *
+ * @since 3.0.0
+ */
+@Service
+public class DefaultIndexUpdateSideEffect
+ implements IndexUpdateSideEffect
+{
+ private static final Logger LOGGER = LoggerFactory.getLogger( DefaultIndexUpdateSideEffect.class );
+
+ @Override
+ public void updateIndex( Directory directory, IndexingContext indexingContext, boolean b )
+ {
+ LOGGER.info( "updating index: {} with directory: {}", //
+ indexingContext.getId(), //
+ directory.toString() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
index f8fd42a..436e7bb 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
@@ -196,32 +196,7 @@ public class DownloadRemoteIndexTask
indexingContext.updateTimestamp( true );
}
- catch ( MalformedURLException e )
- {
- log.error( e.getMessage(), e );
- throw new RuntimeException( e.getMessage(), e );
- }
- catch ( WagonFactoryException e )
- {
- log.error( e.getMessage(), e );
- throw new RuntimeException( e.getMessage(), e );
- }
- catch ( ConnectionException e )
- {
- log.error( e.getMessage(), e );
- throw new RuntimeException( e.getMessage(), e );
- }
- catch ( AuthenticationException e )
- {
- log.error( e.getMessage(), e );
- throw new RuntimeException( e.getMessage(), e );
- }
- catch ( IOException e )
- {
- log.error( e.getMessage(), e );
- throw new RuntimeException( e.getMessage(), e );
- }
- catch ( RepositoryAdminException e )
+ catch ( Exception e )
{
log.error( e.getMessage(), e );
throw new RuntimeException( e.getMessage(), e );
[5/5] archiva git commit: oak 1.7.3
Posted by ol...@apache.org.
oak 1.7.3
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/f15eb37c
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/f15eb37c
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/f15eb37c
Branch: refs/heads/feature/jcr_oak
Commit: f15eb37cba02512d79685e69b7644a156983e12d
Parents: 8a76b99
Author: olivier lamy <ol...@apache.org>
Authored: Mon Jul 24 14:57:00 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Mon Jul 24 14:57:00 2017 +1000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/f15eb37c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 46a0022..96218db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<lucene.version>4.10.4</lucene.version>
- <jcr-oak.version>1.7.2</jcr-oak.version>
+ <jcr-oak.version>1.7.3</jcr-oak.version>
<jackrabbit.version>2.15.4</jackrabbit.version>
<cxf.version>3.0.3</cxf.version>