camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject camel git commit: Polish
Date Tue, 29 Dec 2015 18:00:37 GMT
Repository: camel
Updated Branches:
  refs/heads/master 7e290781d -> db82c0fbd


Polish

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/db82c0fb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/db82c0fb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/db82c0fb

Branch: refs/heads/master
Commit: db82c0fbd4ca7a1682ce6504130d533448f27d63
Parents: 7e29078
Author: Babak Vahdat <bvahdat@apache.org>
Authored: Tue Dec 29 19:00:30 2015 +0100
Committer: Babak Vahdat <bvahdat@apache.org>
Committed: Tue Dec 29 19:00:30 2015 +0100

----------------------------------------------------------------------
 .../camel/itest/osgi/blueprint/BlueprintTracerRefTest.java    | 5 -----
 .../src/main/java/org/apache/camel/maven/RunMojo.java         | 7 +++----
 .../src/main/java/org/apache/camel/guice/maven/RunMojo.java   | 5 ++---
 3 files changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/db82c0fb/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintTracerRefTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintTracerRefTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintTracerRefTest.java
index 89049bb..89f387e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintTracerRefTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintTracerRefTest.java
@@ -16,11 +16,6 @@
  */
 package org.apache.camel.itest.osgi.blueprint;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.processor.interceptor.DefaultTraceEventMessage;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;

http://git-wip-us.apache.org/repos/asf/camel/blob/db82c0fb/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
----------------------------------------------------------------------
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 95f3232..69953f1 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
@@ -888,9 +888,8 @@ public class RunMojo extends AbstractExecMojo {
             }
 
             List<String> exclusions = new ArrayList<String>();
-            for (Iterator<?> j = dependency.getExclusions().iterator(); j.hasNext();)
{
-                Exclusion e = (Exclusion)j.next();
-                exclusions.add(e.getGroupId() + ":" + e.getArtifactId());
+            for (Exclusion exclusion : dependency.getExclusions()) {
+                exclusions.add(exclusion.getGroupId() + ":" + exclusion.getArtifactId());
             }
 
             ArtifactFilter newFilter = new ExcludesArtifactFilter(exclusions);
@@ -993,7 +992,7 @@ public class RunMojo extends AbstractExecMojo {
                                                                                    Collections.emptyMap(),
                                                                                    this.localRepository,
                                                                                    this.remoteRepositories,
-                                                                                   metadataSource,
new ScopeArtifactFilter(DefaultArtifact.SCOPE_RUNTIME),
+                                                                                   metadataSource,
new ScopeArtifactFilter(Artifact.SCOPE_RUNTIME),
                                                                                    Collections.emptyList());
             executableDependencies = CastUtils.cast(result.getArtifacts());
 

http://git-wip-us.apache.org/repos/asf/camel/blob/db82c0fb/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
index 2a338f3..f55c3e9 100644
--- a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
+++ b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
@@ -675,9 +675,8 @@ public class RunMojo extends AbstractExecMojo {
             }
 
             List<String> exclusions = new ArrayList<String>();
-            for (Iterator<?> j = dependency.getExclusions().iterator(); j.hasNext();)
{
-                Exclusion e = (Exclusion)j.next();
-                exclusions.add(e.getGroupId() + ":" + e.getArtifactId());
+            for (Exclusion exclusion : dependency.getExclusions()) {
+                exclusions.add(exclusion.getGroupId() + ":" + exclusion.getArtifactId());
             }
 
             ArtifactFilter newFilter = new ExcludesArtifactFilter(exclusions);


Mime
View raw message