Skip to content

Commit

Permalink
Fix Maven local version listing
Browse files Browse the repository at this point in the history
There is no way to rely on a `maven-metadata.xml` for Maven local
version listing.
Since Gradle 6.0 removed the default `artifact()` metadata source, this
causes all dynamic version resolution to fail with Maven local.
This commit changes the way Maven local is handled to _always_ do
version listing through directory listing.

Fixes #11321
  • Loading branch information
ljacomet committed Nov 15, 2019
1 parent 3700778 commit 781e12f
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 3 deletions.
Expand Up @@ -293,7 +293,7 @@ ImmutableMetadataSources createMetadataSources(MavenMetadataLoader mavenMetadata
sources.add(gradleModuleMetadataSource);
}
if (metadataSources.mavenPom) {
DefaultMavenPomMetadataSource pomMetadataSource = new DefaultMavenPomMetadataSource(MavenMetadataArtifactProvider.INSTANCE, getPomParser(), fileResourceRepository, getMetadataValidationServices(), mavenMetadataLoader);
DefaultMavenPomMetadataSource pomMetadataSource = getPomMetadataSource(mavenMetadataLoader, fileResourceRepository);
if (metadataSources.ignoreGradleMetadataRedirection) {
sources.add(pomMetadataSource);
} else {
Expand All @@ -306,11 +306,15 @@ ImmutableMetadataSources createMetadataSources(MavenMetadataLoader mavenMetadata
return new DefaultImmutableMetadataSources(sources.build());
}

protected DefaultMavenPomMetadataSource getPomMetadataSource(MavenMetadataLoader mavenMetadataLoader, FileResourceRepository fileResourceRepository) {
return new DefaultMavenPomMetadataSource(MavenMetadataArtifactProvider.INSTANCE, getPomParser(), fileResourceRepository, getMetadataValidationServices(), mavenMetadataLoader);
}

protected DefaultMavenPomMetadataSource.MavenMetadataValidator getMetadataValidationServices() {
return NO_OP_VALIDATION_SERVICES;
}

private MetaDataParser<MutableMavenModuleResolveMetadata> getPomParser() {
MetaDataParser<MutableMavenModuleResolveMetadata> getPomParser() {
return pomParser;
}

Expand Down
Expand Up @@ -17,6 +17,7 @@

import org.gradle.api.artifacts.repositories.AuthenticationContainer;
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
import org.gradle.api.internal.artifacts.repositories.metadata.MavenLocalPomMetadataSource;
import org.gradle.internal.instantiation.InstantiatorFactory;
import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.GradleModuleMetadataParser;
import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParser;
Expand Down Expand Up @@ -85,6 +86,11 @@ protected MavenResolver createRealResolver() {
return resolver;
}

@Override
protected DefaultMavenPomMetadataSource getPomMetadataSource(MavenMetadataLoader mavenMetadataLoader, FileResourceRepository fileResourceRepository) {
return new MavenLocalPomMetadataSource(MavenMetadataArtifactProvider.INSTANCE, getPomParser(), fileResourceRepository, getMetadataValidationServices(), mavenMetadataLoader);
}

@Override
protected DefaultMavenPomMetadataSource.MavenMetadataValidator getMetadataValidationServices() {
return new MavenLocalMetadataValidator();
Expand Down
Expand Up @@ -86,7 +86,7 @@ public void listModuleVersions(ModuleDependencyMetadata dependency, ModuleIdenti
versionLister.listVersions(module, dependencyArtifact, artifactPatterns, result);
}

private static IvyArtifactName getPrimaryDependencyArtifact(ModuleDependencyMetadata dependency) {
static IvyArtifactName getPrimaryDependencyArtifact(ModuleDependencyMetadata dependency) {
String moduleName = dependency.getSelector().getModule();
List<IvyArtifactName> artifacts = dependency.getArtifacts();
if (artifacts.isEmpty()) {
Expand Down
@@ -0,0 +1,46 @@
/*
* Copyright 2017 the original author or authors.
*
* Licensed 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.gradle.api.internal.artifacts.repositories.metadata;

import org.gradle.api.artifacts.ModuleIdentifier;
import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParser;
import org.gradle.api.internal.artifacts.repositories.maven.MavenMetadataLoader;
import org.gradle.api.internal.artifacts.repositories.resolver.ResourcePattern;
import org.gradle.api.internal.artifacts.repositories.resolver.VersionLister;
import org.gradle.internal.component.external.model.ModuleDependencyMetadata;
import org.gradle.internal.component.external.model.maven.MutableMavenModuleResolveMetadata;
import org.gradle.internal.component.model.IvyArtifactName;
import org.gradle.internal.resolve.result.BuildableModuleVersionListingResolveResult;
import org.gradle.internal.resource.local.FileResourceRepository;

import javax.inject.Inject;
import java.util.List;

import static org.gradle.api.internal.artifacts.repositories.metadata.DefaultArtifactMetadataSource.getPrimaryDependencyArtifact;

public class MavenLocalPomMetadataSource extends DefaultMavenPomMetadataSource {

@Inject
public MavenLocalPomMetadataSource(MetadataArtifactProvider metadataArtifactProvider, MetaDataParser<MutableMavenModuleResolveMetadata> pomParser, FileResourceRepository fileResourceRepository, MavenMetadataValidator validator, MavenMetadataLoader mavenMetadataLoader) {
super(metadataArtifactProvider, pomParser, fileResourceRepository, validator, mavenMetadataLoader);
}

@Override
public void listModuleVersions(ModuleDependencyMetadata dependency, ModuleIdentifier module, List<ResourcePattern> ivyPatterns, List<ResourcePattern> artifactPatterns, VersionLister versionLister, BuildableModuleVersionListingResolveResult result) {
IvyArtifactName dependencyArtifact = getPrimaryDependencyArtifact(dependency);
versionLister.listVersions(module, dependencyArtifact, artifactPatterns, result);
}
}

0 comments on commit 781e12f

Please sign in to comment.