diff --git a/config/etcd/src/main/java/module-info.java b/config/etcd/src/main/java/module-info.java
index 4b6fd333573..e0924bcdab2 100644
--- a/config/etcd/src/main/java/module-info.java
+++ b/config/etcd/src/main/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022 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.
@@ -31,8 +31,6 @@
requires io.helidon.common;
requires io.helidon.common.media.type;
requires io.grpc;
- // TODO 3.0.0-JAKARTA
- // used only for compilation of generated classes
requires static java.annotation;
exports io.helidon.config.etcd;
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 097f670e762..db851984532 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -104,9 +104,9 @@
2.6.2
2.10
1.6.6
- 3.1.3
- 3.1.2
- 4.0.4
+ 3.4.3
+ 3.3.0
+ 4.4.0
3.0.1
4.0
2.0
diff --git a/integrations/micronaut/data/pom.xml b/integrations/micronaut/data/pom.xml
index e1b7cec3b86..b57c1f9d1bc 100644
--- a/integrations/micronaut/data/pom.xml
+++ b/integrations/micronaut/data/pom.xml
@@ -46,6 +46,7 @@
jakarta.validation
jakarta.validation-api
+ 2.0.2
test
@@ -67,13 +68,6 @@
io.micronaut.data
micronaut-data-model
test
-
-
-
- io.micronaut
- micronaut-validation
-
-
io.helidon.microprofile.cdi
@@ -155,12 +149,11 @@
micronaut-inject-java
${version.lib.micronaut}
-
-
-
-
-
-
+
+ io.micronaut
+ micronaut-validation
+ ${version.lib.micronaut}
+
io.micronaut.data
micronaut-data-processor
diff --git a/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java b/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java
index df945c94240..f18f9405c57 100644
--- a/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java
+++ b/integrations/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/MicronautDataCdiExtensionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2022 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,10 +27,12 @@
import io.helidon.microprofile.tests.junit5.Configuration;
import io.helidon.microprofile.tests.junit5.HelidonTest;
+import javax.validation.ConstraintViolationException;
+import javax.validation.constraints.Pattern;
+
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.transaction.Transactional;
-import jakarta.validation.ConstraintViolationException;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -80,7 +82,6 @@ void testTransaction() {
assertThat(myBean.getOwner("Hoppy"), is("Barney"));
}
- @Disabled("3.0.0-JAKARTA")
@Test
void testBeanValidation() {
assertThrows(ConstraintViolationException.class, () -> myBean.getOwner("wrong name"), "Name should not contain spaces");
@@ -108,9 +109,8 @@ public static class MyBean {
@Inject
CdiOnly cdiOnly;
- // TODO 3.0.0-JAKARTA - javax.validation used by Micronaut
@Transactional
- public String getOwner(/*@Pattern(regexp = "\\w+")*/ String pet) {
+ public String getOwner(@Pattern(regexp = "\\w+") String pet) {
assertThat(connection, notNullValue());
assertThat(cdiOnly.message(), is("Hello"));
return petRepository.findByName(pet)