diff --git a/common/pom.xml b/common/pom.xml index a965ab4ae09..8787e8d26a7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -68,13 +68,13 @@ io.dropwizard dropwizard-jersey - 2.1.6 + ${dropwizard.version} compile commons-codec commons-codec - 1.15 + 1.16.0 diff --git a/openmetadata-service/pom.xml b/openmetadata-service/pom.xml index 87cd67d184b..2f27ebfd0b7 100644 --- a/openmetadata-service/pom.xml +++ b/openmetadata-service/pom.xml @@ -15,8 +15,8 @@ ${project.basedir}/target/surefire-reports ${project.basedir}/target/site/jacoco-aggregate/jacoco.xml ${project.basedir}/src/test/java - 1.18.0 - 2.20.56 + 1.18.3 + 2.20.98 0.5.10 2.9.0 2.3.2 diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java index 56838b6febb..b531fd60d22 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java @@ -131,7 +131,6 @@ import org.openmetadata.service.Entity; import org.openmetadata.service.exception.CatalogExceptionMessage; import org.openmetadata.service.resources.EntityResourceTest; import org.openmetadata.service.resources.databases.TableResource.TableList; -import org.openmetadata.service.resources.dqtests.TestCaseResourceTest; import org.openmetadata.service.resources.dqtests.TestSuiteResourceTest; import org.openmetadata.service.resources.glossary.GlossaryResourceTest; import org.openmetadata.service.resources.glossary.GlossaryTermResourceTest; @@ -1775,7 +1774,6 @@ public class TableResourceTest extends EntityResourceTest { @Test void get_tablesWithTestCases(TestInfo test) throws IOException { - TestCaseResourceTest testCaseResourceTest = new TestCaseResourceTest(); TestSuiteResourceTest testSuiteResourceTest = new TestSuiteResourceTest(); DatabaseSchemaResourceTest schemaResourceTest = new DatabaseSchemaResourceTest(); DatabaseResourceTest databaseTest = new DatabaseResourceTest(); diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java index a540559efa2..ab31e1bf5c8 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java @@ -679,7 +679,7 @@ public class TeamResourceTest extends EntityResourceTest { // Add policies to the team String json = JsonUtils.pojoToJson(team); - String email = String.format("%s@openmetadata.org", team.getName()); + String email = "team.!#$%&’*+/=?^_`{|}~-@openmetadata.org"; // Using all the allowed characters in email username team.withEmail(email); ChangeDescription change = getChangeDescription(team.getVersion()); fieldAdded(change, "email", email); diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java index 7deb5340b57..2368f65dca9 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java @@ -186,15 +186,14 @@ public class UserResourceTest extends EntityResourceTest { // Create user with mandatory email field empty create.withEmail(""); - assertResponseContains( - () -> createEntity(create, ADMIN_AUTH_HEADERS), BAD_REQUEST, "email must match \"^\\S+@\\S+\\.\\S+$\""); + String emailMatchError = "email must match \"^[\\S.!#$%&’*+/=?^_`{|}~-]+@\\S+\\.\\S+$\""; + assertResponseContains(() -> createEntity(create, ADMIN_AUTH_HEADERS), BAD_REQUEST, emailMatchError); assertResponseContains( () -> createEntity(create, ADMIN_AUTH_HEADERS), BAD_REQUEST, "email size must be between 6 and 127"); // Create user with mandatory email field with invalid email address create.withEmail("invalidEmail"); - assertResponseContains( - () -> createEntity(create, ADMIN_AUTH_HEADERS), BAD_REQUEST, "[email must match \"^\\S+@\\S+\\.\\S+$\"]"); + assertResponseContains(() -> createEntity(create, ADMIN_AUTH_HEADERS), BAD_REQUEST, emailMatchError); } @Test diff --git a/openmetadata-spec/src/main/resources/json/schema/type/basic.json b/openmetadata-spec/src/main/resources/json/schema/type/basic.json index 6c413bf13bd..9d0e071b88d 100644 --- a/openmetadata-spec/src/main/resources/json/schema/type/basic.json +++ b/openmetadata-spec/src/main/resources/json/schema/type/basic.json @@ -29,7 +29,7 @@ "description": "Email address of a user or other entities.", "type": "string", "format": "email", - "pattern": "^\\S+@\\S+\\.\\S+$", + "pattern": "^[\\S.!#$%&’*+/=?^_`{|}~-]+@\\S+\\.\\S+$", "minLength": 6, "maxLength": 127 }, diff --git a/pom.xml b/pom.xml index 4ff7bcd1275..441cb1d8d32 100644 --- a/pom.xml +++ b/pom.xml @@ -76,11 +76,10 @@ 5.2.0 1.7.36 - 2.15.0 - 2.14.2 + 2.15.2 2.1.6 1.0 - 2.39.1 + 2.40 2.1.1 3.1.0 @@ -95,16 +94,16 @@ 0.8.8 3.37.1 1.5.0 - 2.11.0 - 9.16.3 - 2.1.0.13 + 2.13.0 + 9.20.0 + 2.1.0.17 2.10.1 - 8.0.32 + 8.0.33 42.6.0 - 1.1.2 + 1.2.1 2.6 - 1.18.26 - 10.1.7 + 1.18.28 + 10.1.10 1.7.0 - 5.3.27 + 5.3.28 2.20.0 - 5.9.2 + 5.9.3 1.7.3 1.5.0 - - - 4.12.0 + 4.13.0 open-metadata_OpenMetadata @@ -138,7 +135,7 @@ 7.6.1 2.0.9 - 1.0.79 + 1.0.85 4.4.0 0.22.0 0.9.1 @@ -146,10 +143,10 @@ 2.3.32 1.6.3 0.10.2 - 8.0.1 + 8.1.2 1.8.0 2.5.3 - 6.0.8 + 6.0.9 1.5.1 2.0 5.4.0 @@ -187,7 +184,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} io.dropwizard @@ -497,7 +494,7 @@ org.apache.johnzon johnzon-core - 1.2.19 + 1.2.21 com.fasterxml.jackson.datatype @@ -515,7 +512,7 @@ org.eclipse.jetty jetty-io - 9.4.50.v20221201 + 9.4.51.v20230217 @@ -529,7 +526,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-cbor - 2.14.2 + ${jackson.version}