yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-12-05 12:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #4720 Upgrade dependency version of OpenMetadata for 0.10.1 (#4721)

Browse Source
This commit is contained in:
Suresh Srinivas 2022-05-05 14:11:45 -07:00 committed by GitHub
parent 158b8df588
commit 9138b85913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 61 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
catalog-rest-service/pom.xml
View File

@ -169,11 +169,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.openmetadata</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
@ -237,10 +232,6 @@
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-client</artifactId>
@ -271,25 +262,25 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.16.3</version>
<version>1.17.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.16.3</version>
<version>1.17.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.16.3</version>
<version>1.17.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mysql</artifactId>
<version>1.16.3</version>
<version>1.17.1</version>
<scope>test</scope>
</dependency>
<!-- JSON-P: Java API for JSON Processing (JSR 374) -->

7
openmetadata-ui/pom.xml
View File

@ -14,6 +14,7 @@
<properties>
<dropwizard.swagger.version>2.0.12-1</dropwizard.swagger.version>
<testng.version>7.5</testng.version>
<!-- Don't upgrade from this version as tests don't work with later version-->
<selenium.version>4.1.1</selenium.version>
<skipTests>false</skipTests>
</properties>
@ -64,12 +65,6 @@
<version>${org.junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.artsok</groupId>
<artifactId>rerunner-jupiter</artifactId>
<version>2.1.6</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/io.rest-assured/rest-assured -->
<dependency>
<groupId>io.rest-assured</groupId>

6
openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/objectRepository/TableDetails.java
View File

@ -19,11 +19,11 @@ public class TableDetails {
By selectUser = By.xpath("//div[@data-testid=\"list-item\"]");
By saveManage = By.cssSelector("[data-testid='saveManageTab']");
By follow = By.cssSelector("button[data-testid='follow-button']");
By schema = By.xpath("[data-testid='Schema']");;
By lineage = By.cssSelector("[data-testid='Lineage']");;
By schema = By.xpath("[data-testid='Schema']");
By lineage = By.cssSelector("[data-testid='Lineage']");
By lineageComponents = By.cssSelector("[data-testid='node-label']");
By profiler = By.cssSelector("[data-testid='Profiler']");
By sampleData = By.cssSelector("[data-testid='Sample Data']");;
By sampleData = By.cssSelector("[data-testid='Sample Data']");
By selectTier1 = By.xpath("(//div[@data-testid='card-list'])[1]");
By tier1 = By.xpath("(/h4[@class='tw-text-base tw-mb-0']");
By addTagTextBox = By.xpath("//input[@data-testid='associatedTagName']");

2
openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/common/CommonTests.java
View File

@ -45,7 +45,7 @@ class CommonTests {
static WebDriver webDriver;
static Common common;
static Actions actions;
static Faker faker = new Faker();
static final Faker faker = new Faker();
static String tagCategoryDisplayName = faker.name().firstName();
static WebDriverWait wait;
static String url = Property.getInstance().getURL();

71
openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/common/PayLoad.java
View File

@ -6,48 +6,43 @@ import org.jetbrains.annotations.NotNull;
public class PayLoad {
public static String changeDescriptionServices() {
String payLoad =
"{\n"
+ " \"id\": \"b610c069-b0cc-43cf-9845-3236c8666eae\",\n"
+ " \"name\": \"bigquery_gcp\",\n"
+ " \"serviceType\": \"BigQuery\",\n"
+ " \"description\": \"test\",\n"
+ " \"version\": 0.2,\n"
+ " \"updatedAt\": 1640848954438,\n"
+ " \"updatedBy\": \"anonymous\",\n"
+ " \"href\": \"http://localhost:8585/api/v1/services/databaseServices/b610c069-b0cc-43cf-9845-3236c8666eae\",\n"
+ " \"jdbc\": {\n"
+ " \"driverClass\": \"jdbc\",\n"
+ " \"connectionUrl\": \"jdbc://9999\"\n"
+ " },\n"
+ " \"changeDescription\": {\n"
+ " \"fieldsAdded\": [],\n"
+ " \"fieldsUpdated\": [\n"
+ " {\n"
+ " \"name\": \"description\",\n"
+ " \"oldValue\": \"\",\n"
+ " \"newValue\": \"Kushal123\"\n"
+ " }\n"
+ " ],\n"
+ " \"fieldsDeleted\": [],\n"
+ " \"previousVersion\": 0.1\n"
+ " }\n"
+ "}";
return payLoad;
return "{\n"
+ " \"id\": \"b610c069-b0cc-43cf-9845-3236c8666eae\",\n"
+ " \"name\": \"bigquery_gcp\",\n"
+ " \"serviceType\": \"BigQuery\",\n"
+ " \"description\": \"test\",\n"
+ " \"version\": 0.2,\n"
+ " \"updatedAt\": 1640848954438,\n"
+ " \"updatedBy\": \"anonymous\",\n"
+ " \"href\": \"http://localhost:8585/api/v1/services/databaseServices/b610c069-b0cc-43cf-9845-3236c8666eae\",\n"
+ " \"jdbc\": {\n"
+ " \"driverClass\": \"jdbc\",\n"
+ " \"connectionUrl\": \"jdbc://9999\"\n"
+ " },\n"
+ " \"changeDescription\": {\n"
+ " \"fieldsAdded\": [],\n"
+ " \"fieldsUpdated\": [\n"
+ " {\n"
+ " \"name\": \"description\",\n"
+ " \"oldValue\": \"\",\n"
+ " \"newValue\": \"Kushal123\"\n"
+ " }\n"
+ " ],\n"
+ " \"fieldsDeleted\": [],\n"
+ " \"previousVersion\": 0.1\n"
+ " }\n"
+ "}";
}
@NotNull
@Contract(pure = true)
public static String changeDescriptionDatabase() {
String payload =
"[\n"
+ " {\n"
+ " \"op\": \"replace\",\n"
+ " \"path\": \"/description\",\n"
+ " \"value\": \"\"\n"
+ " }\n"
+ "]";
return payload;
return "[\n"
+ " {\n"
+ " \"op\": \"replace\",\n"
+ " \"path\": \"/description\",\n"
+ " \"value\": \"\"\n"
+ " }\n"
+ "]";
}
}

3
openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardService/DashboardServiceTestPage.java
View File

@ -14,7 +14,6 @@
package org.openmetadata.catalog.selenium.pages.dashboardService;
import com.github.javafaker.Faker;
import java.io.IOException;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
@ -142,7 +141,7 @@ class DashboardServiceTestPage {
@Test
@Order(4)
void checkConnectionConfigTab() throws InterruptedException, IOException {
void checkConnectionConfigTab() throws InterruptedException {
openDashboardServicePage();
Thread.sleep(2000);
Events.click(webDriver, common.containsText(serviceName));

8
openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/explore/Explore.java
View File

@ -190,7 +190,7 @@ class Explore {
@Test
@Order(6)
void checkBasics() throws Exception {
void checkBasics() {
webDriver.manage().timeouts().implicitlyWait(Duration.ofSeconds(10));
openExplorePage();
try {
@ -280,7 +280,7 @@ class Explore {
@Test
@Order(10)
void checkRandomDashboardCount() throws InterruptedException {
void checkRandomDashboardCount() {
webDriver.manage().timeouts().implicitlyWait(Duration.ofSeconds(10));
openExplorePage();
Events.click(webDriver, explorePage.dashboard());
@ -301,7 +301,7 @@ class Explore {
@Test
@Order(11)
void checkRandomPipelineCount() throws InterruptedException {
void checkRandomPipelineCount() {
webDriver.manage().timeouts().implicitlyWait(Duration.ofSeconds(10));
openExplorePage();
Events.click(webDriver, explorePage.pipeline());
@ -322,7 +322,7 @@ class Explore {
@Test
@Order(12)
void checkSearchBarInvalidValue() throws InterruptedException {
void checkSearchBarInvalidValue() {
webDriver.manage().timeouts().implicitlyWait(Duration.ofSeconds(10));
String searchCriteria = "asasds";
Events.click(webDriver, myDataPage.closeWhatsNew());

2
openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pages/tableDetails/TableDetailsPageTest.java
View File

@ -236,7 +236,7 @@ class TableDetailsPageTest {
@Test
@Order(8)
void checkManage() throws InterruptedException {
void checkManage() {
webDriver.manage().timeouts().implicitlyWait(Duration.ofSeconds(10));
openExplorePage();
Events.click(webDriver, common.selectTableLink(1));

8
openmetadata-ui/src/test/java/org/openmetadata/catalog/selenium/pagesWithoutData/myData/MyDataPageTest.java
View File

@ -77,7 +77,7 @@ class MyDataPageTest {
@Test
@Order(3)
void checkRecentViews() throws Exception {
void checkRecentViews() {
checkWhatsNew();
WebElement recentViews = webDriver.findElement(common.containsText("No recently viewed data."));
if (!recentViews.isDisplayed()) {
@ -87,7 +87,7 @@ class MyDataPageTest {
@Test
@Order(4)
void checkRecentSearch() throws Exception {
void checkRecentSearch() {
checkWhatsNew();
WebElement recentSearch = webDriver.findElement(common.containsText("No searched terms."));
if (!recentSearch.isDisplayed()) {
@ -97,7 +97,7 @@ class MyDataPageTest {
@Test
@Order(5)
void checkMyDataTab() throws Exception {
void checkMyDataTab() {
checkWhatsNew();
WebElement myDataResults = webDriver.findElement(common.containsText("You have not owned anything yet."));
if (!myDataResults.isDisplayed()) {
@ -107,7 +107,7 @@ class MyDataPageTest {
@Test
@Order(6)
void checkFollowingTab() throws Exception {
void checkFollowingTab() {
checkWhatsNew();
WebElement followResults = webDriver.findElement(common.containsText("You have not followed anything yet."));
if (!followResults.isDisplayed()) {

18
pom.xml
View File

@ -35,7 +35,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mockito.version>4.4.0</mockito.version>
<mockito.version>4.5.1</mockito.version>
<slf4j.version>1.7.36</slf4j.version>
<jackson.version>2.13.2</jackson.version>
<dropwizard.version>2.0.28</dropwizard.version>
@ -58,13 +58,13 @@
<commons-cli.version>1.5.0</commons-cli.version>
<commons-io.version>2.11.0</commons-io.version>
<flyway.version>8.1.0</flyway.version>
<redshift-jdbc.version>2.1.0.6</redshift-jdbc.version>
<redshift-jdbc.version>2.1.0.7</redshift-jdbc.version>
<gson.version>2.9.0</gson.version>
<mysql.connector.version>8.0.28</mysql.connector.version>
<postgres.connector.version>42.3.3</postgres.connector.version>
<mysql.connector.version>8.0.29</mysql.connector.version>
<postgres.connector.version>42.3.5</postgres.connector.version>
<jsonschema2pojo.version>1.1.1</jsonschema2pojo.version>
<commons-lang.version>2.6</commons-lang.version>
<lombok.version>1.18.22</lombok.version>
<lombok.version>1.18.24</lombok.version>
<tomcat-jdbc.version>10.0.8</tomcat-jdbc.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
@ -78,7 +78,7 @@
<spring.version>5.3.19</spring.version>
<log4j.version>2.17.0</log4j.version>
<org.junit.jupiter.version>5.8.2</org.junit.jupiter.version>
<dropwizard-health.version>1.7.1</dropwizard-health.version>
<dropwizard-health.version>1.7.2</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 -->
@ -128,7 +128,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<version>2.13.2.2</version>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
@ -415,7 +415,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
<version>1.2.16</version>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
@ -559,7 +559,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.1</version>
<version>10.2</version>
</dependency>
</dependencies>
</plugin>