You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/12/16 09:21:16 UTC
[1/2] camel git commit: CAMEL-10602: Fix camel:run to work again.
Repository: camel
Updated Branches:
refs/heads/camel-2.18.x e0fb6a289 -> fc3d29042
refs/heads/master 2737a6ca9 -> 5ca5b1756
CAMEL-10602: Fix camel:run to work again.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5ca5b175
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5ca5b175
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5ca5b175
Branch: refs/heads/master
Commit: 5ca5b175699a56decdfcc0fcec309b41489a4bf1
Parents: 2737a6c
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 10:05:10 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 10:20:31 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/maven/EmbeddedMojo.java | 2 +-
.../src/main/java/org/apache/camel/maven/RunMojo.java | 13 ++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5ca5b175/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
index e804cd1..3a9970a 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
@@ -37,7 +37,7 @@ import org.codehaus.mojo.exec.AbstractExecMojo;
*
* @goal embedded
* @requiresDependencyResolution compile+runtime
- * @execute phase="test-compile"
+ * @execute phase="prepare-package"
*/
public class EmbeddedMojo extends AbstractExecMojo {
http://git-wip-us.apache.org/repos/asf/camel/blob/5ca5b175/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 5e37b15..8fcc80c 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
@@ -64,7 +64,7 @@ import org.codehaus.mojo.exec.Property;
*
* @goal run
* @requiresDependencyResolution compile+runtime
- * @execute phase="test-compile"
+ * @execute phase="prepare-package"
*/
public class RunMojo extends AbstractExecMojo {
@@ -358,9 +358,16 @@ public class RunMojo extends AbstractExecMojo {
* @throws MojoFailureException something bad happened...
*/
public void execute() throws MojoExecutionException, MojoFailureException {
+
+ String skip = System.getProperties().getProperty("maven.test.skip");
+ if (skip == null || "false".equals(skip)) {
+ // lets log a INFO about how to skip tests if you want to so you can run faster
+ getLog().info("You can skip tests from the command line using: mvn camel:run -Dmaven.test.skip=true");
+ }
+
boolean usingSpringJavaConfigureMain = false;
- boolean useCdiMain = false;
+ boolean useCdiMain;
if (useCDI != null) {
// use configured value
useCdiMain = useCDI;
@@ -368,7 +375,7 @@ public class RunMojo extends AbstractExecMojo {
// auto detect if we have cdi
useCdiMain = detectCDIOnClassPath();
}
- boolean usingBlueprintMain = false;
+ boolean usingBlueprintMain;
if (useBlueprint != null) {
// use configured value
usingBlueprintMain = useBlueprint;
[2/2] camel git commit: CAMEL-10602: Fix camel:run to work again.
Posted by da...@apache.org.
CAMEL-10602: Fix camel:run to work again.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc3d2904
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc3d2904
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc3d2904
Branch: refs/heads/camel-2.18.x
Commit: fc3d29042ce9903dbbe9272fc972dee593501f29
Parents: e0fb6a2
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 10:05:10 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 10:21:04 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/maven/EmbeddedMojo.java | 2 +-
.../src/main/java/org/apache/camel/maven/RunMojo.java | 13 ++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fc3d2904/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
index e804cd1..3a9970a 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
@@ -37,7 +37,7 @@ import org.codehaus.mojo.exec.AbstractExecMojo;
*
* @goal embedded
* @requiresDependencyResolution compile+runtime
- * @execute phase="test-compile"
+ * @execute phase="prepare-package"
*/
public class EmbeddedMojo extends AbstractExecMojo {
http://git-wip-us.apache.org/repos/asf/camel/blob/fc3d2904/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 5e37b15..8fcc80c 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
@@ -64,7 +64,7 @@ import org.codehaus.mojo.exec.Property;
*
* @goal run
* @requiresDependencyResolution compile+runtime
- * @execute phase="test-compile"
+ * @execute phase="prepare-package"
*/
public class RunMojo extends AbstractExecMojo {
@@ -358,9 +358,16 @@ public class RunMojo extends AbstractExecMojo {
* @throws MojoFailureException something bad happened...
*/
public void execute() throws MojoExecutionException, MojoFailureException {
+
+ String skip = System.getProperties().getProperty("maven.test.skip");
+ if (skip == null || "false".equals(skip)) {
+ // lets log a INFO about how to skip tests if you want to so you can run faster
+ getLog().info("You can skip tests from the command line using: mvn camel:run -Dmaven.test.skip=true");
+ }
+
boolean usingSpringJavaConfigureMain = false;
- boolean useCdiMain = false;
+ boolean useCdiMain;
if (useCDI != null) {
// use configured value
useCdiMain = useCDI;
@@ -368,7 +375,7 @@ public class RunMojo extends AbstractExecMojo {
// auto detect if we have cdi
useCdiMain = detectCDIOnClassPath();
}
- boolean usingBlueprintMain = false;
+ boolean usingBlueprintMain;
if (useBlueprint != null) {
// use configured value
usingBlueprintMain = useBlueprint;