You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2022/02/11 21:26:29 UTC

[camel-quarkus] branch main updated (242bae0 -> ad7aa0f)

This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.


    from 242bae0  Remove duplicate software.amazon.awssdk:iam dependency declaration
     new 724d328  Honor extension deprecation in Catalog and in documentation
     new ad7aa0f  Deprecate camel-quarkus-spark #3466

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 docs/modules/ROOT/examples/components/spark.yml                  | 2 +-
 docs/modules/ROOT/pages/reference/extensions/spark.adoc          | 6 +++---
 extensions-jvm/spark/runtime/pom.xml                             | 1 +
 .../runtime/src/main/resources/META-INF/quarkus-extension.yaml   | 1 +
 .../org/apache/camel/quarkus/maven/CamelQuarkusExtension.java    | 9 +++++++++
 .../src/main/java/org/apache/camel/quarkus/maven/CqUtils.java    | 4 ++--
 .../apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java    | 2 +-
 .../apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java   | 2 +-
 8 files changed, 19 insertions(+), 8 deletions(-)

[camel-quarkus] 02/02: Deprecate camel-quarkus-spark #3466

Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit ad7aa0f7661865fd70c968bf783b39ded3e96ea5
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Feb 11 16:51:42 2022 +0100

    Deprecate camel-quarkus-spark #3466
---
 docs/modules/ROOT/examples/components/spark.yml                     | 2 +-
 docs/modules/ROOT/pages/reference/extensions/spark.adoc             | 6 +++---
 extensions-jvm/spark/runtime/pom.xml                                | 1 +
 .../runtime/src/main/resources/META-INF/quarkus-extension.yaml      | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/modules/ROOT/examples/components/spark.yml b/docs/modules/ROOT/examples/components/spark.yml
index 114b0db..d892cda 100644
--- a/docs/modules/ROOT/examples/components/spark.yml
+++ b/docs/modules/ROOT/examples/components/spark.yml
@@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-spark
 cqArtifactIdBase: spark
 cqNativeSupported: false
 cqStatus: Preview
-cqDeprecated: false
+cqDeprecated: true
 cqJvmSince: 1.3.0
 cqNativeSince: n/a
 cqCamelPartName: spark
diff --git a/docs/modules/ROOT/pages/reference/extensions/spark.adoc b/docs/modules/ROOT/pages/reference/extensions/spark.adoc
index 3f3cfaa..41dbc25 100644
--- a/docs/modules/ROOT/pages/reference/extensions/spark.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/spark.adoc
@@ -5,14 +5,14 @@
 :cq-artifact-id: camel-quarkus-spark
 :cq-native-supported: false
 :cq-status: Preview
-:cq-status-deprecation: Preview
+:cq-status-deprecation: Preview Deprecated
 :cq-description: Send RDD or DataFrame jobs to Apache Spark clusters.
-:cq-deprecated: false
+:cq-deprecated: true
 :cq-jvm-since: 1.3.0
 :cq-native-since: n/a
 
 [.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.3.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.3.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated##
 
 Send RDD or DataFrame jobs to Apache Spark clusters.
 
diff --git a/extensions-jvm/spark/runtime/pom.xml b/extensions-jvm/spark/runtime/pom.xml
index fa897cc..13fa30a 100644
--- a/extensions-jvm/spark/runtime/pom.xml
+++ b/extensions-jvm/spark/runtime/pom.xml
@@ -32,6 +32,7 @@
 
     <properties>
         <camel.quarkus.jvmSince>1.3.0</camel.quarkus.jvmSince>
+        <quarkus.metadata.deprecated>true</quarkus.metadata.deprecated>
     </properties>
 
     <dependencyManagement>
diff --git a/extensions-jvm/spark/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-jvm/spark/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 1f0d82e..eadc790 100644
--- a/extensions-jvm/spark/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions-jvm/spark/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -30,3 +30,4 @@ metadata:
   - "integration"
   status:
   - "preview"
+  - "deprecated"
\ No newline at end of file

[camel-quarkus] 01/02: Honor extension deprecation in Catalog and in documentation

Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 724d328340006a4d939d2a7a4cf6ad3c11f869ea
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Feb 11 17:06:58 2022 +0100

    Honor extension deprecation in Catalog and in documentation
---
 .../org/apache/camel/quarkus/maven/CamelQuarkusExtension.java    | 9 +++++++++
 .../src/main/java/org/apache/camel/quarkus/maven/CqUtils.java    | 4 ++--
 .../apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java    | 2 +-
 .../apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java   | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java
index c6999ca..785c301 100644
--- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java
+++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java
@@ -75,6 +75,7 @@ public class CamelQuarkusExtension {
                     : ExtensionStatus.valueOf(extensionStatus);
             final boolean unlisted = !nativeSupported
                     || Boolean.parseBoolean(props.getProperty("quarkus.metadata.unlisted", "false"));
+            final boolean deprecated = Boolean.parseBoolean(props.getProperty("quarkus.metadata.deprecated", "false"));
 
             final String rawKind = (String) props.get(CAMEL_QUARKUS_KIND);
             final Kind kind = rawKind == null ? null : Kind.valueOf(rawKind);
@@ -92,6 +93,7 @@ public class CamelQuarkusExtension {
                     nativeSupported,
                     status,
                     unlisted,
+                    deprecated,
                     deps == null ? Collections.emptyList() : Collections.unmodifiableList(deps),
                     kind,
                     props.getProperty("cq.quarkus.aws.client.baseName"),
@@ -114,6 +116,7 @@ public class CamelQuarkusExtension {
     private final List<Dependency> dependencies;
     private final ExtensionStatus status;
     private final boolean unlisted;
+    private final boolean deprecated;
     private final Kind kind;
     private final String quarkusAwsClientBaseName;
     private final String quarkusAwsClientFqClassName;
@@ -131,6 +134,7 @@ public class CamelQuarkusExtension {
             boolean nativeSupported,
             ExtensionStatus status,
             boolean unlisted,
+            boolean deprecated,
             List<Dependency> dependencies,
             Kind kind,
             String quarkusAwsClientBaseName,
@@ -148,6 +152,7 @@ public class CamelQuarkusExtension {
         this.nativeSupported = nativeSupported;
         this.status = status;
         this.unlisted = unlisted;
+        this.deprecated = deprecated;
         this.dependencies = dependencies;
         this.kind = kind;
         this.quarkusAwsClientBaseName = quarkusAwsClientBaseName;
@@ -210,6 +215,10 @@ public class CamelQuarkusExtension {
         return unlisted;
     }
 
+    public boolean isDeprecated() {
+        return deprecated;
+    }
+
     public Kind getKind() {
         return kind;
     }
diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java
index b22e83d..da3c906 100644
--- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java
+++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqUtils.java
@@ -229,8 +229,8 @@ public class CqUtils {
         }
     }
 
-    public static boolean isDeprecated(String title, Collection<ArtifactModel<?>> models) {
-        return title.contains("(deprecated)") || models.stream().anyMatch(m -> m.isDeprecated());
+    public static boolean isDeprecated(String title, Collection<ArtifactModel<?>> models, boolean deprecated) {
+        return deprecated || title.contains("(deprecated)") || models.stream().anyMatch(m -> m.isDeprecated());
     }
 
     static Path copyJar(Path localRepository, String groupId, String artifactId, String version) {
diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
index 936989b..5e2fc00 100644
--- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
+++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
@@ -133,7 +133,7 @@ public class PrepareCatalogQuarkusMojo extends AbstractExtensionListMojo {
                         model.setTitle(title);
                         model.setDescription(ext.getDescription().orElseThrow(() -> new RuntimeException(
                                 "description is missing in " + ext.getRuntimePomXmlPath())));
-                        model.setDeprecated(CqUtils.isDeprecated(title, models));
+                        model.setDeprecated(CqUtils.isDeprecated(title, models, ext.isDeprecated()));
                         model.setLabel(ext.getLabel().orElse("quarkus"));
                         update(model, ext, nativeSupported);
                         CqCatalog.serialize(catalogPath, model);
diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
index ff8c3d5..6c04d5b 100644
--- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
+++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
@@ -116,7 +116,7 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo {
         final String description = CqUtils.getDescription(models, ext.getDescription().orElse(null), getLog());
         model.put("description", description);
         model.put("status", ext.getStatus().getCapitalized());
-        final boolean deprecated = CqUtils.isDeprecated(title, models);
+        final boolean deprecated = CqUtils.isDeprecated(title, models, ext.isDeprecated());
         model.put("statusDeprecation",
                 deprecated ? ext.getStatus().getCapitalized() + " Deprecated" : ext.getStatus().getCapitalized());
         model.put("deprecated", deprecated);