This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit c5f31b11ba7a80ff260eecd3db48843a1ed35f16 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sat May 2 17:39:26 2020 +0200 CAMEL-14998: component docs - Mark newly added artifacts as preview support level by default --- .../camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 9 +++++---- .../org/apache/camel/maven/packaging/SupportLevelHelper.java | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java index c7dee8c..1fcbf2f 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java @@ -461,6 +461,11 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { model.setFirstVersion(firstVersion); } + model.setDescription(project.getDescription()); + model.setGroupId(project.getGroupId()); + model.setArtifactId(project.getArtifactId()); + model.setVersion(project.getVersion()); + // grab level from annotation, pom.xml or default to stable String level = project.getProperties().getProperty("supportLevel"); boolean experimental = ClassUtil.hasAnnotation("org.apache.camel.Experimental", endpointClassElement); @@ -498,10 +503,6 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { if (model.getJavaType() == null) { throw new IllegalStateException("Could not find component java type"); } - model.setDescription(project.getDescription()); - model.setGroupId(project.getGroupId()); - model.setArtifactId(project.getArtifactId()); - model.setVersion(project.getVersion()); // favor to use endpoint class javadoc as description String doc = getDocComment(endpointClassElement); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SupportLevelHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SupportLevelHelper.java index 5286cf2..613bf61 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SupportLevelHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SupportLevelHelper.java @@ -25,12 +25,12 @@ public final class SupportLevelHelper { } public static SupportLevel defaultSupportLevel(String firstVersion, String currentVersion) { - boolean older = CamelVersionHelper.isGE(currentVersion, firstVersion); - if (older) { - return SupportLevel.Stable; - } else { + boolean justNew = CamelVersionHelper.isGE(currentVersion, firstVersion); + if (justNew) { // its a new component that is added to this version so lets mark it as preview by default return SupportLevel.Preview; + } else { + return SupportLevel.Stable; } } }