diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 7146ce30730..6a68f395e83 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -58,16 +58,6 @@ jobs:
node-version:
- 16.x
steps:
- - name: Free Disk Space (Ubuntu)
- uses: jlumbroso/free-disk-space@main
- with:
- tool-cache: false
- android: true
- dotnet: true
- haskell: true
- large-packages: true
- swap-storage: true
- docker-images: false
- name: Wait for the labeler
uses: lewagon/wait-on-check-action@0179dfc359f90a703c41240506f998ee1603f9ea #v1.0.0
if: ${{ github.event_name == 'pull_request_target' }}
diff --git a/common/pom.xml b/common/pom.xml
index 09b9445e7d7..7531a6c2604 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -22,7 +22,7 @@
4.0.0
- 2.1.6-1
+ 2.1.4-1
common
diff --git a/openmetadata-service/pom.xml b/openmetadata-service/pom.xml
index 49647b658d9..77542d00877 100644
--- a/openmetadata-service/pom.xml
+++ b/openmetadata-service/pom.xml
@@ -11,7 +11,7 @@
openmetadata-service
- 2.1.6-1
+ 2.0.12-1
${project.basedir}/target/surefire-reports
${project.basedir}/target/site/jacoco-aggregate/jacoco.xml
${project.basedir}/src/test/java
@@ -480,17 +480,6 @@
woodstox-core
${woodstox.version}
-
- org.reflections
- reflections
- 0.10.2
-
-
- io.swagger
- swagger-annotations
- 1.6.11
- compile
-
@@ -647,7 +636,7 @@
classes
1
2C
- -Xmx1024m
+ -Xmx512m
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/ElasticSearchIndexDefinition.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/ElasticSearchIndexDefinition.java
index be0c9fb819f..2f007172631 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/ElasticSearchIndexDefinition.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/ElasticSearchIndexDefinition.java
@@ -72,20 +72,26 @@ public class ElasticSearchIndexDefinition {
}
public void createIndexes(ElasticSearchConfiguration esConfig) {
- for (ElasticSearchIndexType elasticSearchIndexType : ElasticSearchIndexType.values()) {
- searchClient.createIndex(elasticSearchIndexType, esConfig.getSearchIndexMappingLanguage().value());
+ if (searchClient != null) {
+ for (ElasticSearchIndexType elasticSearchIndexType : ElasticSearchIndexType.values()) {
+ searchClient.createIndex(elasticSearchIndexType, esConfig.getSearchIndexMappingLanguage().value());
+ }
}
}
public void updateIndexes(ElasticSearchConfiguration esConfig) {
- for (ElasticSearchIndexType elasticSearchIndexType : ElasticSearchIndexType.values()) {
- searchClient.updateIndex(elasticSearchIndexType, esConfig.getSearchIndexMappingLanguage().value());
+ if (searchClient != null) {
+ for (ElasticSearchIndexType elasticSearchIndexType : ElasticSearchIndexType.values()) {
+ searchClient.updateIndex(elasticSearchIndexType, esConfig.getSearchIndexMappingLanguage().value());
+ }
}
}
public void dropIndexes() {
- for (ElasticSearchIndexType elasticSearchIndexType : ElasticSearchIndexType.values()) {
- searchClient.deleteIndex(elasticSearchIndexType);
+ if (searchClient != null) {
+ for (ElasticSearchIndexType elasticSearchIndexType : ElasticSearchIndexType.values()) {
+ searchClient.deleteIndex(elasticSearchIndexType);
+ }
}
}
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/IndexUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/IndexUtil.java
index bde91a237cd..972282154c3 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/search/IndexUtil.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/IndexUtil.java
@@ -59,9 +59,12 @@ public class IndexUtil {
}
public static SearchClient getSearchClient(ElasticSearchConfiguration esConfig, CollectionDAO dao) {
- return esConfig.getSearchType().equals(SearchType.OPENSEARCH)
- ? new OpenSearchClientImpl(esConfig, dao)
- : new ElasticSearchClientImpl(esConfig, dao);
+ if (esConfig != null) {
+ return esConfig.getSearchType().equals(SearchType.OPENSEARCH)
+ ? new OpenSearchClientImpl(esConfig, dao)
+ : new ElasticSearchClientImpl(esConfig, dao);
+ }
+ return null;
}
/**
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/TablesInitializer.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/TablesInitializer.java
index 881108bc3f2..786619362a2 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/util/TablesInitializer.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/util/TablesInitializer.java
@@ -249,8 +249,7 @@ public final class TablesInitializer {
jdbi.installPlugin(new SqlObjectPlugin());
jdbi.getConfig(SqlObjects.class)
.setSqlLocator(new ConnectionAwareAnnotationSqlLocator(config.getDataSourceFactory().getDriverClass()));
- SearchClient searchClient;
- searchClient =
+ SearchClient searchClient =
IndexUtil.getSearchClient(config.getElasticSearchConfiguration(), jdbi.onDemand(CollectionDAO.class));
ElasticSearchIndexDefinition esIndexDefinition;
diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryResourceTest.java
index 5a4632c0466..7599bd67b35 100644
--- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryResourceTest.java
+++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/glossary/GlossaryResourceTest.java
@@ -116,7 +116,6 @@ public class GlossaryResourceTest extends EntityResourceTest
+
+
+
+ ERROR
+
+
+ [%thread] %-5level %logger{5} - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/openmetadata-service/src/test/resources/openmetadata-secure-test.yaml b/openmetadata-service/src/test/resources/openmetadata-secure-test.yaml
index acd7efdae4d..eaf987797bd 100644
--- a/openmetadata-service/src/test/resources/openmetadata-secure-test.yaml
+++ b/openmetadata-service/src/test/resources/openmetadata-secure-test.yaml
@@ -22,6 +22,8 @@ server:
adminConnectors:
- type: http
port: 0
+ requestLog:
+ type: external
# Above configuration for running http is fine for dev and testing.
# For production setup, where UI app will hit apis through DPS it
@@ -87,10 +89,8 @@ server:
# Logging settings.
logging:
- level: INFO
- appenders:
- - type: console
- logFormat: "%level %logger{5} - %msg%n"
+ level: OFF
+ appenders: []
database:
# the name of the JDBC driver, h2 is used for testing
diff --git a/openmetadata-spec/pom.xml b/openmetadata-spec/pom.xml
index b654a530674..eddd4afdbb9 100644
--- a/openmetadata-spec/pom.xml
+++ b/openmetadata-spec/pom.xml
@@ -14,7 +14,7 @@
11
11
- 2.1.6-1
+ 2.0.12-1