This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 16789ff6bbde9129eb8770101d9708d920ccfeaa Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Mon Apr 25 11:52:27 2022 +0200 CAMEL-17894: replace older loop formats with newer ones --- .../org/apache/camel/maven/PrepareFatJarMojo.java | 7 ++----- .../src/main/java/org/apache/camel/maven/RunMojo.java | 19 ++++++------------- .../packaging/AbstractGenerateConfigurerMojo.java | 7 ++----- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java index a35a0db2703..6f576f5ab78 100644 --- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java +++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java @@ -187,13 +187,10 @@ public class PrepareFatJarMojo extends AbstractMojo { // MEXEC-17 dependencies.addAll(getAllNonTestScopedDependencies()); - Iterator<Artifact> iter = dependencies.iterator(); - while (iter.hasNext()) { - Artifact classPathElement = iter.next(); - + for (Artifact classPathElement : dependencies) { if (getLog().isDebugEnabled()) { getLog().debug("Adding project dependency artifact: " + classPathElement.getArtifactId() - + " to classpath"); + + " to classpath"); } File file = classPathElement.getFile(); if (file != null) { diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java index eadc6b5d835..50f57ddd15b 100644 --- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java +++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java @@ -712,22 +712,19 @@ public class RunMojo extends AbstractExecMojo { } try { - Iterator<Artifact> iter = this.determineRelevantPluginDependencies().iterator(); - while (iter.hasNext()) { - Artifact classPathElement = iter.next(); - + for (Artifact classPathElement : this.determineRelevantPluginDependencies()) { // we must skip org.osgi.core, otherwise we get a // java.lang.NoClassDefFoundError: org.osgi.vendor.framework property not set if (classPathElement.getArtifactId().equals("org.osgi.core")) { if (getLog().isDebugEnabled()) { getLog().debug("Skipping org.osgi.core -> " + classPathElement.getGroupId() + "/" - + classPathElement.getArtifactId() + "/" + classPathElement.getVersion()); + + classPathElement.getArtifactId() + "/" + classPathElement.getVersion()); } continue; } getLog().debug("Adding plugin dependency artifact: " + classPathElement.getArtifactId() - + " to classpath"); + + " to classpath"); path.add(classPathElement.getFile().toURI().toURL()); } } catch (MalformedURLException e) { @@ -818,11 +815,9 @@ public class RunMojo extends AbstractExecMojo { // MEXEC-17 dependencies.addAll(getAllNonTestScopedDependencies()); - Iterator<Artifact> iter = dependencies.iterator(); - while (iter.hasNext()) { - Artifact classPathElement = iter.next(); + for (Artifact classPathElement : dependencies) { getLog().debug("Adding project dependency artifact: " + classPathElement.getArtifactId() - + " to classpath"); + + " to classpath"); File file = classPathElement.getFile(); if (file != null) { path.add(file.toURI().toURL()); @@ -855,9 +850,7 @@ public class RunMojo extends AbstractExecMojo { private Collection<Artifact> getAllDependencies() throws MojoExecutionException { List<Artifact> artifacts = new ArrayList<>(); - for (Iterator<?> dependencies = project.getDependencies().iterator(); dependencies.hasNext();) { - Dependency dependency = (Dependency) dependencies.next(); - + for (Dependency dependency : project.getDependencies()) { String groupId = dependency.getGroupId(); String artifactId = dependency.getArtifactId(); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java index 2cc465c118a..e465bdec61e 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java @@ -238,13 +238,10 @@ public abstract class AbstractGenerateConfigurerMojo extends AbstractGeneratorMo // MEXEC-17 dependencies.addAll(getAllNonTestScopedDependencies()); - Iterator<Artifact> iter = dependencies.iterator(); - while (iter.hasNext()) { - Artifact classPathElement = iter.next(); - + for (Artifact classPathElement : dependencies) { if (getLog().isDebugEnabled()) { getLog().debug("Adding project dependency artifact: " + classPathElement.getArtifactId() - + " to classpath"); + + " to classpath"); } File file = classPathElement.getFile();
