diff options
| -rw-r--r-- | archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java | 36 | ||||
| -rw-r--r-- | archiva-jetty/pom.xml | 5 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp-test/pom.xml | 2 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 325 |
5 files changed, 14 insertions, 356 deletions
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java index 60b1c65af..9204b4c84 100644 --- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java +++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java @@ -25,8 +25,6 @@ import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.consumers.RepositoryContentConsumer; -import org.apache.archiva.converter.RepositoryConversionException; -import org.apache.archiva.converter.legacy.LegacyRepositoryConverter; import org.apache.archiva.repository.base.BasicManagedRepository; import org.apache.archiva.repository.scanner.RepositoryScanStatistics; import org.apache.archiva.repository.scanner.RepositoryScanner; @@ -139,7 +137,7 @@ public class ArchivaCli } else if ( command.convert ) { - doConversion( command.properties ); + LOGGER.error( "Conversion is not available anymore" ); } else if ( command.scan ) { @@ -247,38 +245,6 @@ public class ArchivaCli return smallNames; } - private void doConversion( String properties ) - throws IOException, RepositoryConversionException - { - LegacyRepositoryConverter legacyRepositoryConverter = - applicationContext.getBean( LegacyRepositoryConverter.class ); - - Properties p = new Properties(); - - try (InputStream fis = Files.newInputStream( Paths.get( properties ) )) - { - p.load( fis ); - } - - Path oldRepositoryPath = Paths.get( p.getProperty( SOURCE_REPO_PATH ) ); - - Path newRepositoryPath = Paths.get( p.getProperty( TARGET_REPO_PATH ) ); - - LOGGER.info( "Converting {} to {}", oldRepositoryPath, newRepositoryPath ); - - List<String> fileExclusionPatterns = null; - - String s = p.getProperty( BLACKLISTED_PATTERNS ); - - if ( s != null ) - { - fileExclusionPatterns = Arrays.asList( StringUtils.split( s, "," ) ); - } - - legacyRepositoryConverter.convertLegacyRepository( oldRepositoryPath, newRepositoryPath, - fileExclusionPatterns ); - } - private static class Commands { @Argument( description = "Display help information", value = "help", alias = "h" ) diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index 031ac12af..21b779780 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -80,11 +80,6 @@ <artifactId>mail</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <scope>runtime</scope> - </dependency> </dependencies> <build> <plugins> diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml index 6aa386c86..a0d738e3f 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml @@ -572,7 +572,7 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>${javaxMailVersion}</version> + <version>${javax.mail.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index ac49d62bf..ca71b12d8 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -743,7 +743,7 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>${javaxMailVersion}</version> + <version>${javax.mail.version}</version> </dependency> <dependency> <groupId>org.apache.openjpa</groupId> @@ -53,7 +53,8 @@ <!-- Java Enterprise APIs --> <javax.servlet.version>4.0.1</javax.servlet.version> <javax.activation.version>1.1.1</javax.activation.version> - + <javax.mail.version>1.4</javax.mail.version> + <jaxrs.version>2.0</jaxrs.version> <commons-codec.version>1.13</commons-codec.version> <commons-collections.version>4.4</commons-collections.version> @@ -89,13 +90,9 @@ <derbyVersion>10.13.1.1</derbyVersion> <httpclient.version>4.5.2</httpclient.version> <httpclient.core.version>4.4.4</httpclient.core.version> - <javaxMailVersion>1.4</javaxMailVersion> - <guava.version>15.0</guava.version> <openjpaVersion>2.4.1</openjpaVersion> - <asm.version>5.0.4</asm.version> - <modelmapper.version>2.3.5</modelmapper.version> <!-- restore when we will be able to use a derby in memory database --> @@ -123,6 +120,10 @@ <jacocoproperty/> <jacoco.plugin.version>0.7.9</jacoco.plugin.version> + + <joda.time.version>1.5.2</joda.time.version> + + <cglib.version>2.2.2</cglib.version> </properties> <dependencyManagement> @@ -167,7 +168,7 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>2.0</version> + <version>${jaxrs.version}</version> </dependency> @@ -644,12 +645,6 @@ <dependency> - <groupId>com.lmax</groupId> - <artifactId>disruptor</artifactId> - <version>3.3.6</version> - </dependency> - - <dependency> <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> <version>2.6.3</version> @@ -675,31 +670,8 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>4.1.0</version> - <classifier>no_aop</classifier> - <exclusions> - <exclusion> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- normally not needed as we are 1.6 required - but due to http://jira.codehaus.org/browse/MODELLO-266 - and we use stax reader produced by modello - ibm jdk stax impl won't work with - --> - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> - <version>4.2.0</version> - </dependency> <!-- START SNIPPET: rest-dependencies --> <dependency> @@ -740,26 +712,12 @@ <version>${project.version}</version> </dependency> <!-- END SNIPPET: rest-dependencies --> + <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-rest-services</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax</artifactId> - <version>1.2.0</version> - </dependency> - <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - <version>1.0-2</version> - </dependency> <dependency> <groupId>org.modelmapper</groupId> @@ -848,11 +806,6 @@ <version>${commons.text.version}</version> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.2</version> - </dependency> - <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <version>${derbyVersion}</version> @@ -863,52 +816,12 @@ <version>${derbyVersion}</version> </dependency> <dependency> - <groupId>org.dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>2.1.1</version> - </dependency> - <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>${hsqldb.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1</version> - <exclusions> - <exclusion> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>jpox</groupId> - <artifactId>jpox</artifactId> - <version>1.1.9-1</version> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>geronimo-spec</groupId> - <artifactId>geronimo-spec-jta</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>jpox</groupId> - <artifactId>jpox-ehcache</artifactId> - <version>1.1.9</version> - </dependency> - <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-lucene-consumers</artifactId> <version>${project.version}</version> @@ -936,7 +849,7 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>${javaxMailVersion}</version> + <version>${javax.mail.version}</version> </dependency> @@ -1056,25 +969,6 @@ <artifactId>archiva-components-expression-evaluator</artifactId> <version>${archiva.comp.version}</version> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-slf4j-logging</artifactId> - <version>${plexus-slf4j-version}</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.archiva.components</groupId> @@ -1108,11 +1002,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.8.3</version> - </dependency> - <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>${plexus-utils.version}</version> @@ -1121,12 +1010,6 @@ <groupId>org.apache.archiva.components.cache</groupId> <artifactId>archiva-components-spring-cache-api</artifactId> <version>${archiva.comp.version}</version> - <exclusions> - <exclusion> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.components.cache</groupId> @@ -1151,46 +1034,22 @@ <artifactId>redback-rbac-memory</artifactId> <version>${redback.version}</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-authorization-api</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-users-memory</artifactId> <version>${redback.version}</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-keys-memory</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> @@ -1201,12 +1060,6 @@ <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-keys-jpa</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> @@ -1217,132 +1070,42 @@ <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rbac-model</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-authorization-rbac</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rbac-role-manager</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-system</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-common-integrations</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-integrations-security</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.7</version> - <exclusions> - <exclusion> - <groupId>asm</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity-tools</artifactId> - <version>1.3</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> - </exclusion> - <exclusion> - <groupId>velocity</groupId> - <artifactId>velocity</artifactId> - </exclusion> - <exclusion> - <groupId>struts</groupId> - <artifactId>struts</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rbac-cached</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rbac-ldap</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -1355,12 +1118,6 @@ <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rest-services</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> @@ -1378,16 +1135,6 @@ <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-authentication-api</artifactId> <version>${redback.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> @@ -1442,26 +1189,6 @@ <groupId>org.apache.archiva.components.registry</groupId> <artifactId>archiva-components-spring-registry-commons</artifactId> <version>${archiva.comp.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - <version>1.1</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -1546,11 +1273,6 @@ </dependency> <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-file</artifactId> <version>${wagon.version}</version> @@ -1622,7 +1344,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>1.5.2</version> + <version>${joda.time.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -1641,19 +1363,6 @@ </dependency> - <dependency> - <groupId>commons-validator</groupId> - <artifactId>commons-validator</artifactId> - <version>1.6</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- JCR --> <dependency> <groupId>javax.jcr</groupId> @@ -1742,7 +1451,7 @@ <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.2.2</version> + <version>${cglib.version}</version> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> @@ -1782,18 +1491,6 @@ <!-- Dependencies for JDK >=9 update --> <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - <version>2.3.2</version> - </dependency> - - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <version>${asm.version}</version> - </dependency> - - <dependency> <groupId>com.rometools</groupId> <artifactId>rome</artifactId> <version>${rome.version}</version> |