parent
							
								
									bed8ff68e3
								
							
						
					
					
						commit
						070de944ff
					
				| 
						 | 
				
			
			@ -50,7 +50,7 @@ public class BomExtension {
 | 
			
		|||
 | 
			
		||||
	private final Map<String, String> artifactVersionProperties = new HashMap<>();
 | 
			
		||||
 | 
			
		||||
	private final List<Library> libraries = new ArrayList<Library>();
 | 
			
		||||
	private final List<Library> libraries = new ArrayList<>();
 | 
			
		||||
 | 
			
		||||
	private final UpgradeHandler upgradeHandler = new UpgradeHandler();
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -71,7 +71,7 @@ public class CheckBom extends DefaultTask {
 | 
			
		|||
		for (String exclusion : exclusions) {
 | 
			
		||||
			if (!resolved.contains(exclusion) && exclusion.endsWith(":*")) {
 | 
			
		||||
				String group = exclusion.substring(0, exclusion.indexOf(':') + 1);
 | 
			
		||||
				if (!resolved.stream().filter((candidate) -> candidate.startsWith(group)).findFirst().isPresent()) {
 | 
			
		||||
				if (resolved.stream().noneMatch((candidate) -> candidate.startsWith(group))) {
 | 
			
		||||
					unused.add(exclusion);
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -62,7 +62,7 @@ final class MavenMetadataVersionResolver implements VersionResolver {
 | 
			
		|||
 | 
			
		||||
	@Override
 | 
			
		||||
	public SortedSet<DependencyVersion> resolveVersions(String groupId, String artifactId) {
 | 
			
		||||
		Set<String> versions = new HashSet<String>();
 | 
			
		||||
		Set<String> versions = new HashSet<>();
 | 
			
		||||
		for (String repositoryUrl : this.repositoryUrls) {
 | 
			
		||||
			versions.addAll(resolveVersions(groupId, artifactId, repositoryUrl));
 | 
			
		||||
		}
 | 
			
		||||
| 
						 | 
				
			
			@ -70,7 +70,7 @@ final class MavenMetadataVersionResolver implements VersionResolver {
 | 
			
		|||
	}
 | 
			
		||||
 | 
			
		||||
	private Set<String> resolveVersions(String groupId, String artifactId, String repositoryUrl) {
 | 
			
		||||
		Set<String> versions = new HashSet<String>();
 | 
			
		||||
		Set<String> versions = new HashSet<>();
 | 
			
		||||
		String url = repositoryUrl + "/" + groupId.replace('.', '/') + "/" + artifactId + "/maven-metadata.xml";
 | 
			
		||||
		try {
 | 
			
		||||
			String metadata = this.rest.getForObject(url, String.class);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,10 +18,11 @@ package org.springframework.boot.build.cli;
 | 
			
		|||
 | 
			
		||||
import java.util.Collections;
 | 
			
		||||
 | 
			
		||||
import org.gradle.api.Task;
 | 
			
		||||
import org.gradle.api.tasks.TaskAction;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * A {@Task} for creating a Homebrew formula manifest.
 | 
			
		||||
 * A {@link Task} for creating a Homebrew formula manifest.
 | 
			
		||||
 *
 | 
			
		||||
 * @author Andy Wilkinson
 | 
			
		||||
 */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,10 +18,11 @@ package org.springframework.boot.build.cli;
 | 
			
		|||
 | 
			
		||||
import java.util.Collections;
 | 
			
		||||
 | 
			
		||||
import org.gradle.api.Task;
 | 
			
		||||
import org.gradle.api.tasks.TaskAction;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * A {@Task} for creating a Scoop manifest.
 | 
			
		||||
 * A {@link Task} for creating a Scoop manifest.
 | 
			
		||||
 *
 | 
			
		||||
 * @author Andy Wilkinson
 | 
			
		||||
 */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -55,7 +55,7 @@ public class ExtractVersionConstraints extends AbstractTask {
 | 
			
		|||
 | 
			
		||||
	private final Set<VersionProperty> versionProperties = new TreeSet<>();
 | 
			
		||||
 | 
			
		||||
	private final List<String> projectPaths = new ArrayList<String>();
 | 
			
		||||
	private final List<String> projectPaths = new ArrayList<>();
 | 
			
		||||
 | 
			
		||||
	public ExtractVersionConstraints() {
 | 
			
		||||
		DependencyHandler dependencies = getProject().getDependencies();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -32,8 +32,8 @@ import org.gradle.api.tasks.TaskExecutionException;
 | 
			
		|||
import org.gradle.api.tasks.compile.JavaCompile;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * An {@Action} to post-process a {@code Log4j2Plugins.dat} and re-order its content so
 | 
			
		||||
 * that it is reproducible.
 | 
			
		||||
 * An {@link Action} to post-process a {@code Log4j2Plugins.dat} and re-order its content
 | 
			
		||||
 * so that it is reproducible.
 | 
			
		||||
 *
 | 
			
		||||
 * @author Andy Wilkinson
 | 
			
		||||
 */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -63,7 +63,7 @@ class PluginXmlParser {
 | 
			
		|||
	}
 | 
			
		||||
 | 
			
		||||
	private List<Mojo> parseMojos(Node plugin) throws XPathExpressionException {
 | 
			
		||||
		List<Mojo> mojos = new ArrayList<Mojo>();
 | 
			
		||||
		List<Mojo> mojos = new ArrayList<>();
 | 
			
		||||
		for (Node mojoNode : nodesAt("//plugin/mojos/mojo", plugin)) {
 | 
			
		||||
			mojos.add(new Mojo(textAt("goal", mojoNode), format(textAt("description", mojoNode)),
 | 
			
		||||
					parseParameters(mojoNode)));
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,7 +28,7 @@ import org.gradle.plugins.ide.eclipse.EclipsePlugin;
 | 
			
		|||
import org.gradle.plugins.ide.eclipse.model.EclipseModel;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * A {@Plugin} to configure integration testing support in a {@link Project}.
 | 
			
		||||
 * A {@link Plugin} to configure integration testing support in a {@link Project}.
 | 
			
		||||
 *
 | 
			
		||||
 * @author Andy Wilkinson
 | 
			
		||||
 */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue