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 2017/06/09 08:07:38 UTC
[1/2] camel git commit: CAMEL-11390: Fixed
camel-maven-plugin:validate to not download camel-catalog if turned off.
Repository: camel
Updated Branches:
refs/heads/camel-2.19.x 3e4c7820e -> 2a3dd76c5
refs/heads/master 6e7e84f52 -> 31654e1d3
CAMEL-11390: Fixed camel-maven-plugin:validate to not download camel-catalog if turned off.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/31654e1d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/31654e1d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/31654e1d
Branch: refs/heads/master
Commit: 31654e1d349e3401f216f0a7dd1d482d5cb7f485
Parents: 6e7e84f
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jun 9 10:06:57 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jun 9 10:06:57 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/maven/ValidateMojo.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/31654e1d/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index f907607..1654054 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -183,6 +183,11 @@ public class ValidateMojo extends AbstractExecMojo {
// enable caching
catalog.enableCache();
+ String detectedVersion = findCamelVersion(project);
+ if (detectedVersion != null) {
+ getLog().info("Detected Camel version used in project: " + detectedVersion);
+ }
+
if (downloadVersion) {
String catalogVersion = catalog.getCatalogVersion();
String version = findCamelVersion(project);
@@ -196,16 +201,10 @@ public class ValidateMojo extends AbstractExecMojo {
}
}
- // if using the same version as the camel-maven-plugin we must still load it
- if (catalog.getLoadedVersion() == null) {
- catalog.loadVersion(catalog.getCatalogVersion());
- }
-
if (catalog.getLoadedVersion() != null) {
- getLog().info("Using Camel version: " + catalog.getLoadedVersion());
+ getLog().info("Validating using downloaded Camel version: " + catalog.getLoadedVersion());
} else {
- // force load version from the camel-maven-plugin
- getLog().info("Using Camel version: " + catalog.getCatalogVersion());
+ getLog().info("Validating using Camel version: " + catalog.getCatalogVersion());
}
List<CamelEndpointDetails> endpoints = new ArrayList<>();
[2/2] camel git commit: CAMEL-11390: Fixed
camel-maven-plugin:validate to not download camel-catalog if turned off.
Posted by da...@apache.org.
CAMEL-11390: Fixed camel-maven-plugin:validate to not download camel-catalog if turned off.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2a3dd76c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2a3dd76c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2a3dd76c
Branch: refs/heads/camel-2.19.x
Commit: 2a3dd76c54d52507fa40e7e8a9bcca047d281960
Parents: 3e4c782
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jun 9 10:06:57 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jun 9 10:07:32 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/maven/ValidateMojo.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2a3dd76c/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 3c8eca2..e217dd9 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -173,6 +173,11 @@ public class ValidateMojo extends AbstractExecMojo {
// enable caching
catalog.enableCache();
+ String detectedVersion = findCamelVersion(project);
+ if (detectedVersion != null) {
+ getLog().info("Detected Camel version used in project: " + detectedVersion);
+ }
+
if (downloadVersion) {
String catalogVersion = catalog.getCatalogVersion();
String version = findCamelVersion(project);
@@ -186,16 +191,10 @@ public class ValidateMojo extends AbstractExecMojo {
}
}
- // if using the same version as the camel-maven-plugin we must still load it
- if (catalog.getLoadedVersion() == null) {
- catalog.loadVersion(catalog.getCatalogVersion());
- }
-
if (catalog.getLoadedVersion() != null) {
- getLog().info("Using Camel version: " + catalog.getLoadedVersion());
+ getLog().info("Validating using downloaded Camel version: " + catalog.getLoadedVersion());
} else {
- // force load version from the camel-maven-plugin
- getLog().info("Using Camel version: " + catalog.getCatalogVersion());
+ getLog().info("Validating using Camel version: " + catalog.getCatalogVersion());
}
List<CamelEndpointDetails> endpoints = new ArrayList<>();