Cleanup of consumer-archetype

hartraft · Feb 1, 2020 · 9634a93 · 9634a93
1 parent 61c39c4
commit 9634a93
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 1,599 deletions.
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
@@ -37,32 +37,54 @@
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
   <dependencies>
-    <!-- Used by the archetype, so needed to be built before integration
-         tests run and use them -->
+
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-consumer-api</artifactId>
-      <scope>test</scope>
+      <artifactId>archiva-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-configuration</artifactId>
-      <scope>test</scope>
+      <artifactId>archiva-repository-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-repository-admin-api</artifactId>
-      <scope>test</scope>
+      <groupId>org.apache.archiva.components.registry</groupId>
+      <artifactId>archiva-components-spring-registry-api</artifactId>
     </dependency>
+
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>${slf4j.version}</version>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+
+    <!-- Used by the archetype, so needed to be built before integration
+         tests run and use them -->
     <dependency>
       <groupId>org.apache.archiva.maven</groupId>
       <artifactId>archiva-maven-indexer</artifactId>
-      <version>${archivaVersion}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-consumer-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-configuration</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
@@ -98,26 +120,6 @@
       <version>1.9</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
-      <version>5.5.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-highlighter</artifactId>
-      <version>5.5.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-memory</artifactId>
-      <version>5.5.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-queries</artifactId>
-      <version>5.5.5</version>
-    </dependency>
 
     <!-- for some reasons this help sonar to run -->
     <dependency>

diff --git a/...umers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/...umers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -49,9 +49,6 @@
     <requiredProperty key="springVersion">
       <defaultValue>${spring.version}</defaultValue>
     </requiredProperty>
-    <requiredProperty key="guavaVersion">
-      <defaultValue>${guava.version}</defaultValue>
-    </requiredProperty>
     <requiredProperty key="springockitoVersion">
       <defaultValue>${springockito.version}</defaultValue>
     </requiredProperty>
@@ -64,8 +61,5 @@
     <requiredProperty key="httpcoreVersion">
       <defaultValue>${httpclient.core.version}</defaultValue>
     </requiredProperty>
-    <requiredProperty key="asmVersion">
-      <defaultValue>${asm.version}</defaultValue>
-    </requiredProperty>
   </requiredProperties>
 </archetype-descriptor>
diff --git a/...type/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java b/...type/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java
@@ -19,8 +19,6 @@
  * under the License.
  */
 
-import org.apache.archiva.admin.model.RepositoryAdminException;
-import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
 import org.apache.archiva.metadata.repository.MetadataRepository;
 import org.apache.archiva.metadata.repository.RepositorySessionFactory;
 import org.apache.archiva.repository.base.BasicManagedRepository;
@@ -41,7 +39,7 @@
 import java.nio.file.Paths;
 import java.util.Date;
 
-import static org.mockito.Mockito.*;
+// import static org.mockito.Mockito.*;
 
 /**
  * <code>SimpleArtifactConsumerTest</code>
@@ -53,9 +51,6 @@ public class SimpleArtifactConsumerTest
     @Inject
     private SimpleArtifactConsumer consumer;
 
-    @Inject
-    private ManagedRepositoryAdmin managedRepositoryAdmin;
-
     @Inject
     private RepositoryRegistry repositoryRegistry;
 
@@ -76,7 +71,7 @@ public void setUp()
     }
 
     private void setUpMockRepository()
-        throws RepositoryAdminException, IOException, RepositoryException
+        throws IOException, RepositoryException
     {
         Path repoDir = Paths.get( "target/test-consumer-repo" );
         Files.createDirectories( repoDir );

diff --git a/...consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/...consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
@@ -34,12 +34,10 @@
     <slf4j.version>${slf4jVersion}</slf4j.version>
     <log4j.version>${log4jVersion}</log4j.version>
     <spring.version>${springVersion}</spring.version>
-    <guava.version>${guavaVersion}</guava.version>
     <springockito.version>${springockitoVersion}</springockito.version>
     <mockito.version>${mockitoVersion}</mockito.version>
     <httpclient.version>${httpclientVersion}</httpclient.version>
     <httpclient.core.version>${httpcoreVersion}</httpclient.core.version>
-    <asm.version>${asmVersion}</asm.version>
     <archiva.comp.version>${archivaCompVersion}</archiva.comp.version>
     <commons.beanutils.version>${beanUtilsVersion}</commons.beanutils.version>
   </properties>
@@ -54,11 +52,6 @@
       <artifactId>archiva-configuration</artifactId>
       <version>${archiva.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-repository-admin-api</artifactId>
-      <version>${archiva.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-model</artifactId>
@@ -217,28 +210,27 @@
       <version>${log4j.version}</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.kubek2k</groupId>
       <artifactId>springockito</artifactId>
       <version>${springockito.version}</version>
       <scope>test</scope>
     </dependency>
 
+    <!--
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
       <scope>test</scope>
     </dependency>
+
+    -->
   </dependencies>
 
   <!-- match up with those used by Archiva -->
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${guava.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-all</artifactId>
@@ -254,11 +246,6 @@
         <artifactId>httpcore</artifactId>
         <version>${httpclient.core.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.ow2.asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>${asm.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/...umers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties b/...umers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
@@ -25,13 +25,11 @@ archivaVersion=${archivaVersion}
 log4jVersion=${log4j.version}
 slf4jVersion=${slf4j.version}
 springVersion=${spring.version}
-guavaVersion=${guava.version}
 redbackRegistryVersion=${redback.registry.version}
 redbackCacheVersion=${redback.cache.version}
 springockitoVersion=${springockito.version}
 mockitoVersion=${mockito.version}
 httpclientVersion=${httpclient.version}
 httpcoreVersion=${httpclient.core.version}
-asmVersion=${asm.version}
 archivaCompVersion=${archiva.comp.version}
 beanUtilsVersion=${commons.beanutils.version}
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml