Repository: camel
Updated Branches:
refs/heads/master 06c6cd757 -> 550f25a51
Fixed code style and jvm version
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/550f25a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/550f25a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/550f25a5
Branch: refs/heads/master
Commit: 550f25a51c366143dd91c0a0271c6bc453a43203
Parents: b194319
Author: Marco Collovati <(none)>
Authored: Sun Jan 22 19:18:54 2017 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Jan 22 20:05:59 2017 +0100
----------------------------------------------------------------------
.../src/it/settings.xml | 4 +--
.../maven/AbstractSourceGeneratorMojo.java | 29 ++++++++++----------
.../camel/maven/AbstractGeneratorMojoTest.java | 14 +++++-----
.../maven/FileApiMethodGeneratorMojoTest.java | 6 ++--
4 files changed, 27 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/550f25a5/tooling/maven/camel-api-component-maven-plugin/src/it/settings.xml
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/it/settings.xml b/tooling/maven/camel-api-component-maven-plugin/src/it/settings.xml
index c0cc67b..3622119 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/it/settings.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/src/it/settings.xml
@@ -27,8 +27,8 @@ under the License.
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<repositories>
<repository>
http://git-wip-us.apache.org/repos/asf/camel/blob/550f25a5/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractSourceGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractSourceGeneratorMojo.java
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractSourceGeneratorMojo.java
index 7dc521d..a2a19c4 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractSourceGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractSourceGeneratorMojo.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.maven;
-import org.apache.maven.plugins.annotations.Parameter;
-
import java.io.File;
+import org.apache.maven.plugins.annotations.Parameter;
+
/**
* Base class for API based code generation MOJOs.
*/
@@ -40,18 +40,19 @@ public abstract class AbstractSourceGeneratorMojo extends AbstractGeneratorMojo
protected void setCompileSourceRoots() {
switch (addCompileSourceRoots) {
- case source:
- project.addCompileSourceRoot(generatedSrcDir.getAbsolutePath());
- project.addCompileSourceRoot(generatedTestDir.getAbsolutePath());
- break;
- case test:
- project.addTestCompileSourceRoot(generatedSrcDir.getAbsolutePath());
- project.addTestCompileSourceRoot(generatedTestDir.getAbsolutePath());
- break;
- case all:
- project.addCompileSourceRoot(generatedSrcDir.getAbsolutePath());
- project.addTestCompileSourceRoot(generatedTestDir.getAbsolutePath());
- break;
+ case source:
+ project.addCompileSourceRoot(generatedSrcDir.getAbsolutePath());
+ project.addCompileSourceRoot(generatedTestDir.getAbsolutePath());
+ break;
+ case test:
+ project.addTestCompileSourceRoot(generatedSrcDir.getAbsolutePath());
+ project.addTestCompileSourceRoot(generatedTestDir.getAbsolutePath());
+ break;
+ case all:
+ project.addCompileSourceRoot(generatedSrcDir.getAbsolutePath());
+ project.addTestCompileSourceRoot(generatedTestDir.getAbsolutePath());
+ break;
+ default:
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/550f25a5/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java
b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java
index 0fee442..079f524 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +16,12 @@
*/
package org.apache.camel.maven;
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
@@ -24,12 +30,6 @@ import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
http://git-wip-us.apache.org/repos/asf/camel/blob/550f25a5/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/FileApiMethodGeneratorMojoTest.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/FileApiMethodGeneratorMojoTest.java
b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/FileApiMethodGeneratorMojoTest.java
index 7f12785..271641c 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/FileApiMethodGeneratorMojoTest.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/FileApiMethodGeneratorMojoTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.maven;
+import java.io.File;
+import java.io.IOException;
+
import org.apache.camel.component.test.TestProxy;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.junit.Test;
-import java.io.File;
-import java.io.IOException;
-
/**
* Tests {@link FileApiMethodGeneratorMojo}
*/
|