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/06/23 23:34:07 UTC
archiva git commit: some progress on new indexer
Repository: archiva
Updated Branches:
refs/heads/feature/jcr_oak ddbb6cdaf -> 0bfead826
some progress on new indexer
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/0bfead82
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/0bfead82
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/0bfead82
Branch: refs/heads/feature/jcr_oak
Commit: 0bfead8264c924e832a9672f85516e0bf69c5cd8
Parents: ddbb6cd
Author: olivier lamy <ol...@apache.org>
Authored: Sat Jun 24 09:33:50 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Jun 24 09:33:50 2017 +1000
----------------------------------------------------------------------
.../common/plexusbridge/MavenIndexerUtils.java | 31 ++------------------
.../main/resources/META-INF/spring-context.xml | 2 +-
.../archiva-repository-admin-default/pom.xml | 14 +++------
.../remote/DefaultRemoteRepositoryAdmin.java | 21 ++-----------
.../main/resources/META-INF/spring-context.xml | 2 +-
.../jcr/JcrMetadataRepositoryTest.java | 1 +
pom.xml | 20 ++++++++++++-
7 files changed, 31 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/0bfead82/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
index 448851e..dc94ad5 100644
--- 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
@@ -20,18 +20,11 @@ package org.apache.archiva.common.plexusbridge;
*/
import org.apache.maven.index.context.IndexCreator;
-import org.apache.maven.index.creator.JarFileContentsIndexCreator;
-import org.apache.maven.index.creator.MavenArchetypeArtifactInfoIndexCreator;
-import org.apache.maven.index.creator.MavenPluginArtifactInfoIndexCreator;
-import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator;
-import org.apache.maven.index.creator.OsgiArtifactIndexCreator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
@@ -44,32 +37,14 @@ public class MavenIndexerUtils
private Logger log = LoggerFactory.getLogger( getClass() );
+ @Inject
private List<? extends IndexCreator> allIndexCreators;
- @Inject
- public MavenIndexerUtils( PlexusSisuBridge plexusSisuBridge )
- throws PlexusSisuBridgeException
+ public MavenIndexerUtils()
{
- allIndexCreators = new ArrayList( plexusSisuBridge.lookupList( IndexCreator.class ) );
-
- if ( allIndexCreators == null || allIndexCreators.isEmpty() )
- {
- // olamy when the TCL is not a URLClassLoader lookupList fail !
- // when using tomcat maven plugin so adding a simple hack
- log.warn( "using lookupList from sisu plexus failed so build indexCreator manually" );
-
- allIndexCreators =
- Arrays.asList( plexusSisuBridge.lookup( IndexCreator.class, OsgiArtifactIndexCreator.ID ),
- plexusSisuBridge.lookup( IndexCreator.class, MavenArchetypeArtifactInfoIndexCreator.ID ),
- plexusSisuBridge.lookup( IndexCreator.class, MinimalArtifactInfoIndexCreator.ID ),
- plexusSisuBridge.lookup( IndexCreator.class, JarFileContentsIndexCreator.ID ),
- plexusSisuBridge.lookup( IndexCreator.class, MavenPluginArtifactInfoIndexCreator.ID ) );
-
- }
-
if ( allIndexCreators == null || allIndexCreators.isEmpty() )
{
- throw new PlexusSisuBridgeException( "no way to initiliaze IndexCreator" );
+ throw new RuntimeException( "cannot initiliaze IndexCreators" );
}
log.debug( "allIndexCreators {}", allIndexCreators );
http://git-wip-us.apache.org/repos/asf/archiva/blob/0bfead82/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/resources/META-INF/spring-context.xml
index 41188dc..cd6acff 100644
--- a/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-plexus-bridge/src/main/resources/META-INF/spring-context.xml
@@ -28,5 +28,5 @@
default-lazy-init="true">
<context:annotation-config/>
- <context:component-scan base-package="org.apache.archiva.common.plexusbridge"/>
+ <context:component-scan base-package="org.apache.archiva.common.plexusbridge,org.apache.maven.index"/>
</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/0bfead82/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index 4b164e7..44a2d7b 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -40,16 +40,10 @@
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.archetype</groupId>
http://git-wip-us.apache.org/repos/asf/archiva/blob/0bfead82/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
index 8f39053..bf8d88b 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
@@ -23,9 +23,6 @@ import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.RemoteRepository;
import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin;
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.ProxyConnectorConfiguration;
import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
@@ -60,29 +57,15 @@ public class DefaultRemoteRepositoryAdmin
{
@Inject
- private PlexusSisuBridge plexusSisuBridge;
-
- @Inject
- private MavenIndexerUtils mavenIndexerUtils;
-
- // fields
private List<? extends IndexCreator> indexCreators;
+ @Inject
private NexusIndexer indexer;
@PostConstruct
private void initialize()
throws RepositoryAdminException
{
- try
- {
- indexCreators = mavenIndexerUtils.getAllIndexCreators();
- indexer = plexusSisuBridge.lookup( NexusIndexer.class );
- }
- catch ( PlexusSisuBridgeException e )
- {
- throw new RepositoryAdminException( e.getMessage(), e );
- }
for ( RemoteRepository remoteRepository : getRemoteRepositories() )
{
createIndexContext( remoteRepository );
@@ -323,7 +306,7 @@ public class DefaultRemoteRepositoryAdmin
}
return indexer.addIndexingContext( contextKey, remoteRepository.getId(), repoDir, indexDirectory,
remoteRepository.getUrl(), calculateIndexRemoteUrl( remoteRepository ),
- mavenIndexerUtils.getAllIndexCreators() );
+ indexCreators );
}
catch ( MalformedURLException e )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/0bfead82/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml
index 04e14fb..aa4743c 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml
@@ -29,7 +29,7 @@
<context:annotation-config />
<context:component-scan
- base-package="org.apache.archiva.admin.repository,org.apache.maven.index"/>
+ base-package="org.apache.archiva.admin.repository"/>
<alias name="redbackRuntimeConfigurationAdmin#default" alias="userConfiguration#archiva"/>
http://git-wip-us.apache.org/repos/asf/archiva/blob/0bfead82/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
index debf5c9..a232391 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
@@ -19,6 +19,7 @@ package org.apache.archiva.metadata.repository.jcr;
* under the License.
*/
+import com.google.common.base.Objects;
import org.apache.archiva.metadata.model.MetadataFacetFactory;
import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest;
import org.apache.commons.io.FileUtils;
http://git-wip-us.apache.org/repos/asf/archiva/blob/0bfead82/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bbaf7f8..8abfddf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<javaxMailVersion>1.4</javaxMailVersion>
<!--jettyVersion>9.4.5.v20170502</jettyVersion-->
<jettyVersion>9.4.7-SNAPSHOT</jettyVersion>
- <guava.version>22.0</guava.version>
+ <guava.version>15.0</guava.version>
<openjpaVersion>2.4.1</openjpaVersion>
<!-- restore when we will be able to use a derby in memory database -->
@@ -318,12 +318,30 @@
<groupId>com.google.code.atinject</groupId>
<artifactId>atinject</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-common</artifactId>
<version>3.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>