camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nferr...@apache.org
Subject [1/2] camel git commit: Source check
Date Wed, 15 Mar 2017 13:40:35 GMT
Repository: camel
Updated Branches:
  refs/heads/master e74975e8f -> e6131db33


Source check


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

Branch: refs/heads/master
Commit: 2b267a6b24ecbe1bbdc0f7163802a8d5b0ad8a9b
Parents: e74975e
Author: Nicola Ferraro <ni.ferraro@gmail.com>
Authored: Wed Mar 15 14:06:11 2017 +0100
Committer: Nicola Ferraro <ni.ferraro@gmail.com>
Committed: Wed Mar 15 14:06:11 2017 +0100

----------------------------------------------------------------------
 .../camel/maven/packaging/PrepareCatalogMojo.java     |  2 --
 .../camel/maven/packaging/PrepareReadmeMojo.java      |  4 +++-
 .../packaging/SpringBootAutoConfigurationMojo.java    | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2b267a6b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 67fca07..d652efb 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.nio.channels.FileChannel;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -35,7 +34,6 @@ import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;

http://git-wip-us.apache.org/repos/asf/camel/blob/2b267a6b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
index 326653b..f14fa72 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
@@ -28,7 +28,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
+import static java.util.stream.Collectors.toSet;
+
 import edu.emory.mathcs.backport.java.util.Collections;
+
 import org.apache.camel.maven.packaging.model.ComponentModel;
 import org.apache.camel.maven.packaging.model.DataFormatModel;
 import org.apache.camel.maven.packaging.model.EipModel;
@@ -41,7 +44,6 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
 import org.mvel2.templates.TemplateRuntime;
 
-import static java.util.stream.Collectors.toSet;
 import static org.apache.camel.maven.packaging.PackageHelper.loadText;
 import static org.apache.camel.maven.packaging.PackageHelper.writeText;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2b267a6b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index 2b46547..23bad4c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -105,13 +105,6 @@ import static org.apache.camel.maven.packaging.PackageHelper.loadText;
 public class SpringBootAutoConfigurationMojo extends AbstractMojo {
 
     /**
-     * The output directory for generated component schema file
-     *
-     * @parameter default-value="${project.build.directory}/classes"
-     */
-    protected File classesDir;
-
-    /**
      * Useful to move configuration towards starters.
      * Warning: the spring.factories files sometimes are used also on the main artifacts.
      * Make sure it is not the case before enabling this property.
@@ -148,6 +141,13 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
     private static final String[] IGNORE_MODULES = {/* Non-standard -> */ "camel-grape",
"camel-connector"};
 
     /**
+     * The output directory for generated component schema file
+     *
+     * @parameter default-value="${project.build.directory}/classes"
+     */
+    protected File classesDir;
+
+    /**
      * The maven project.
      *
      * @parameter property="project"


Mime
View raw message