diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 93935176e86..aab3e06afe2 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -68,11 +68,11 @@ 2.13.4.20221013 2.0.1 - 2.0.0 - 3.0.0 + 2.1.0 + 4.0.1 4.0.0 - 2.0.0 - 2.0.0 + 2.0.1 + 2.1.0 3.0.0 3.0.0 2.0.0 @@ -144,8 +144,8 @@ 1.32 1.4.2 2.0.4 - 4.0.SP1 - 4.0.2.Final + 5.0.SP3 + 5.1.0.Final 2.0.4 2.12.0 2.12.5 @@ -899,6 +899,17 @@ weld-spi ${version.lib.weld-api} + + org.jboss.weld + weld-lite-extension-translator + ${version.lib.weld} + + + org.jboss.weld + weld-core-impl + + + org.jboss.weld.module weld-jta diff --git a/integrations/cdi/jedis-cdi/pom.xml b/integrations/cdi/jedis-cdi/pom.xml index 95d178bdf6f..419373888e8 100644 --- a/integrations/cdi/jedis-cdi/pom.xml +++ b/integrations/cdi/jedis-cdi/pom.xml @@ -1,7 +1,7 @@ jakarta.enterprise diff --git a/integrations/cdi/jedis-cdi/src/main/java/module-info.java b/integrations/cdi/jedis-cdi/src/main/java/module-info.java index e7b676d4c09..49f2b01cb2c 100644 --- a/integrations/cdi/jedis-cdi/src/main/java/module-info.java +++ b/integrations/cdi/jedis-cdi/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 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. @@ -21,6 +21,7 @@ */ @SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" }) module io.helidon.integrations.jedis.cdi { + requires transitive jakarta.annotation; requires transitive java.desktop; // For java.beans requires transitive jakarta.cdi; requires jakarta.inject; diff --git a/integrations/cdi/jpa-cdi/src/main/java/module-info.java b/integrations/cdi/jpa-cdi/src/main/java/module-info.java index d4facab409d..ea11b63a913 100644 --- a/integrations/cdi/jpa-cdi/src/main/java/module-info.java +++ b/integrations/cdi/jpa-cdi/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. @@ -43,7 +43,6 @@ requires jakarta.xml.bind; requires jakarta.inject; // automatic module - requires jakarta.interceptor.api; // automatic module requires io.helidon.integrations.cdi.delegates; requires io.helidon.integrations.cdi.referencecountedcontext; diff --git a/integrations/cdi/jta-cdi/src/main/java/module-info.java b/integrations/cdi/jta-cdi/src/main/java/module-info.java index 6b586b96502..0a377ac723a 100644 --- a/integrations/cdi/jta-cdi/src/main/java/module-info.java +++ b/integrations/cdi/jta-cdi/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. @@ -39,7 +39,6 @@ requires jakarta.annotation; requires java.sql; requires java.rmi; - requires jakarta.interceptor.api; requires jakarta.inject; requires jakarta.cdi; requires narayana.jta.jakarta; diff --git a/integrations/graal/mp-native-image-extension/src/main/java/io/helidon/integrations/graal/mp/nativeimage/extension/ProxyBean.java b/integrations/graal/mp-native-image-extension/src/main/java/io/helidon/integrations/graal/mp/nativeimage/extension/ProxyBean.java index cfc9b7e835b..7f34633cdab 100644 --- a/integrations/graal/mp-native-image-extension/src/main/java/io/helidon/integrations/graal/mp/nativeimage/extension/ProxyBean.java +++ b/integrations/graal/mp-native-image-extension/src/main/java/io/helidon/integrations/graal/mp/nativeimage/extension/ProxyBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022 Oracle and/or its affiliates. + * Copyright (c) 2021, 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. @@ -53,11 +53,6 @@ public Set getInjectionPoints() { return Collections.emptySet(); } - @Override - public boolean isNullable() { - return false; - } - @Override public Object create(CreationalContext creationalContext) { throw new IllegalStateException("This bean should not be created"); diff --git a/integrations/micrometer/cdi/src/main/java/module-info.java b/integrations/micrometer/cdi/src/main/java/module-info.java index 86598d7c116..c7e4a795590 100644 --- a/integrations/micrometer/cdi/src/main/java/module-info.java +++ b/integrations/micrometer/cdi/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022 Oracle and/or its affiliates. + * Copyright (c) 2021, 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. @@ -37,7 +37,6 @@ requires static jakarta.activation; requires static jakarta.cdi; requires static jakarta.inject; - requires static jakarta.interceptor.api; requires io.helidon.common.http; requires io.helidon.reactive.servicecommon; diff --git a/integrations/micronaut/cdi/src/main/java/module-info.java b/integrations/micronaut/cdi/src/main/java/module-info.java index 2c366944fdd..037eb690345 100644 --- a/integrations/micronaut/cdi/src/main/java/module-info.java +++ b/integrations/micronaut/cdi/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 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. @@ -27,7 +27,6 @@ requires jakarta.cdi; requires jakarta.inject; - requires jakarta.interceptor.api; requires microprofile.config.api; diff --git a/integrations/micronaut/data/src/main/java/module-info.java b/integrations/micronaut/data/src/main/java/module-info.java index fb512b2ac8c..04b15efff4f 100644 --- a/integrations/micronaut/data/src/main/java/module-info.java +++ b/integrations/micronaut/data/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. @@ -34,7 +34,6 @@ requires java.sql; requires jakarta.cdi; - requires jakarta.interceptor.api; requires io.micronaut.inject; diff --git a/integrations/microstream/cdi/src/main/java/module-info.java b/integrations/microstream/cdi/src/main/java/module-info.java index 882712fccac..ea6007a0933 100644 --- a/integrations/microstream/cdi/src/main/java/module-info.java +++ b/integrations/microstream/cdi/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022 Oracle and/or its affiliates. + * Copyright (c) 2021, 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. @@ -41,7 +41,6 @@ requires io.helidon.integrations.microstream.cache; requires transitive jakarta.cdi; requires transitive jakarta.inject; - requires jakarta.interceptor.api; requires jakarta.annotation; requires microstream.base; requires microstream.cache; diff --git a/integrations/neo4j/metrics/src/main/java/module-info.java b/integrations/neo4j/metrics/src/main/java/module-info.java index 1a48023557b..11956dae2e5 100644 --- a/integrations/neo4j/metrics/src/main/java/module-info.java +++ b/integrations/neo4j/metrics/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022 Oracle and/or its affiliates. + * Copyright (c) 2021, 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. @@ -40,7 +40,6 @@ requires static jakarta.cdi; requires static jakarta.inject; - requires static jakarta.interceptor.api; requires static jakarta.annotation; exports 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 index dbfc30a000f..e67f704c923 100644 --- a/integrations/neo4j/neo4j/src/main/java/module-info.java +++ b/integrations/neo4j/neo4j/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022 Oracle and/or its affiliates. + * Copyright (c) 2021, 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. @@ -34,7 +34,6 @@ requires static jakarta.cdi; requires static jakarta.inject; - requires static jakarta.interceptor.api; requires static io.helidon.config; requires static io.helidon.config.mp; diff --git a/integrations/oci/sdk/cdi/src/main/java/module-info.java b/integrations/oci/sdk/cdi/src/main/java/module-info.java index afd61b15651..a46f8424527 100644 --- a/integrations/oci/sdk/cdi/src/main/java/module-info.java +++ b/integrations/oci/sdk/cdi/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. @@ -29,7 +29,6 @@ requires java.logging; requires transitive jakarta.cdi; requires jakarta.inject; - requires jakarta.interceptor.api; requires microprofile.config.api; requires oci.java.sdk.shaded.full; diff --git a/integrations/vault/cdi/src/main/java/io/helidon/integrations/vault/cdi/QualifiedBean.java b/integrations/vault/cdi/src/main/java/io/helidon/integrations/vault/cdi/QualifiedBean.java index aa5e2668f24..9f401f72b36 100644 --- a/integrations/vault/cdi/src/main/java/io/helidon/integrations/vault/cdi/QualifiedBean.java +++ b/integrations/vault/cdi/src/main/java/io/helidon/integrations/vault/cdi/QualifiedBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 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. @@ -65,11 +65,6 @@ public Set getInjectionPoints() { return Set.of(); } - @Override - public boolean isNullable() { - return false; - } - @Override public T create(CreationalContext creationalContext) { return creator.get(); diff --git a/microprofile/access-log/src/main/java/module-info.java b/microprofile/access-log/src/main/java/module-info.java index 6d224968632..a3727e11eed 100644 --- a/microprofile/access-log/src/main/java/module-info.java +++ b/microprofile/access-log/src/main/java/module-info.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. @@ -32,7 +32,6 @@ requires io.helidon.microprofile.server; requires io.helidon.nima.webserver.accesslog; - requires jakarta.interceptor.api; exports io.helidon.microprofile.accesslog; diff --git a/microprofile/cdi/pom.xml b/microprofile/cdi/pom.xml index 735a5beb1a7..21e54e5fc37 100644 --- a/microprofile/cdi/pom.xml +++ b/microprofile/cdi/pom.xml @@ -1,6 +1,6 @@