Skip to content

Commit 23b7867

Browse files
tomas-langertomas-langer
authored
Using SE flavor instead of Nima (#7338)
1 parent 039bdd5 commit 23b7867

File tree

59 files changed

+78
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+78
-100
lines changed

‎common/features/api/src/main/java/io/helidon/common/features/api/HelidonFlavor.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2019, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,9 +27,5 @@ public enum HelidonFlavor {
2727
/**
2828
* The "MicroProfile" flavor.
2929
*/
30-
MP,
31-
/**
32-
* The Loom based blocking flavor.
33-
*/
34-
NIMA
30+
MP
3531
}

‎config/config/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
@Feature(value = "Config",
2626
description = "Configuration module",
27-
in = {HelidonFlavor.NIMA, HelidonFlavor.SE}
27+
in = HelidonFlavor.SE
2828
)
2929
module io.helidon.config {
3030

‎health/health-checks/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "Built-ins",
2424
description = "Built in health checks",
25-
in = {HelidonFlavor.MP, HelidonFlavor.SE, HelidonFlavor.NIMA},
25+
in = {HelidonFlavor.MP, HelidonFlavor.SE},
2626
path = {"Health", "Builtins"}
2727
)
2828
module io.helidon.health.checks {

‎integrations/neo4j/health/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
@Preview
2525
@Feature(value = "Neo4j Health",
2626
description = "Health check for Neo4j integration",
27-
in = {HelidonFlavor.SE, HelidonFlavor.NIMA},
27+
in = HelidonFlavor.SE,
2828
path = {"Neo4j", "Health"}
2929
)
3030
module io.helidon.integrations.neo4j.health {

‎integrations/neo4j/metrics/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
@Preview
2525
@Feature(value = "Neo4j Metrics",
2626
description = "Metrics for Neo4j integration",
27-
in = {HelidonFlavor.MP, HelidonFlavor.SE, HelidonFlavor.NIMA},
27+
in = {HelidonFlavor.MP, HelidonFlavor.SE},
2828
path = {"Neo4j", "Metrics"}
2929
)
3030
module io.helidon.integrations.neo4j.metrics {

‎integrations/neo4j/neo4j/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
@Preview
2525
@Feature(value = "Neo4j integration",
2626
description = "Integration with Neo4j driver",
27-
in = {HelidonFlavor.MP, HelidonFlavor.NIMA},
27+
in = {HelidonFlavor.MP, HelidonFlavor.SE},
2828
invalidIn = HelidonFlavor.SE,
2929
path = "Neo4j"
3030
)

‎integrations/vault/auths/approle/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "AppRole",
2424
description = "AppRole Authentication Method",
25-
in = {HelidonFlavor.MP, HelidonFlavor.SE, HelidonFlavor.NIMA},
25+
in = {HelidonFlavor.MP, HelidonFlavor.SE},
2626
path = {"HCP Vault", "Auth", "AppRole"}
2727
)
2828
module io.helidon.integrations.vault.auths.approle {

‎integrations/vault/auths/k8s/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "k8s",
2424
description = "Kubernetes Authentication Method",
25-
in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
25+
in = {HelidonFlavor.SE, HelidonFlavor.MP},
2626
path = {"HCP Vault", "Auth", "k8s"}
2727
)
2828
module io.helidon.integrations.vault.auths.k8s {

‎integrations/vault/auths/token/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "Token",
2424
description = "Token Authentication Method",
25-
in = {HelidonFlavor.MP, HelidonFlavor.SE, HelidonFlavor.NIMA},
25+
in = {HelidonFlavor.MP, HelidonFlavor.SE},
2626
path = {"HCP Vault", "Auth", "Token"}
2727
)
2828
module io.helidon.integrations.vault.auths.token {

‎integrations/vault/secrets/cubbyhole/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "Cubbyhole",
2424
description = "Cubbyhole Secrets Engine",
25-
in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
25+
in = {HelidonFlavor.SE, HelidonFlavor.MP},
2626
path = {"HCP Vault", "Secrets", "Cubbyhole"}
2727
)
2828
module io.helidon.integrations.vault.secrets.cubbyhole {

‎integrations/vault/secrets/database/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "Database",
2424
description = "Database Secrets Engine",
25-
in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
25+
in = {HelidonFlavor.SE, HelidonFlavor.MP},
2626
path = {"HCP Vault", "Secrets", "Database"}
2727
)
2828
module io.helidon.integrations.vault.secrets.database {

‎integrations/vault/secrets/kv1/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "K/V 1",
2424
description = "Key/Value Version 1 Secrets Engine",
25-
in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
25+
in = {HelidonFlavor.SE, HelidonFlavor.MP},
2626
path = {"HCP Vault", "Secrets", "K/V 1"}
2727
)
2828
module io.helidon.integrations.vault.secrets.kvone {

‎integrations/vault/secrets/kv2/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "K/V 2",
2424
description = "Key/Value Version 2 Secrets Engine",
25-
in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
25+
in = {HelidonFlavor.SE, HelidonFlavor.MP},
2626
path = {"HCP Vault", "Secrets", "K/V 2"}
2727
)
2828
module io.helidon.integrations.vault.secrets.kv {

‎integrations/vault/secrets/pki/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "PKI",
2424
description = "PKI Secrets Engine",
25-
in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
25+
in = {HelidonFlavor.SE, HelidonFlavor.MP},
2626
path = {"HCP Vault", "Secrets", "PKI"}
2727
)
2828
module io.helidon.integrations.vault.secrets.pki {

‎integrations/vault/secrets/transit/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
@Feature(value = "Transit",
2626
description = "Transit Secrets Engine",
27-
in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
27+
in = {HelidonFlavor.SE, HelidonFlavor.MP},
2828
path = {"HCP Vault", "Secrets", "Transit"}
2929
)
3030
module io.helidon.integrations.vault.secrets.transit {

‎integrations/vault/sys/sys/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
@Feature(value = "Sys",
2626
description = "System operations",
27-
in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
27+
in = {HelidonFlavor.SE, HelidonFlavor.MP},
2828
path = {"HCP Vault", "Sys"}
2929
)
3030
module io.helidon.integrations.vault.sys {

‎integrations/vault/vault/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "HCP Vault",
2424
description = "Vault integration",
25-
in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
25+
in = {HelidonFlavor.SE, HelidonFlavor.MP},
2626
path = "HCP Vault"
2727
)
2828
module io.helidon.integrations.vault {

‎logging/log4j/src/main/java/module-info.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2020, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
2323
*/
2424
@Feature(value = "Log4j",
2525
description = "Log4j MDC support",
26-
in = {HelidonFlavor.SE, HelidonFlavor.MP, HelidonFlavor.NIMA},
26+
in = {HelidonFlavor.SE, HelidonFlavor.MP},
2727
path = {"Logging", "Log4j"}
2828
)
2929
@Aot(description = "Only programmatic configuration supported, does not work with Helidon loggers")

‎nima/fault-tolerance/fault-tolerance/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "Fault Tolerance",
2424
description = "Fault Tolerance support",
25-
in = HelidonFlavor.NIMA,
25+
in = HelidonFlavor.SE,
2626
path = "FT"
2727
)
2828
module io.helidon.nima.faulttolerance {

‎nima/graphql/server/src/main/java/module-info.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
2525
@Preview
2626
@Feature(value = "GraphQL",
2727
description = "GraphQL Support",
28-
in = HelidonFlavor.NIMA,
29-
invalidIn = {HelidonFlavor.SE, HelidonFlavor.MP}
28+
in = HelidonFlavor.SE,
29+
invalidIn = HelidonFlavor.MP
3030
)
3131
module io.helidon.nima.graphql.server {
3232
requires static io.helidon.common.features.api;

‎nima/grpc/webserver/src/main/java/module-info.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
@Preview
2525
@Feature(value = "GRPC",
2626
description = "gRPC Support",
27-
in = HelidonFlavor.NIMA,
28-
invalidIn = HelidonFlavor.SE,
27+
in = HelidonFlavor.SE,
2928
path = {"GRPC", "WebServer"}
3029
)
3130
module io.helidon.nima.grpc.server {

‎nima/http/encoding/deflate/src/main/java/module-info.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,8 +23,7 @@
2323
*/
2424
@Feature(value = "Deflate",
2525
description = "Deflate content encoding support",
26-
in = HelidonFlavor.NIMA,
27-
invalidIn = HelidonFlavor.SE,
26+
in = HelidonFlavor.SE,
2827
path = {"Encoding", "Deflate"}
2928
)
3029
module io.helidon.nima.http.encoding.deflate {

‎nima/http/encoding/encoding/src/main/java/module-info.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
*/
2323
@Feature(value = "Encoding",
2424
description = "Content encoding support",
25-
in = HelidonFlavor.NIMA,
26-
invalidIn = HelidonFlavor.SE,
25+
in = HelidonFlavor.SE,
2726
path = "Encoding"
2827
)
2928
module io.helidon.nima.http.encoding {

‎nima/http/encoding/gzip/src/main/java/module-info.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,8 +23,7 @@
2323
*/
2424
@Feature(value = "GZip",
2525
description = "GZip content encoding support",
26-
in = HelidonFlavor.NIMA,
27-
invalidIn = HelidonFlavor.SE,
26+
in = HelidonFlavor.SE,
2827
path = {"Encoding", "GZip"}
2928
)
3029
module io.helidon.nima.http.encoding.gzip {

‎nima/http/media/jackson/src/main/java/module-info.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
*/
2323
@Feature(value = "Jackson",
2424
description = "Jackson media support",
25-
in = HelidonFlavor.NIMA,
26-
invalidIn = HelidonFlavor.SE,
25+
in = HelidonFlavor.SE,
2726
path = {"Media", "Jackson"}
2827
)
2928
module io.helidon.nima.http.media.jackson {

‎nima/http/media/jsonb/src/main/java/module-info.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
2424
*/
2525
@Feature(value = "JSONB",
2626
description = "JSON-B media support",
27-
in = HelidonFlavor.NIMA,
28-
invalidIn = HelidonFlavor.SE,
27+
in = HelidonFlavor.SE,
2928
path = {"Media", "JSON-B"}
3029
)
3130
module io.helidon.nima.http.media.jsonb {

‎nima/http/media/jsonp/src/main/java/module-info.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
2424
*/
2525
@Feature(value = "JSONP",
2626
description = "JSON-P media support",
27-
in = HelidonFlavor.NIMA,
28-
invalidIn = HelidonFlavor.SE,
27+
in = HelidonFlavor.SE,
2928
path = {"Media", "JSON-P"}
3029
)
3130
module io.helidon.nima.http.media.jsonp {

‎nima/http/media/media/src/main/java/module-info.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
*/
2323
@Feature(value = "Media",
2424
description = "Media Support",
25-
in = HelidonFlavor.NIMA,
26-
invalidIn = HelidonFlavor.SE,
25+
in = HelidonFlavor.SE,
2726
path = "Media"
2827
)
2928
module io.helidon.nima.http.media {

‎nima/http/media/multipart/src/main/java/module-info.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
2424
*/
2525
@Feature(value = "Multipart",
2626
description = "Multipart media support",
27-
in = HelidonFlavor.NIMA,
28-
invalidIn = HelidonFlavor.SE,
27+
in = HelidonFlavor.SE,
2928
path = {"Media", "Multipart"}
3029
)
3130
module io.helidon.nima.http.media.multipart {

‎nima/http2/webclient/src/main/java/module-info.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
*/
2323
@Feature(value = "HTTP/2",
2424
description = "HTTP/2 WebClient",
25-
in = HelidonFlavor.NIMA,
26-
invalidIn = HelidonFlavor.SE,
25+
in = HelidonFlavor.SE,
2726
path = {"WebClient", "HTTP/2"}
2827
)
2928
module io.helidon.nima.http2.webclient {

‎nima/http2/webserver/src/main/java/module-info.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
*/
2525
@Feature(value = "HTTP/2",
2626
description = "HTTP/2 WebServer",
27-
in = HelidonFlavor.NIMA,
28-
invalidIn = HelidonFlavor.SE,
27+
in = HelidonFlavor.SE,
2928
path = {"WebServer", "HTTP/2"}
3029
)
3130
module io.helidon.nima.http2.webserver {

‎nima/observe/health/src/main/java/module-info.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,7 +23,9 @@
2323
/**
2424
* Health checks for Níma observability.
2525
*/
26-
@Feature(value = "Health", description = "Health check support", in = HelidonFlavor.NIMA)
26+
@Feature(value = "Health",
27+
description = "Health check support",
28+
in = HelidonFlavor.SE)
2729
module io.helidon.nima.observe.health {
2830
requires java.management;
2931

‎nima/observe/metrics/src/main/java/module-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@Feature(value = "Metrics",
2424
description = "Metrics support",
25-
in = HelidonFlavor.NIMA)
25+
in = HelidonFlavor.SE)
2626
module io.helidon.nima.observe.metrics {
2727
requires transitive io.helidon.nima.observe;
2828
requires io.helidon.nima.webserver;

‎nima/sse/webserver/src/main/java/module-info.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
*/
2525
@Feature(value = "SSE",
2626
description = "SSE WebServer",
27-
in = HelidonFlavor.NIMA,
28-
invalidIn = HelidonFlavor.SE,
27+
in = HelidonFlavor.SE,
2928
path = {"WebServer", "SSE"}
3029
)
3130
module io.helidon.nima.sse.webserver {

‎nima/webclient/api/src/main/java/module-info.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
*/
2323
@Feature(value = "Web Client",
2424
description = "Web Client",
25-
in = HelidonFlavor.NIMA,
26-
invalidIn = HelidonFlavor.SE,
25+
in = HelidonFlavor.SE,
2726
path = "Web Client"
2827
)
2928
module io.helidon.nima.webclient.api {

0 commit comments

Comments
 (0)