From ad76411ad8edfe38c05aa0def684396285595b09 Mon Sep 17 00:00:00 2001 From: Andrzej Jarmoniuk Date: Sat, 17 Dec 2022 16:23:15 +0100 Subject: [PATCH] Removes parallelStream use with non-thread safe terminators --- .../org/codehaus/mojo/versions/api/DefaultVersionsHelper.java | 2 +- .../org/codehaus/mojo/versions/utils/MavenProjectUtils.java | 2 +- .../apache/maven/plugins/enforcer/MaxDependencyUpdates.java | 4 ++-- .../codehaus/mojo/versions/DisplayDependencyUpdatesMojo.java | 4 ++-- .../org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java b/versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java index f2b068785..0c8fe8d14 100644 --- a/versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java +++ b/versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java @@ -194,7 +194,7 @@ public ArtifactVersions lookupArtifactVersions( .getRemoteProjectRepositories(), "lookupArtifactVersions")) .getVersions() - .parallelStream() + .stream() .filter(v -> ignoredVersions.stream().noneMatch(i -> { if (TYPE_REGEX.equals(i.getType()) && Pattern.compile(i.getVersion()) diff --git a/versions-common/src/main/java/org/codehaus/mojo/versions/utils/MavenProjectUtils.java b/versions-common/src/main/java/org/codehaus/mojo/versions/utils/MavenProjectUtils.java index 9832bef2b..5070b7ee8 100644 --- a/versions-common/src/main/java/org/codehaus/mojo/versions/utils/MavenProjectUtils.java +++ b/versions-common/src/main/java/org/codehaus/mojo/versions/utils/MavenProjectUtils.java @@ -61,7 +61,7 @@ public static Set extractPluginDependenciesFromPluginsInPluginManage * or an empty set if none have been retrieveddependencies or an empty set if none have been retrieved */ public static Set extractDependenciesFromPlugins(MavenProject project) { - return project.getBuildPlugins().parallelStream() + return project.getBuildPlugins().stream() .filter(plugin -> plugin.getDependencies() != null) .flatMap(plugin -> plugin.getDependencies().stream()) .collect(() -> new TreeSet<>(DependencyComparator.INSTANCE), Set::add, Set::addAll); diff --git a/versions-enforcer/src/main/java/org/apache/maven/plugins/enforcer/MaxDependencyUpdates.java b/versions-enforcer/src/main/java/org/apache/maven/plugins/enforcer/MaxDependencyUpdates.java index 4956a2fd5..3316460cb 100644 --- a/versions-enforcer/src/main/java/org/apache/maven/plugins/enforcer/MaxDependencyUpdates.java +++ b/versions-enforcer/src/main/java/org/apache/maven/plugins/enforcer/MaxDependencyUpdates.java @@ -268,7 +268,7 @@ private static VersionsHelper createVersionsHelper( return new DefaultVersionsHelper.Builder() .withRepositorySystem(ruleHelper.getComponent(RepositorySystem.class)) .withAetherRepositorySystem(ruleHelper.getComponent(org.eclipse.aether.RepositorySystem.class)) - .withWagonMap(ruleHelper.getComponentMap(Wagon.class.getName()).entrySet().parallelStream() + .withWagonMap(ruleHelper.getComponentMap(Wagon.class.getName()).entrySet().stream() .filter(e -> e.getValue() instanceof Wagon) .collect(HashMap::new, (m, e) -> m.put(e.getKey(), (Wagon) e.getValue()), HashMap::putAll)) .withServerId(serverId) @@ -349,7 +349,7 @@ public void execute(EnforcerRuleHelper ruleHelper) throws EnforcerRuleException ? of(SUBINCREMENTAL) : ignoreIncrementalUpdates ? of(INCREMENTAL) : ignoreMinorUpdates ? of(MINOR) : empty(); List upgradable = - versionsHelper.lookupDependenciesUpdates(dependencies, false).values().parallelStream() + versionsHelper.lookupDependenciesUpdates(dependencies, false).values().stream() .filter(v -> v.getVersions(v.restrictionForIgnoreScope(ignoredSegment), true).length > 0) .collect(Collectors.toList()); if (upgradable.size() > maxUpdates) { diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojo.java index de698b174..5154d547a 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojo.java @@ -429,8 +429,8 @@ public void execute() throws MojoExecutionException, MojoFailureException { getHelper() .lookupDependenciesUpdates( filterDependencies( - getProject().getDependencies().parallelStream() - .filter(dep -> finalDependencyManagement.parallelStream() + getProject().getDependencies().stream() + .filter(dep -> finalDependencyManagement.stream() .noneMatch(depMan -> dependenciesMatch(dep, depMan))) .collect( () -> new TreeSet<>(DependencyComparator.INSTANCE), diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java index 8f7724d7b..15c6fccae 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java @@ -856,7 +856,7 @@ private static boolean getPluginInherited(Object plugin) { * @since 1.0-alpha-1 */ private Map getLifecyclePlugins(MavenProject project) throws MojoExecutionException { - return getBoundPlugins(project).parallelStream() + return getBoundPlugins(project).stream() .filter(Objects::nonNull) .filter(p -> p.getKey() != null) .collect(HashMap::new, (m, p) -> m.put(p.getKey(), p), Map::putAll); @@ -874,7 +874,7 @@ private Map getLifecyclePlugins(MavenProject project) throws Moj private Set getBoundPlugins(MavenProject project) { // we need to provide a copy with the version blanked out so that inferring from super-pom // works as for 2.x as 3.x fills in the version on us! - return lifecycleExecutor.getPluginsBoundByDefaultToAllLifecycles(project.getPackaging()).parallelStream() + return lifecycleExecutor.getPluginsBoundByDefaultToAllLifecycles(project.getPackaging()).stream() .map(p -> new Plugin() { { setGroupId(p.getGroupId());