Upgrade dependencies for 1.2.0 release (#12280)

This commit is contained in:
Suresh Srinivas 2023-07-04 20:03:40 -07:00 committed by GitHub
parent a313dc19f3
commit 4f2831f3bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 29 additions and 35 deletions

View File

@ -68,13 +68,13 @@
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-jersey</artifactId>
<version>2.1.6</version>
<version>${dropwizard.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
<version>1.16.0</version>
</dependency>
</dependencies>

View File

@ -15,8 +15,8 @@
<sonar.junit.reportPaths>${project.basedir}/target/surefire-reports</sonar.junit.reportPaths>
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<sonar.tests>${project.basedir}/src/test/java</sonar.tests>
<org.testcontainers.version>1.18.0</org.testcontainers.version>
<awssdk.version>2.20.56</awssdk.version>
<org.testcontainers.version>1.18.3</org.testcontainers.version>
<awssdk.version>2.20.98</awssdk.version>
<expiring.map.version>0.5.10</expiring.map.version>
<java.saml>2.9.0</java.saml>
<quartz.version>2.3.2</quartz.version>

View File

@ -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<Table, CreateTable> {
@Test
void get_tablesWithTestCases(TestInfo test) throws IOException {
TestCaseResourceTest testCaseResourceTest = new TestCaseResourceTest();
TestSuiteResourceTest testSuiteResourceTest = new TestSuiteResourceTest();
DatabaseSchemaResourceTest schemaResourceTest = new DatabaseSchemaResourceTest();
DatabaseResourceTest databaseTest = new DatabaseResourceTest();

View File

@ -679,7 +679,7 @@ public class TeamResourceTest extends EntityResourceTest<Team, CreateTeam> {
// 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);

View File

@ -186,15 +186,14 @@ public class UserResourceTest extends EntityResourceTest<User, CreateUser> {
// 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

View File

@ -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
},

43
pom.xml
View File

@ -76,11 +76,10 @@
<mockito.version>5.2.0</mockito.version>
<!-- Upgrading slf4j causes dropwizard issues -->
<slf4j.version>1.7.36</slf4j.version>
<jackson.version>2.15.0</jackson.version>
<jackson-databind.version>2.14.2</jackson-databind.version>
<jackson.version>2.15.2</jackson.version>
<dropwizard.version>2.1.6</dropwizard.version>
<diffMatch.version>1.0</diffMatch.version>
<jersey-bom.version>2.39.1</jersey-bom.version>
<jersey-bom.version>2.40</jersey-bom.version>
<javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
<!-- update from here -->
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
@ -95,16 +94,16 @@
<jacoco-plugin.version>0.8.8</jacoco-plugin.version>
<jdbi3.version>3.37.1</jdbi3.version>
<commons-cli.version>1.5.0</commons-cli.version>
<commons-io.version>2.11.0</commons-io.version>
<flyway.version>9.16.3</flyway.version>
<redshift-jdbc.version>2.1.0.13</redshift-jdbc.version>
<commons-io.version>2.13.0</commons-io.version>
<flyway.version>9.20.0</flyway.version>
<redshift-jdbc.version>2.1.0.17</redshift-jdbc.version>
<gson.version>2.10.1</gson.version>
<mysql.connector.version>8.0.32</mysql.connector.version>
<mysql.connector.version>8.0.33</mysql.connector.version>
<postgres.connector.version>42.6.0</postgres.connector.version>
<jsonschema2pojo.version>1.1.2</jsonschema2pojo.version>
<jsonschema2pojo.version>1.2.1</jsonschema2pojo.version>
<commons-lang.version>2.6</commons-lang.version>
<lombok.version>1.18.26</lombok.version>
<tomcat-jdbc.version>10.1.7</tomcat-jdbc.version>
<lombok.version>1.18.28</lombok.version>
<tomcat-jdbc.version>10.1.10</tomcat-jdbc.version>
<resilience4j.version>1.7.0</resilience4j.version>
<!-- We need ElasticSearch client to be compatible with both ElasticSearch and AWS OpenSearch
This compatibility broken in 7.14, so lets keep this version pinned to 7.13.x
@ -112,18 +111,16 @@
<elasticsearch.version>7.16.3</elasticsearch.version>
<opensearch.version>1.3.0</opensearch.version>
<httpasyncclient.version>4.1.5</httpasyncclient.version>
<openapiswagger.version>2.2.9</openapiswagger.version>
<openapiswagger.version>2.2.14</openapiswagger.version>
<spring-security-kerberos-core.version>1.0.1.RELEASE</spring-security-kerberos-core.version>
<httpclient.version>4.5.14</httpclient.version>
<!-- Upgrading to spring version 6.x requires Java 17 -->
<spring.version>5.3.27</spring.version>
<spring.version>5.3.28</spring.version>
<log4j.version>2.20.0</log4j.version>
<org.junit.jupiter.version>5.9.2</org.junit.jupiter.version>
<org.junit.jupiter.version>5.9.3</org.junit.jupiter.version>
<dropwizard-health.version>1.7.3</dropwizard-health.version>
<fernet.version>1.5.0</fernet.version>
<!-- 4.9.3 uses esnext instead of commonjs and it requires changes on how we run Jest tests -->
<!-- upgrade only when we find how to import esnext modules in nodejs -->
<antlr.version>4.12.0</antlr.version>
<antlr.version>4.13.0</antlr.version>
<!-- sonar -Dsonar.login=XXX -->
<sonar.projectKey>open-metadata_OpenMetadata</sonar.projectKey>
@ -138,7 +135,7 @@
<testng.version>7.6.1</testng.version>
<!-- Micrometer upgrade to 3.x requires Dropwizard > 3.x -->
<dropwizard-micrometer.version>2.0.9</dropwizard-micrometer.version>
<json-schema-validator.version>1.0.79</json-schema-validator.version>
<json-schema-validator.version>1.0.85</json-schema-validator.version>
<java-jwt.version>4.4.0</java-jwt.version>
<jwks-rsa.version>0.22.0</jwks-rsa.version>
<jjwt.version>0.9.1</jjwt.version>
@ -146,10 +143,10 @@
<freemarker.version>2.3.32</freemarker.version>
<passay.version>1.6.3</passay.version>
<bcrypt.version>0.10.2</bcrypt.version>
<simplejavamail.version>8.0.1</simplejavamail.version>
<simplejavamail.version>8.1.2</simplejavamail.version>
<dropwizardkafka.version>1.8.0</dropwizardkafka.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<unboundsdk.version>6.0.8</unboundsdk.version>
<unboundsdk.version>6.0.9</unboundsdk.version>
<dropwizard-web.version>1.5.1</dropwizard-web.version>
<snakeyaml.version>2.0</snakeyaml.version>
<woodstox.version>5.4.0</woodstox.version>
@ -187,7 +184,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
@ -497,7 +494,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
<version>1.2.19</version>
<version>1.2.21</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
@ -515,7 +512,7 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<!-- 9.x required for Dropwizard 2.1.x -->
<version>9.4.50.v20221201</version>
<version>9.4.51.v20230217</version>
</dependency>
<!-- avoid security issue https://security.snyk.io/vuln/SNYK-JAVA-ORGGLASSFISH-1297098 -->
@ -529,7 +526,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<version>2.14.2</version>
<version>${jackson.version}</version>
</dependency>
<!-- avoid security issue https://security.snyk.io/vuln/SNYK-JAVA-ORGYAML-2806360 -->