diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index 368e5f562c..d042ec6a26 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -222,9 +222,11 @@ protected Map getProjectsForMavenReactor( MavenExecutionReq if ( !collisions.isEmpty() ) { - throw new org.apache.maven.DuplicateProjectException( "Two or more projects in the reactor" + /* + throw new DuplicateProjectException( "Two or more projects in the reactor" + " have the same identifier, please make sure that ::" - + " is unique for each project: " + collisions, collisions ); + + " is unique for each project: " + collisions ); + */ } return index; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java index 937176146f..a9a3cc61c9 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java @@ -19,8 +19,8 @@ * under the License. */ -import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; +import org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException; public class PluginVersionResolutionException extends Exception diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java index 5fd05814a1..0854d431e2 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java @@ -29,10 +29,10 @@ import org.apache.maven.artifact.InvalidArtifactRTException; import org.apache.maven.artifact.handler.ArtifactHandler; import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; -import org.apache.maven.artifact.metadata.ArtifactMetadata; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.model.Resource; +import org.apache.maven.repository.legacy.metadata.ArtifactMetadata; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.AbstractLogEnabled; diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java index cdcc6a0265..862057cb2e 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java @@ -3,8 +3,8 @@ import java.util.List; import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.metadata.ResolutionGroup; import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.metadata.ResolutionGroup; /* * Licensed to the Apache Software Foundation (ASF) under one or more contributor license diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java index 00619eaeb1..6f7e1f85d8 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java @@ -69,8 +69,7 @@ private String getFilename() public void storeInLocalRepository( ArtifactRepository localRepository, ArtifactRepository remoteRepository ) throws RepositoryMetadataStoreException { - File destination = new File( localRepository.getBasedir(), - localRepository.pathOfLocalRepositoryMetadata( this, remoteRepository ) ); + File destination = new File( localRepository.getBasedir(), localRepository.pathOfLocalRepositoryMetadata( this, remoteRepository ) ); // ---------------------------------------------------------------------------- // I'm fully aware that the file could just be moved using File.rename but @@ -117,4 +116,9 @@ public void merge( ArtifactMetadata metadata ) throw new IllegalStateException( "Cannot add two different pieces of metadata for: " + getKey() ); } } + + public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata ) + { + this.merge( (ArtifactMetadata)metadata ); + } } diff --git a/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java b/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java index 2aed9be661..d577b4a882 100644 --- a/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java +++ b/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java @@ -11,8 +11,8 @@ import org.apache.maven.artifact.metadata.ResolutionGroup; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; -import org.apache.maven.artifact.resolver.metadata.MetadataSource; import org.apache.maven.project.artifact.MavenMetadataSource; +import org.apache.maven.repository.metadata.MetadataSource; import org.codehaus.plexus.component.annotations.Component; @Component(role=ArtifactMetadataSource.class,hint="classpath") diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java index 9d80faed04..0b750c2d5e 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java @@ -10,8 +10,6 @@ import java.util.TimeZone; import org.apache.maven.embedder.MavenEmbedderLogger; -import org.apache.maven.execution.ApplicationInformation; -import org.apache.maven.execution.DefaultRuntimeInformation; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.Os; diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenSecurityDispatcher.java b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenSecurityDispatcher.java deleted file mode 100644 index a3cbd15c0d..0000000000 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenSecurityDispatcher.java +++ /dev/null @@ -1,41 +0,0 @@ -/* -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. -*/ - -package org.apache.maven.embedder.execution; - -import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher; - -/** - * - * - * @author Oleg Gusakov - * @version $Id$ - * - * @plexus.component role="" hint="maven" - */ -//@Component( role=SecDispatcher.class, hint="maven" ) -public class MavenSecurityDispatcher - extends DefaultSecDispatcher -{ -// @Configuration( value="~/.m2/settings-security.xml" ) - /** - * @plexus.configuration default-value="~/.m2/settings-security.xml" - */ - protected String _configurationFile = "~/.m2/settings-security.xml"; -} diff --git a/maven-repository/pom.xml b/maven-repository/pom.xml index e84b37001e..f6e2e824ef 100644 --- a/maven-repository/pom.xml +++ b/maven-repository/pom.xml @@ -62,6 +62,10 @@ under the License. org.apache.maven.wagon wagon-file test + + + org.jsecurity + jsecurity diff --git a/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java b/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java index ceb9b59253..afd2101099 100644 --- a/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java +++ b/maven-repository/src/main/java/org/apache/maven/repository/Authentication.java @@ -31,58 +31,6 @@ public class Authentication */ private String password; - /** - * Passphrase of the user's private key file - */ - private String passphrase; - - /** - * The absolute path to private key file - */ - private String privateKey; - - /** - * Get the passphrase of the private key file. The passphrase is used only when host/protocol - * supports authentication via exchange of private/public keys and private key was used for - * authentication. - * - * @return passphrase of the private key file - */ - public String getPassphrase() - { - return passphrase; - } - - /** - * Set the passphrase of the private key file. - * - * @param passphrase passphrase of the private key file - */ - public void setPassphrase( String passphrase ) - { - this.passphrase = passphrase; - } - - /** - * Get the absolute path to the private key file. - * - * @return absolute path to private key - */ - public String getPrivateKey() - { - return privateKey; - } - - /** - * Set the absolute path to private key file. - * - * @param privateKey path to private key in local file system - */ - public void setPrivateKey( String privateKey ) - { - this.privateKey = privateKey; - } - /** * Get the user's password which is used when connecting to the repository. * diff --git a/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java index 6ca458beae..a0655171a5 100644 --- a/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java +++ b/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java @@ -29,8 +29,8 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.CyclicDependencyException; -import org.apache.maven.artifact.resolver.DefaultArtifactCollector; import org.apache.maven.artifact.versioning.OverConstrainedVersionException; +import org.apache.maven.repository.legacy.resolver.DefaultArtifactCollector; /** diff --git a/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java b/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java index 3e7a5c068f..d58e7e52a1 100644 --- a/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java +++ b/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java @@ -105,7 +105,9 @@ ArtifactRepository createLocalRepository( File localRepository ) // Map types of artifacts + // // Raw file transfers + // void publish( ArtifactRepository repository, File source, String remotePath, TransferListener downloadMonitor ) throws TransferFailedException; diff --git a/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java index 22b8fa18cc..602d917f99 100644 --- a/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java +++ b/maven-repository/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java @@ -30,7 +30,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.artifact.factory.ArtifactFactory; -import org.apache.maven.artifact.manager.WagonManager; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; @@ -387,32 +386,6 @@ public void addAuthenticationInfo( String repositoryId, String username, String } */ - /* - public void addPermissionInfo( String repositoryId, String filePermissions, String directoryPermissions ) - { - RepositoryPermissions permissions = new RepositoryPermissions(); - - boolean addPermissions = false; - - if ( filePermissions != null ) - { - permissions.setFileMode( filePermissions ); - addPermissions = true; - } - - if ( directoryPermissions != null ) - { - permissions.setDirectoryMode( directoryPermissions ); - addPermissions = true; - } - - if ( addPermissions ) - { - serverPermissionsMap.put( repositoryId, permissions ); - } - } - */ - // Mirror public void addMirror( String id, String mirrorOf, String url ) diff --git a/pom.xml b/pom.xml index 75e556fd84..b35bc24d48 100644 --- a/pom.xml +++ b/pom.xml @@ -286,6 +286,11 @@ plexus-plugin-manager ${plexusPluginManagerVersion} + + org.jsecurity + jsecurity + 0.9.0-RC2 + easymock