Repository: camel Updated Branches: refs/heads/master dd05d1afa -> 02c92631c
CAMEL-10810: Component docs - Remove .0 from available from Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e96bc0a3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e96bc0a3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e96bc0a3 Branch: refs/heads/master Commit: e96bc0a30a14b00737aed6901d1d54ae3655188f Parents: dd05d1a Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Feb 11 12:39:49 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Feb 11 12:39:49 2017 +0100 ---------------------------------------------------------------------- .../apache/camel/maven/packaging/ReadmeComponentMojo.java | 6 ++++++ .../org/apache/camel/maven/packaging/StringHelper.java | 10 ++++++++++ .../camel/maven/packaging/model/ComponentModel.java | 6 ++++++ .../camel/maven/packaging/model/DataFormatModel.java | 6 ++++++ .../apache/camel/maven/packaging/model/LanguageModel.java | 6 ++++++ .../apache/camel/maven/packaging/model/OtherModel.java | 6 ++++++ .../src/main/resources/readme-components.mvel | 2 +- .../src/main/resources/readme-dataformats.mvel | 2 +- .../src/main/resources/readme-languages.mvel | 2 +- .../src/main/resources/readme-others.mvel | 2 +- 10 files changed, 44 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e96bc0a3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java index 5b60b9e..496a591 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java @@ -357,6 +357,12 @@ public class ReadmeComponentMojo extends AbstractMojo { return false; } + // cut last digit so its not 2.18.0 but 2.18 + String[] parts = firstVersion.split("\\."); + if (parts.length == 3 && parts[2].equals("0")) { + firstVersion = parts[0] + "." + parts[1]; + } + boolean updated = false; try { http://git-wip-us.apache.org/repos/asf/camel/blob/e96bc0a3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java index b65ada8..d7829ae 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java @@ -87,4 +87,14 @@ public final class StringHelper { return sb.toString(); } + public static String cutLastZeroDigit(String version) { + String answer = version; + // cut last digit so its not 2.18.0 but 2.18 + String[] parts = version.split("\\."); + if (parts.length == 3 && parts[2].equals("0")) { + answer = parts[0] + "." + parts[1]; + } + return answer; + } + } http://git-wip-us.apache.org/repos/asf/camel/blob/e96bc0a3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java index 8260794..f117ca8 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentModel.java @@ -19,6 +19,8 @@ package org.apache.camel.maven.packaging.model; import java.util.ArrayList; import java.util.List; +import static org.apache.camel.maven.packaging.StringHelper.cutLastZeroDigit; + public class ComponentModel { private final boolean coreOnly; @@ -213,4 +215,8 @@ public class ComponentModel { return artifactId + "/src/main/docs"; } } + + public String getFirstVersionShort() { + return cutLastZeroDigit(firstVersion); + } } http://git-wip-us.apache.org/repos/asf/camel/blob/e96bc0a3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java index 58aefb4..74047a8 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/DataFormatModel.java @@ -19,6 +19,8 @@ package org.apache.camel.maven.packaging.model; import java.util.ArrayList; import java.util.List; +import static org.apache.camel.maven.packaging.StringHelper.cutLastZeroDigit; + public class DataFormatModel { private String kind; @@ -163,4 +165,8 @@ public class DataFormatModel { } } + public String getFirstVersionShort() { + return cutLastZeroDigit(firstVersion); + } + } http://git-wip-us.apache.org/repos/asf/camel/blob/e96bc0a3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java index 2433476..79067bf 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/LanguageModel.java @@ -19,6 +19,8 @@ package org.apache.camel.maven.packaging.model; import java.util.ArrayList; import java.util.List; +import static org.apache.camel.maven.packaging.StringHelper.cutLastZeroDigit; + public class LanguageModel { private String kind; @@ -163,4 +165,8 @@ public class LanguageModel { } } + public String getFirstVersionShort() { + return cutLastZeroDigit(firstVersion); + } + } http://git-wip-us.apache.org/repos/asf/camel/blob/e96bc0a3/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherModel.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherModel.java index fc28266..fd0c8dd 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherModel.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/OtherModel.java @@ -16,6 +16,8 @@ */ package org.apache.camel.maven.packaging.model; +import static org.apache.camel.maven.packaging.StringHelper.cutLastZeroDigit; + public class OtherModel { private String kind; @@ -113,4 +115,8 @@ public class OtherModel { return artifactId + "/src/main/docs"; } + public String getFirstVersionShort() { + return cutLastZeroDigit(firstVersion); + } + } http://git-wip-us.apache.org/repos/asf/camel/blob/e96bc0a3/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-components.mvel ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-components.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-components.mvel index dcc02dc..53ce8ba 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-components.mvel +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-components.mvel @@ -7,7 +7,7 @@ Number of Components: @{components.size} | Component | Available From | Description @foreach{row : components} | link:@{row.docLink}/${row.scheme}-component.adoc[@{row.title}] (@{row.artifactId}) + -`@{row.syntax}` | @{row.firstVersion} | @if{row.deprecated == "true"}*deprecated* @end{}@{row.description} +`@{row.syntax}` | @{row.firstVersionShort} | @if{row.deprecated == "true"}*deprecated* @end{}@{row.description} @end{} |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/e96bc0a3/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-dataformats.mvel ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-dataformats.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-dataformats.mvel index 692d825..5fdbc82 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-dataformats.mvel +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-dataformats.mvel @@ -6,7 +6,7 @@ Number of Data Formats: @{dataformats.size} |======================================================================= | Data Format | Available From | Description @foreach{row : dataformats} -| link:@{row.docLink}/${row.name}-dataformat.adoc[@{row.title}] (@{row.artifactId}) | @{row.firstVersion} | @if{row.deprecated == "true"}*deprecated* @end{}@{row.description} +| link:@{row.docLink}/${row.name}-dataformat.adoc[@{row.title}] (@{row.artifactId}) | @{row.firstVersionShort} | @if{row.deprecated == "true"}*deprecated* @end{}@{row.description} @end{}|======================================================================= @end{} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/e96bc0a3/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-languages.mvel ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-languages.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-languages.mvel index 7c97f60..0815034 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-languages.mvel +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-languages.mvel @@ -6,7 +6,7 @@ Number of Languages: @{languages.size} |======================================================================= | Language | Available From | Description @foreach{row : languages} -| link:@{row.docLink}/${row.name}-language.adoc[@{row.title}] (@{row.artifactId}) | @{row.firstVersion} | @if{row.deprecated == "true"}*deprecated* @end{}@{row.description} +| link:@{row.docLink}/${row.name}-language.adoc[@{row.title}] (@{row.artifactId}) | @{row.firstVersionShort} | @if{row.deprecated == "true"}*deprecated* @end{}@{row.description} @end{}|======================================================================= @end{} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/e96bc0a3/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-others.mvel ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-others.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-others.mvel index 0ea5935..cf08936 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-others.mvel +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-others.mvel @@ -6,7 +6,7 @@ Number of Miscellaneous Components: @{others.size} |======================================================================= | Component | Available From | Description @foreach{row : others} -| link:@{row.docLink}/${row.name}.adoc[@{row.title}] (@{row.artifactId}) | @{row.firstVersion} | @if{row.deprecated == "true"}*deprecated* @end{}@{row.description} +| link:@{row.docLink}/${row.name}.adoc[@{row.title}] (@{row.artifactId}) | @{row.firstVersionShort} | @if{row.deprecated == "true"}*deprecated* @end{}@{row.description} @end{}|======================================================================= @end{} \ No newline at end of file
