[MNG-6110] renamed 'maven-aether-provider' to 'maven-resolver-provider'

This commit is contained in:
Christian Schulte 2016-12-11 23:36:04 +01:00 committed by Hervé Boutemy
parent 4d6c9292c4
commit 8972072e32
51 changed files with 93 additions and 16 deletions

View File

@ -60,7 +60,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<artifactId>maven-resolver-provider</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>

View File

@ -70,7 +70,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<artifactId>maven-resolver-provider</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>

View File

@ -54,7 +54,7 @@ under the License.
<exportedPackage>org.apache.maven.wagon.repository</exportedPackage>
<exportedPackage>org.apache.maven.wagon.resource</exportedPackage>
<!-- aether-api, aether-spi, aether-impl -->
<!-- maven-resolver-api, maven-resolver-spi, maven-resolver-impl -->
<exportedPackage>org.eclipse.aether.*</exportedPackage>
<exportedPackage>org.eclipse.aether.artifact</exportedPackage>
<exportedPackage>org.eclipse.aether.collection</exportedPackage>
@ -132,7 +132,7 @@ under the License.
<exportedArtifact>org.sonatype.sisu:sisu-inject-plexus</exportedArtifact>
<exportedArtifact>org.eclipse.sisu:org.eclipse.sisu.plexus</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-artifact</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-aether-provider</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-resolver-provider</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-artifact-manager</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-compat</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-core</exportedArtifact>
@ -152,9 +152,9 @@ under the License.
<exportedArtifact>org.apache.maven:maven-settings-builder</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-toolchain</exportedArtifact>
<exportedArtifact>org.apache.maven.wagon:wagon-provider-api</exportedArtifact>
<exportedArtifact>org.eclipse.aether:aether-api</exportedArtifact>
<exportedArtifact>org.eclipse.aether:aether-spi</exportedArtifact>
<exportedArtifact>org.eclipse.aether:aether-impl</exportedArtifact>
<exportedArtifact>org.apache.maven.resolver:maven-resolver-api</exportedArtifact>
<exportedArtifact>org.apache.maven.resolver:maven-resolver-spi</exportedArtifact>
<exportedArtifact>org.apache.maven.resolver:maven-resolver-impl</exportedArtifact>
<exportedArtifact>javax.inject:javax.inject</exportedArtifact>
<exportedArtifact>org.slf4j:slf4j-api</exportedArtifact>
@ -166,6 +166,9 @@ under the License.
<exportedArtifact>org.sonatype.aether:aether-api</exportedArtifact>
<exportedArtifact>org.sonatype.aether:aether-spi</exportedArtifact>
<exportedArtifact>org.sonatype.aether:aether-impl</exportedArtifact>
<exportedArtifact>org.eclipse.aether:aether-api</exportedArtifact>
<exportedArtifact>org.eclipse.aether:aether-spi</exportedArtifact>
<exportedArtifact>org.eclipse.aether:aether-impl</exportedArtifact>
<!--
| NOTE: Don't exclude the wagons or any of their dependencies (apart from the wagon API). This would otherwise

View File

@ -28,9 +28,9 @@ under the License.
<version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-aether-provider</artifactId>
<artifactId>maven-resolver-provider</artifactId>
<name>Maven Aether Provider</name>
<name>Maven Artifact Resolver Provider</name>
<description>Extensions to Maven Resolver for utilizing Maven POM and repository metadata.</description>
<dependencies>

View File

@ -38,6 +38,10 @@ import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.name.Names;
/**
* @deprecated As of Maven Resolver 1.0.3, please use class {@link MavenResolverModule}.
*/
@Deprecated
public final class MavenAetherModule
extends AbstractModule
{

View File

@ -0,0 +1,70 @@
package org.apache.maven.repository.internal;
/*
* 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 java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import javax.inject.Named;
import javax.inject.Singleton;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.name.Names;
import org.apache.maven.model.building.DefaultModelBuilderFactory;
import org.apache.maven.model.building.ModelBuilder;
import org.eclipse.aether.impl.ArtifactDescriptorReader;
import org.eclipse.aether.impl.MetadataGeneratorFactory;
import org.eclipse.aether.impl.VersionRangeResolver;
import org.eclipse.aether.impl.VersionResolver;
import org.eclipse.aether.impl.guice.AetherModule;
public final class MavenResolverModule
extends AbstractModule
{
@Override
protected void configure()
{
install( new AetherModule() );
bind( ArtifactDescriptorReader.class ).to( DefaultArtifactDescriptorReader.class ).in( Singleton.class );
bind( VersionResolver.class ).to( DefaultVersionResolver.class ).in( Singleton.class );
bind( VersionRangeResolver.class ).to( DefaultVersionRangeResolver.class ).in( Singleton.class );
bind( MetadataGeneratorFactory.class ).annotatedWith( Names.named( "snapshot" ) )
.to( SnapshotMetadataGeneratorFactory.class ).in( Singleton.class );
bind( MetadataGeneratorFactory.class ).annotatedWith( Names.named( "versions" ) )
.to( VersionsMetadataGeneratorFactory.class ).in( Singleton.class );
bind( ModelBuilder.class ).toInstance( new DefaultModelBuilderFactory().newInstance() );
}
@Provides
@Singleton
Set<MetadataGeneratorFactory> provideMetadataGeneratorFactories(
@Named( "snapshot" ) MetadataGeneratorFactory snapshot,
@Named( "versions" ) MetadataGeneratorFactory versions )
{
Set<MetadataGeneratorFactory> factories = new HashSet<>( 2 );
factories.add( snapshot );
factories.add( versions );
return Collections.unmodifiableSet( factories );
}
}

View File

@ -1,7 +1,7 @@
// CHECKSTYLE_OFF: RegexpHeader
/**
* <a href="http://www.eclipse.org/aether/">Aether</a> extensions for utilizing the Maven POM and Maven repository
* metadata.
* <a href="https://maven.apache.org/resolver/">Maven Resolver</a> extensions for utilizing the Maven POM and Maven
* repository metadata.
*/
package org.apache.maven.repository.internal;
@ -22,4 +22,4 @@ package org.apache.maven.repository.internal;
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
*/

View File

@ -23,9 +23,9 @@
2012-09-29
-----
Maven Aether Provider
Maven Artifact Resolver Provider
Maven Aether Provider is an {{{http://www.eclipse.org/aether/}Aether}} extension to support
Maven Artifact Resolver Provider is a {{{/resolver/}Maven Artifact Resolver}} extension to support
Maven POMs and local+remote repositories.
Main component is <<<MavenRepositorySystemUtils>>>

View File

@ -86,7 +86,7 @@ under the License.
<module>maven-settings</module>
<module>maven-settings-builder</module>
<module>maven-artifact</module>
<module>maven-aether-provider</module>
<module>maven-resolver-provider</module>
<module>maven-repository-metadata</module>
<module>maven-slf4j-provider</module>
<module>maven-embedder</module>
@ -209,7 +209,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<artifactId>maven-resolver-provider</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>