helidon-io · tomas-langer · Aug 8, 2023 · Aug 8, 2023
diff --git a/common/features/api/src/main/java/io/helidon/common/features/api/HelidonFlavor.java b/common/features/api/src/main/java/io/helidon/common/features/api/HelidonFlavor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,5 @@ public enum HelidonFlavor {
     /**
      * The "MicroProfile" flavor.
      */
-    MP,
-    /**
-     * The Loom based blocking flavor.
-     */
-    NIMA
+    MP
 }
diff --git a/config/config/src/main/java/module-info.java b/config/config/src/main/java/module-info.java
@@ -24,7 +24,7 @@
  */
 @Feature(value = "Config",
         description = "Configuration module",
-        in = {HelidonFlavor.NIMA, HelidonFlavor.SE}
+        in = HelidonFlavor.SE
 )
 module io.helidon.config {
 

diff --git a/health/health-checks/src/main/java/module-info.java b/health/health-checks/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "Built-ins",
         description = "Built in health checks",
-        in = {HelidonFlavor.MP, HelidonFlavor.SE, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.MP, HelidonFlavor.SE},
         path = {"Health", "Builtins"}
 )
 module io.helidon.health.checks {

diff --git a/integrations/neo4j/health/src/main/java/module-info.java b/integrations/neo4j/health/src/main/java/module-info.java
@@ -24,7 +24,7 @@
 @Preview
 @Feature(value = "Neo4j Health",
         description = "Health check for Neo4j integration",
-        in = {HelidonFlavor.SE, HelidonFlavor.NIMA},
+        in = HelidonFlavor.SE,
         path = {"Neo4j", "Health"}
 )
 module io.helidon.integrations.neo4j.health {

diff --git a/integrations/neo4j/metrics/src/main/java/module-info.java b/integrations/neo4j/metrics/src/main/java/module-info.java
@@ -24,7 +24,7 @@
 @Preview
 @Feature(value = "Neo4j Metrics",
         description = "Metrics for Neo4j integration",
-        in = {HelidonFlavor.MP, HelidonFlavor.SE, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.MP, HelidonFlavor.SE},
         path = {"Neo4j", "Metrics"}
 )
 module io.helidon.integrations.neo4j.metrics {

diff --git a/integrations/neo4j/neo4j/src/main/java/module-info.java b/integrations/neo4j/neo4j/src/main/java/module-info.java
@@ -24,7 +24,7 @@
 @Preview
 @Feature(value = "Neo4j integration",
          description = "Integration with Neo4j driver",
-         in = {HelidonFlavor.MP, HelidonFlavor.NIMA},
+         in = {HelidonFlavor.MP, HelidonFlavor.SE},
          invalidIn = HelidonFlavor.SE,
          path = "Neo4j"
 )

diff --git a/integrations/vault/auths/approle/src/main/java/module-info.java b/integrations/vault/auths/approle/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "AppRole",
         description = "AppRole Authentication Method",
-        in = {HelidonFlavor.MP, HelidonFlavor.SE, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.MP, HelidonFlavor.SE},
         path = {"HCP Vault", "Auth", "AppRole"}
 )
 module io.helidon.integrations.vault.auths.approle {

diff --git a/integrations/vault/auths/k8s/src/main/java/module-info.java b/integrations/vault/auths/k8s/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "k8s",
         description = "Kubernetes Authentication Method",
-        in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.SE, HelidonFlavor.MP},
         path = {"HCP Vault", "Auth", "k8s"}
 )
 module io.helidon.integrations.vault.auths.k8s {

diff --git a/integrations/vault/auths/token/src/main/java/module-info.java b/integrations/vault/auths/token/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "Token",
         description = "Token Authentication Method",
-        in = {HelidonFlavor.MP, HelidonFlavor.SE, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.MP, HelidonFlavor.SE},
         path = {"HCP Vault", "Auth", "Token"}
 )
 module io.helidon.integrations.vault.auths.token {

diff --git a/integrations/vault/secrets/cubbyhole/src/main/java/module-info.java b/integrations/vault/secrets/cubbyhole/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "Cubbyhole",
         description = "Cubbyhole Secrets Engine",
-        in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.SE, HelidonFlavor.MP},
         path = {"HCP Vault", "Secrets", "Cubbyhole"}
 )
 module io.helidon.integrations.vault.secrets.cubbyhole {

diff --git a/integrations/vault/secrets/database/src/main/java/module-info.java b/integrations/vault/secrets/database/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "Database",
         description = "Database Secrets Engine",
-        in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.SE, HelidonFlavor.MP},
         path = {"HCP Vault", "Secrets", "Database"}
 )
 module io.helidon.integrations.vault.secrets.database {

diff --git a/integrations/vault/secrets/kv1/src/main/java/module-info.java b/integrations/vault/secrets/kv1/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "K/V 1",
         description = "Key/Value Version 1 Secrets Engine",
-        in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.SE, HelidonFlavor.MP},
         path = {"HCP Vault", "Secrets", "K/V 1"}
 )
 module io.helidon.integrations.vault.secrets.kvone {

diff --git a/integrations/vault/secrets/kv2/src/main/java/module-info.java b/integrations/vault/secrets/kv2/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "K/V 2",
         description = "Key/Value Version 2 Secrets Engine",
-        in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.SE, HelidonFlavor.MP},
         path = {"HCP Vault", "Secrets", "K/V 2"}
 )
 module io.helidon.integrations.vault.secrets.kv {

diff --git a/integrations/vault/secrets/pki/src/main/java/module-info.java b/integrations/vault/secrets/pki/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "PKI",
         description = "PKI Secrets Engine",
-        in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.SE, HelidonFlavor.MP},
         path = {"HCP Vault", "Secrets", "PKI"}
 )
 module io.helidon.integrations.vault.secrets.pki {

diff --git a/integrations/vault/secrets/transit/src/main/java/module-info.java b/integrations/vault/secrets/transit/src/main/java/module-info.java
@@ -24,7 +24,7 @@
  */
 @Feature(value = "Transit",
         description = "Transit Secrets Engine",
-        in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.SE, HelidonFlavor.MP},
         path = {"HCP Vault", "Secrets", "Transit"}
 )
 module io.helidon.integrations.vault.secrets.transit {

diff --git a/integrations/vault/sys/sys/src/main/java/module-info.java b/integrations/vault/sys/sys/src/main/java/module-info.java
@@ -24,7 +24,7 @@
  */
 @Feature(value = "Sys",
         description = "System operations",
-        in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.SE, HelidonFlavor.MP},
         path = {"HCP Vault", "Sys"}
 )
 module io.helidon.integrations.vault.sys {

diff --git a/integrations/vault/vault/src/main/java/module-info.java b/integrations/vault/vault/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "HCP Vault",
         description = "Vault integration",
-        in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.SE, HelidonFlavor.MP},
         path = "HCP Vault"
 )
 module io.helidon.integrations.vault {

diff --git a/logging/log4j/src/main/java/module-info.java b/logging/log4j/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
  */
 @Feature(value = "Log4j",
         description = "Log4j MDC support",
-        in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
+        in = {HelidonFlavor.SE, HelidonFlavor.MP},
         path = {"Logging", "Log4j"}
 )
 @Aot(description = "Only programmatic configuration supported, does not work with Helidon loggers")

diff --git a/nima/fault-tolerance/fault-tolerance/src/main/java/module-info.java b/nima/fault-tolerance/fault-tolerance/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "Fault Tolerance",
          description = "Fault Tolerance support",
-         in = HelidonFlavor.NIMA,
+         in = HelidonFlavor.SE,
          path = "FT"
 )
 module io.helidon.nima.faulttolerance {

diff --git a/nima/graphql/server/src/main/java/module-info.java b/nima/graphql/server/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
 @Preview
 @Feature(value = "GraphQL",
         description = "GraphQL Support",
-        in = HelidonFlavor.NIMA,
-        invalidIn = {HelidonFlavor.SE, HelidonFlavor.MP}
+        in = HelidonFlavor.SE,
+        invalidIn = HelidonFlavor.MP
 )
 module io.helidon.nima.graphql.server {
     requires static io.helidon.common.features.api;

diff --git a/nima/grpc/webserver/src/main/java/module-info.java b/nima/grpc/webserver/src/main/java/module-info.java
@@ -24,8 +24,7 @@
 @Preview
 @Feature(value = "GRPC",
          description = "gRPC Support",
-         in = HelidonFlavor.NIMA,
-         invalidIn = HelidonFlavor.SE,
+         in = HelidonFlavor.SE,
          path = {"GRPC", "WebServer"}
 )
 module io.helidon.nima.grpc.server {

diff --git a/nima/http/encoding/deflate/src/main/java/module-info.java b/nima/http/encoding/deflate/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,7 @@
  */
 @Feature(value = "Deflate",
         description = "Deflate content encoding support",
-        in = HelidonFlavor.NIMA,
-        invalidIn = HelidonFlavor.SE,
+        in = HelidonFlavor.SE,
         path = {"Encoding", "Deflate"}
 )
 module io.helidon.nima.http.encoding.deflate {

diff --git a/nima/http/encoding/encoding/src/main/java/module-info.java b/nima/http/encoding/encoding/src/main/java/module-info.java
@@ -22,8 +22,7 @@
  */
 @Feature(value = "Encoding",
          description = "Content encoding support",
-         in = HelidonFlavor.NIMA,
-         invalidIn = HelidonFlavor.SE,
+         in = HelidonFlavor.SE,
          path = "Encoding"
 )
 module io.helidon.nima.http.encoding {

diff --git a/nima/http/encoding/gzip/src/main/java/module-info.java b/nima/http/encoding/gzip/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,7 @@
  */
 @Feature(value = "GZip",
         description = "GZip content encoding support",
-        in = HelidonFlavor.NIMA,
-        invalidIn = HelidonFlavor.SE,
+        in = HelidonFlavor.SE,
         path = {"Encoding", "GZip"}
 )
 module io.helidon.nima.http.encoding.gzip {

diff --git a/nima/http/media/jackson/src/main/java/module-info.java b/nima/http/media/jackson/src/main/java/module-info.java
@@ -22,8 +22,7 @@
  */
 @Feature(value = "Jackson",
          description = "Jackson media support",
-         in = HelidonFlavor.NIMA,
-         invalidIn = HelidonFlavor.SE,
+         in = HelidonFlavor.SE,
          path = {"Media", "Jackson"}
 )
 module io.helidon.nima.http.media.jackson {

diff --git a/nima/http/media/jsonb/src/main/java/module-info.java b/nima/http/media/jsonb/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
  */
 @Feature(value = "JSONB",
         description = "JSON-B media support",
-        in = HelidonFlavor.NIMA,
-        invalidIn = HelidonFlavor.SE,
+        in = HelidonFlavor.SE,
         path = {"Media", "JSON-B"}
 )
 module io.helidon.nima.http.media.jsonb {

diff --git a/nima/http/media/jsonp/src/main/java/module-info.java b/nima/http/media/jsonp/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
  */
 @Feature(value = "JSONP",
         description = "JSON-P media support",
-        in = HelidonFlavor.NIMA,
-        invalidIn = HelidonFlavor.SE,
+        in = HelidonFlavor.SE,
         path = {"Media", "JSON-P"}
 )
 module io.helidon.nima.http.media.jsonp {

diff --git a/nima/http/media/media/src/main/java/module-info.java b/nima/http/media/media/src/main/java/module-info.java
@@ -22,8 +22,7 @@
  */
 @Feature(value = "Media",
          description = "Media Support",
-         in = HelidonFlavor.NIMA,
-         invalidIn = HelidonFlavor.SE,
+         in = HelidonFlavor.SE,
          path = "Media"
 )
 module io.helidon.nima.http.media {

diff --git a/nima/http/media/multipart/src/main/java/module-info.java b/nima/http/media/multipart/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
  */
 @Feature(value = "Multipart",
         description = "Multipart media support",
-        in = HelidonFlavor.NIMA,
-        invalidIn = HelidonFlavor.SE,
+        in = HelidonFlavor.SE,
         path = {"Media", "Multipart"}
 )
 module io.helidon.nima.http.media.multipart {

diff --git a/nima/http2/webclient/src/main/java/module-info.java b/nima/http2/webclient/src/main/java/module-info.java
@@ -22,8 +22,7 @@
  */
 @Feature(value = "HTTP/2",
          description = "HTTP/2 WebClient",
-         in = HelidonFlavor.NIMA,
-         invalidIn = HelidonFlavor.SE,
+         in = HelidonFlavor.SE,
          path = {"WebClient", "HTTP/2"}
 )
 module io.helidon.nima.http2.webclient {

diff --git a/nima/http2/webserver/src/main/java/module-info.java b/nima/http2/webserver/src/main/java/module-info.java
@@ -24,8 +24,7 @@
  */
 @Feature(value = "HTTP/2",
          description = "HTTP/2 WebServer",
-         in = HelidonFlavor.NIMA,
-         invalidIn = HelidonFlavor.SE,
+         in = HelidonFlavor.SE,
          path = {"WebServer", "HTTP/2"}
 )
 module io.helidon.nima.http2.webserver {

diff --git a/nima/observe/health/src/main/java/module-info.java b/nima/observe/health/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,9 @@
 /**
  * Health checks for Níma observability.
  */
-@Feature(value = "Health", description = "Health check support", in = HelidonFlavor.NIMA)
+@Feature(value = "Health",
+         description = "Health check support",
+         in = HelidonFlavor.SE)
 module io.helidon.nima.observe.health {
     requires java.management;
 

diff --git a/nima/observe/metrics/src/main/java/module-info.java b/nima/observe/metrics/src/main/java/module-info.java
@@ -22,7 +22,7 @@
  */
 @Feature(value = "Metrics",
          description = "Metrics support",
-         in = HelidonFlavor.NIMA)
+         in = HelidonFlavor.SE)
 module io.helidon.nima.observe.metrics {
     requires transitive io.helidon.nima.observe;
     requires io.helidon.nima.webserver;

diff --git a/nima/sse/webserver/src/main/java/module-info.java b/nima/sse/webserver/src/main/java/module-info.java
@@ -24,8 +24,7 @@
  */
 @Feature(value = "SSE",
          description = "SSE WebServer",
-         in = HelidonFlavor.NIMA,
-         invalidIn = HelidonFlavor.SE,
+         in = HelidonFlavor.SE,
          path = {"WebServer", "SSE"}
 )
 module io.helidon.nima.sse.webserver {

diff --git a/nima/webclient/api/src/main/java/module-info.java b/nima/webclient/api/src/main/java/module-info.java
@@ -22,8 +22,7 @@
  */
 @Feature(value = "Web Client",
          description = "Web Client",
-         in = HelidonFlavor.NIMA,
-         invalidIn = HelidonFlavor.SE,
+         in = HelidonFlavor.SE,
          path = "Web Client"
 )
 module io.helidon.nima.webclient.api {