You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2020/06/17 09:35:07 UTC
[myfaces] branch 3.0.x updated: jakarta
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/3.0.x by this push:
new a1d8b33 jakarta
a1d8b33 is described below
commit a1d8b339c2073b861a5b497a4443b35375ae719a
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Wed Jun 17 11:34:56 2020 +0200
jakarta
---
api/pom.xml | 6 +++---
.../faces/component/_ExternalSpecifications.java | 2 +-
.../jakarta/faces/component/_ValidationUtils.java | 4 ++--
.../java/jakarta/faces/validator/BeanValidator.java | 20 ++++++++++----------
.../faces/validator/_ExternalSpecifications.java | 2 +-
.../jakarta/faces/validator/_ValidationUtils.java | 4 ++--
bundle/pom.xml | 14 +++++++-------
impl/pom.xml | 18 ++++++++++--------
.../component/validate/WholeBeanValidator.java | 18 +++++++++---------
.../annotation/AllAnnotationLifecycleProvider.java | 5 ++---
.../spi/impl/AllAnnotationInjectionProvider.java | 4 ++--
.../apache/myfaces/util/ExternalSpecifications.java | 2 +-
.../org/apache/myfaces/util/_ValidationUtils.java | 4 ++--
.../tag/jsf/ComponentTagHandlerDelegate.java | 4 ++--
.../facelets/tag/jsf/core/ValidateBeanTestCase.java | 10 +++++-----
.../tag/jsf/core/validation/CustomerBean.java | 4 ++--
parent/pom.xml | 14 +++++++-------
17 files changed, 68 insertions(+), 67 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 866e5ff..3e7d4bd 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -410,7 +410,7 @@
</Export-Package>
<Import-Package>
jakarta.el;version="[1.0.0, 3.1.0)",
- javax.validation*;version="[1.0.0, 2.0.0)",
+ jakarta.validation*;version="[1.0.0, 2.0.0)",
jakarta.servlet;version="[3, 5)",
jakarta.servlet.http;version="[3, 5)",
jakarta.servlet.jsp;version="[2.1.0, 3.1)",
@@ -627,8 +627,8 @@
<!-- bean-validation 1.0 -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<optional>true</optional> <!-- optional does not completely work in dependencyManagement (MNG-1630) -->
</dependency>
diff --git a/api/src/main/java/jakarta/faces/component/_ExternalSpecifications.java b/api/src/main/java/jakarta/faces/component/_ExternalSpecifications.java
index df71284..19e330a 100644
--- a/api/src/main/java/jakarta/faces/component/_ExternalSpecifications.java
+++ b/api/src/main/java/jakarta/faces/component/_ExternalSpecifications.java
@@ -45,7 +45,7 @@ final class _ExternalSpecifications
{
try
{
- beanValidationAvailable = (Class.forName("javax.validation.Validation") != null);
+ beanValidationAvailable = (Class.forName("jakarta.validation.Validation") != null);
}
catch (ClassNotFoundException e)
{
diff --git a/api/src/main/java/jakarta/faces/component/_ValidationUtils.java b/api/src/main/java/jakarta/faces/component/_ValidationUtils.java
index 1a00263..d9fb86d 100644
--- a/api/src/main/java/jakarta/faces/component/_ValidationUtils.java
+++ b/api/src/main/java/jakarta/faces/component/_ValidationUtils.java
@@ -18,10 +18,10 @@
*/
package jakarta.faces.component;
-import javax.validation.Validation;
+import jakarta.validation.Validation;
/**
- * Utility class that isolates javax.validation, to prevent ClassNotFoundException
+ * Utility class that isolates jakarta.validation, to prevent ClassNotFoundException
*
* @since 2.0
*/
diff --git a/api/src/main/java/jakarta/faces/validator/BeanValidator.java b/api/src/main/java/jakarta/faces/validator/BeanValidator.java
index 0eec32d..ae6dde1 100644
--- a/api/src/main/java/jakarta/faces/validator/BeanValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/BeanValidator.java
@@ -42,12 +42,12 @@ import jakarta.faces.component.PartialStateHolder;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.CompositeComponentExpressionHolder;
-import javax.validation.ConstraintViolation;
-import javax.validation.MessageInterpolator;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.groups.Default;
-import javax.validation.metadata.BeanDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.groups.Default;
+import jakarta.validation.metadata.BeanDescriptor;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
@@ -122,7 +122,7 @@ public class BeanValidator implements Validator, PartialStateHolder
private static final Class<?>[] DEFAULT_VALIDATION_GROUPS_ARRAY = new Class<?>[] { Default.class };
- private static final String DEFAULT_VALIDATION_GROUP_NAME = "javax.validation.groups.Default";
+ private static final String DEFAULT_VALIDATION_GROUP_NAME = "jakarta.validation.groups.Default";
private static final String CANDIDATE_COMPONENT_VALUES_MAP = "oam.WBV.candidatesMap";
@@ -189,7 +189,7 @@ public class BeanValidator implements Validator, PartialStateHolder
// Initialize Bean Validation.
ValidatorFactory validatorFactory = createValidatorFactory(context);
- javax.validation.Validator validator = createValidator(validatorFactory, context);
+ jakarta.validation.Validator validator = createValidator(validatorFactory, context);
BeanDescriptor beanDescriptor = validator.getConstraintsForClass(valueBaseClass);
if (!beanDescriptor.isBeanConstrained())
{
@@ -282,7 +282,7 @@ public class BeanValidator implements Validator, PartialStateHolder
return Boolean.TRUE.equals(value);
}
- private javax.validation.Validator createValidator(final ValidatorFactory validatorFactory, FacesContext context)
+ private jakarta.validation.Validator createValidator(final ValidatorFactory validatorFactory, FacesContext context)
{
// Set default validation group when setValidationGroups has not been called.
// The null check is there to prevent it from happening twice.
@@ -464,7 +464,7 @@ public class BeanValidator implements Validator, PartialStateHolder
else
{
// When the value is being validated, postSetValidationGroups() sets
- // validationGroups to javax.validation.groups.Default.
+ // validationGroups to jakarta.validation.groups.Default.
this.validationGroups = null;
}
// Only the String is saved, recalculate the Class[] on state restoration.
diff --git a/api/src/main/java/jakarta/faces/validator/_ExternalSpecifications.java b/api/src/main/java/jakarta/faces/validator/_ExternalSpecifications.java
index 1ec05c6..497dee0 100644
--- a/api/src/main/java/jakarta/faces/validator/_ExternalSpecifications.java
+++ b/api/src/main/java/jakarta/faces/validator/_ExternalSpecifications.java
@@ -45,7 +45,7 @@ final class _ExternalSpecifications
{
try
{
- beanValidationAvailable = (Class.forName("javax.validation.Validation") != null);
+ beanValidationAvailable = (Class.forName("jakarta.validation.Validation") != null);
}
catch(ClassNotFoundException e)
{
diff --git a/api/src/main/java/jakarta/faces/validator/_ValidationUtils.java b/api/src/main/java/jakarta/faces/validator/_ValidationUtils.java
index 641e58c..7727b2b 100644
--- a/api/src/main/java/jakarta/faces/validator/_ValidationUtils.java
+++ b/api/src/main/java/jakarta/faces/validator/_ValidationUtils.java
@@ -18,10 +18,10 @@
*/
package jakarta.faces.validator;
-import javax.validation.Validation;
+import jakarta.validation.Validation;
/**
- * Utility class that isolates javax.validation, to prevent ClassNotFoundException
+ * Utility class that isolates jakarta.validation, to prevent ClassNotFoundException
*
* @since 2.0
*/
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 3a06701..7beda08 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -83,18 +83,18 @@
jakarta.annotation,
javax.crypto,
javax.crypto.spec,
- javax.ejb;resolution:=optional,
- javax.el;version="[1.0.0, 3.0.0)",
+ jakarta.ejb;resolution:=optional,
+ jakarta.el;version="[1.0.0, 3.0.0)",
javax.naming,
- javax.persistence;version="[1.0.0, 3.0)";resolution:=optional,
- javax.portlet;version="[1.0.0, 2.1)";resolution:=optional,
+ jakarta.persistence;version="[1.0.0, 3.0)";resolution:=optional,
+ jakarta.portlet;version="[1.0.0, 2.1)";resolution:=optional,
jakarta.servlet;version="[3, 5)",
jakarta.servlet.http;version="[3, 5)",
jakarta.servlet.jsp;version="[2.1.0, 3.1)",
jakarta.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
jakarta.servlet.jsp.tagext;version="[2.1.0, 3.1)",
jakarta.servlet.annotation;version="[3, 5)";resolution:=optional,
- javax.validation.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ jakarta.validation.*;version="[1.0.0, 2.0.0)";resolution:=optional,
javax.xml.parsers,
org.apache;resolution:=optional,
org.apache.commons.beanutils;version="[1.8.3, 2.0.0)",
@@ -116,7 +116,7 @@
</plugins>
</build>
-
+
<dependencies>
<!-- include myfaces-api and myfaces-impl in the bundle -->
<dependency>
@@ -130,5 +130,5 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+
</project>
diff --git a/impl/pom.xml b/impl/pom.xml
index 3b1f456..6722b8a 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -733,11 +733,11 @@
jakarta.annotation,
javax.crypto,
javax.crypto.spec,
- javax.ejb;resolution:=optional,
+ jakarta.ejb;resolution:=optional,
jakarta.el;version="[1.0.0, 3.1.0)",
javax.naming,
jakarta.persistence;version="[1.0.0, 2.1)";resolution:=optional,
- javax.portlet;version="[1.0.0, 2.1)";resolution:=optional,
+ jakarta.portlet;version="[1.0.0, 2.1)";resolution:=optional,
jakarta.servlet;version="[3, 5)",
jakarta.servlet.http;version="[3, 5)",
jakarta.servlet.jsp;version="[2.2.0, 3.1)",
@@ -1146,8 +1146,8 @@
<!-- bean-validation 1.0 -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<optional>true</optional> <!-- optional does not completely work in dependencyManagement (MNG-1630) -->
</dependency>
@@ -1160,8 +1160,9 @@
<!-- jpa 3.0 - needed in AllAnnotationLifecycleProvider -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.0.0-RC2</version>
<optional>true</optional> <!-- optional does not completely work in dependencyManagement (MNG-1630) -->
</dependency>
@@ -1364,9 +1365,10 @@
<dependency>
<groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr303</artifactId>
- <version>0.5</version>
+ <artifactId>bval-jsr</artifactId>
+ <version>2.0.4-SNAPSHOT</version>
<scope>test</scope>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
diff --git a/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java b/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
index 8f984d4..840faa0 100644
--- a/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
+++ b/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
@@ -54,12 +54,12 @@ import static jakarta.faces.validator.BeanValidator.VALIDATION_GROUPS_DELIMITER;
import static jakarta.faces.validator.BeanValidator.VALIDATOR_FACTORY_KEY;
import jakarta.faces.validator.Validator;
import jakarta.faces.validator.ValidatorException;
-import javax.validation.ConstraintViolation;
-import javax.validation.MessageInterpolator;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.groups.Default;
-import javax.validation.metadata.BeanDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.groups.Default;
+import jakarta.validation.metadata.BeanDescriptor;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
import org.apache.myfaces.shared.util.MessageUtils;
import org.apache.myfaces.shared.util.MyFacesObjectInputStream;
@@ -74,7 +74,7 @@ public class WholeBeanValidator implements Validator
private static final Class<?>[] DEFAULT_VALIDATION_GROUPS_ARRAY = new Class<?>[] { Default.class };
- private static final String DEFAULT_VALIDATION_GROUP_NAME = "javax.validation.groups.Default";
+ private static final String DEFAULT_VALIDATION_GROUP_NAME = "jakarta.validation.groups.Default";
private static final String CANDIDATE_COMPONENT_VALUES_MAP = "oam.WBV.candidatesMap";
@@ -112,7 +112,7 @@ public class WholeBeanValidator implements Validator
// Initialize Bean Validation.
ValidatorFactory validatorFactory = createValidatorFactory(context);
- javax.validation.Validator validator = createValidator(validatorFactory, context,
+ jakarta.validation.Validator validator = createValidator(validatorFactory, context,
(ValidateWholeBeanComponent)component);
BeanDescriptor beanDescriptor = validator.getConstraintsForClass(valueBaseClass);
if (!beanDescriptor.isBeanConstrained())
@@ -247,7 +247,7 @@ public class WholeBeanValidator implements Validator
return copy;
}
- private javax.validation.Validator createValidator(final ValidatorFactory validatorFactory,
+ private jakarta.validation.Validator createValidator(final ValidatorFactory validatorFactory,
FacesContext context, ValidateWholeBeanComponent component)
{
// Set default validation group when setValidationGroups has not been called.
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java
index 7e95e72..6e10595 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java
@@ -22,9 +22,8 @@ import javax.naming.NamingException;
import javax.naming.Context;
import jakarta.annotation.Resource;
import javax.ejb.EJB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceUnit;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java b/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java
index a25d784..82de1c6 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java
@@ -22,8 +22,8 @@ import javax.naming.NamingException;
import javax.naming.Context;
import jakarta.annotation.Resource;
import javax.ejb.EJB;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceUnit;
import java.lang.reflect.Method;
diff --git a/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java b/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java
index 54ffbfd..a0679dc 100644
--- a/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java
+++ b/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java
@@ -48,7 +48,7 @@ public final class ExternalSpecifications
{
try
{
- available = ClassUtils.classForName("javax.validation.Validation") != null;
+ available = ClassUtils.classForName("jakarta.validation.Validation") != null;
}
catch(ClassNotFoundException e)
{
diff --git a/impl/src/main/java/org/apache/myfaces/util/_ValidationUtils.java b/impl/src/main/java/org/apache/myfaces/util/_ValidationUtils.java
index ebc2fcf..f60acb0 100644
--- a/impl/src/main/java/org/apache/myfaces/util/_ValidationUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/_ValidationUtils.java
@@ -18,10 +18,10 @@
*/
package org.apache.myfaces.util;
-import javax.validation.Validation;
+import jakarta.validation.Validation;
/**
- * Utility class that isolates javax.validation, to prevent ClassNotFoundException
+ * Utility class that isolates jakarta.validation, to prevent ClassNotFoundException
*
* @since 2.0
* @author Leonardo Uribe (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
index 9598a64..f4b4863 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
@@ -775,7 +775,7 @@ public class ComponentTagHandlerDelegate extends TagHandlerDelegate
//{
// no validationGroups on the stack
// --> set the default validationGroup
- validationGroups = javax.validation.groups.Default.class.getName();
+ validationGroups = jakarta.validation.groups.Default.class.getName();
//}
beanValidator.setValidationGroups(validationGroups);
}
@@ -900,7 +900,7 @@ public class ComponentTagHandlerDelegate extends TagHandlerDelegate
//{
// no validationGroups on the stack
// --> set the default validationGroup
- validationGroups = javax.validation.groups.Default.class.getName();
+ validationGroups = jakarta.validation.groups.Default.class.getName();
//}
beanValidator.setValidationGroups(validationGroups);
}
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValidateBeanTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValidateBeanTestCase.java
index dcf2ad3..497db44 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValidateBeanTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValidateBeanTestCase.java
@@ -366,7 +366,7 @@ public class ValidateBeanTestCase extends FaceletTestCase
UIInput input = (UIInput) root.findComponent("form:input");
// the validationGroups have to match the Default ones
- Assert.assertEquals(javax.validation.groups.Default.class.getName(),
+ Assert.assertEquals(jakarta.validation.groups.Default.class.getName(),
_getValidationGroups(input));
}
@@ -406,7 +406,7 @@ public class ValidateBeanTestCase extends FaceletTestCase
Assert.assertEquals(validationGroups, _getValidationGroups(nestedinput));
Assert.assertEquals(validationGroups, _getValidationGroups(doublenestedinput));
Assert.assertEquals(validationGroups, _getValidationGroups(nestedinput2));
- Assert.assertEquals(javax.validation.groups.Default.class.getName(),
+ Assert.assertEquals(jakarta.validation.groups.Default.class.getName(),
_getValidationGroups(nonnestedinput));
}
@@ -449,7 +449,7 @@ public class ValidateBeanTestCase extends FaceletTestCase
// validator and the non-nested component must get the Default validationGroups.
Assert.assertEquals(wrappingValidationGroups, _getValidationGroups(nestedinput));
Assert.assertEquals(componentValidationGroups, _getValidationGroups(nestedinputWithValidator));
- Assert.assertEquals(javax.validation.groups.Default.class.getName(),
+ Assert.assertEquals(jakarta.validation.groups.Default.class.getName(),
_getValidationGroups(nonnestedinput));
}
@@ -489,7 +489,7 @@ public class ValidateBeanTestCase extends FaceletTestCase
// and the non-nested component must get the Default validationGroups.
Assert.assertEquals(validationGroupsOuter, _getValidationGroups(nestedinput));
Assert.assertEquals(validationGroupsInner, _getValidationGroups(doublenestedinput));
- Assert.assertEquals(javax.validation.groups.Default.class.getName(),
+ Assert.assertEquals(jakarta.validation.groups.Default.class.getName(),
_getValidationGroups(nonnestedinput));
}
@@ -555,7 +555,7 @@ public class ValidateBeanTestCase extends FaceletTestCase
Assert.assertEquals(validationGroupsOuter, _getValidationGroups(nestedinput));
Assert.assertFalse(_hasValidator(doublenestedinput, BeanValidator.class));
Assert.assertEquals(validationGroupsInner, _getValidationGroups(nesteouterdisabledinput));
- Assert.assertEquals(javax.validation.groups.Default.class.getName(),
+ Assert.assertEquals(jakarta.validation.groups.Default.class.getName(),
_getValidationGroups(nonnestedinput));
}
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/validation/CustomerBean.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/validation/CustomerBean.java
index 1936310..30a2809 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/validation/CustomerBean.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/jsf/core/validation/CustomerBean.java
@@ -20,8 +20,8 @@
package org.apache.myfaces.view.facelets.tag.jsf.core.validation;
import jakarta.enterprise.context.RequestScoped;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
/**
*
diff --git a/parent/pom.xml b/parent/pom.xml
index fd02829..da39207 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -472,21 +472,21 @@
<classifier>jakarta</classifier>
</dependency>
- <!-- bean-validation 1.0 (javax.validation.*) -->
+ <!-- bean-validation 1.0 (jakarta.validation.*) -->
<!-- NOTE that this must be compile + optional -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- <version>1.1</version>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>3.0.0-M1</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<!-- jpa 3.0 - needed in AllAnnotationLifecycleProvider -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.1.1</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.0.0-RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>