diff --git a/fe/fe-common/pom.xml b/fe/fe-common/pom.xml index 8f480f441f..cda41ee0c5 100644 --- a/fe/fe-common/pom.xml +++ b/fe/fe-common/pom.xml @@ -69,28 +69,6 @@ under the License. org.apache.httpcomponents httpcore - - org.slf4j - slf4j-api - - - - org.jmockit - jmockit - test - - - - org.junit.jupiter - junit-jupiter-engine - test - - - - org.junit.vintage - junit-vintage-engine - test - org.roaringbitmap RoaringBitmap @@ -104,21 +82,6 @@ under the License. com.google.code.gson gson - - - org.apache.logging.log4j - log4j-api - - - - org.apache.logging.log4j - log4j-core - - - - org.apache.logging.log4j - log4j-slf4j-impl - joda-time joda-time diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml index afaed437e1..07ade9f929 100644 --- a/fe/fe-core/pom.xml +++ b/fe/fe-core/pom.xml @@ -106,11 +106,6 @@ under the License. org.springframework.boot spring-boot-devtools - - org.springframework - springloaded - 1.2.6.RELEASE - org.springframework.boot spring-boot-starter-data-ldap @@ -227,52 +222,6 @@ under the License. - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params - ${junit.version} - test - - - - - org.apache.logging.log4j - log4j-api - ${log4j2.version} - - - - org.apache.logging.log4j - log4j-core - ${log4j2.version} - - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j2.version} - - - - org.slf4j - slf4j-log4j12 - 1.7.9 - io.dropwizard.metrics @@ -472,11 +421,6 @@ under the License. - - org.hibernate - hibernate-validator - 5.1.0.Final - org.apache.hadoop hadoop-aws @@ -500,7 +444,7 @@ under the License. spring-boot-starter-web - org.hibernate.validator + validator hibernate-validator @@ -529,7 +473,6 @@ under the License. commons-fileupload commons-fileupload - 1.3.3 @@ -611,6 +554,10 @@ under the License. netty-all io.netty + + log4j + log4j + @@ -768,6 +715,10 @@ under the License. netty-all io.netty + + log4j + log4j + diff --git a/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java b/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java index e707516188..595b21ab5d 100644 --- a/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java +++ b/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java @@ -23,7 +23,6 @@ package com.amazonaws.glue.catalog.metastore; import com.amazonaws.AmazonWebServiceRequest; import com.amazonaws.ResponseMetadata; -import com.amazonaws.regions.Region; import com.amazonaws.services.glue.AWSGlue; import com.amazonaws.services.glue.model.BatchCreatePartitionRequest; import com.amazonaws.services.glue.model.BatchCreatePartitionResult; @@ -35,8 +34,12 @@ import com.amazonaws.services.glue.model.BatchDeleteTableRequest; import com.amazonaws.services.glue.model.BatchDeleteTableResult; import com.amazonaws.services.glue.model.BatchDeleteTableVersionRequest; import com.amazonaws.services.glue.model.BatchDeleteTableVersionResult; +import com.amazonaws.services.glue.model.BatchGetBlueprintsRequest; +import com.amazonaws.services.glue.model.BatchGetBlueprintsResult; import com.amazonaws.services.glue.model.BatchGetCrawlersRequest; import com.amazonaws.services.glue.model.BatchGetCrawlersResult; +import com.amazonaws.services.glue.model.BatchGetCustomEntityTypesRequest; +import com.amazonaws.services.glue.model.BatchGetCustomEntityTypesResult; import com.amazonaws.services.glue.model.BatchGetDevEndpointsRequest; import com.amazonaws.services.glue.model.BatchGetDevEndpointsResult; import com.amazonaws.services.glue.model.BatchGetJobsRequest; @@ -53,14 +56,20 @@ import com.amazonaws.services.glue.model.BatchUpdatePartitionRequest; import com.amazonaws.services.glue.model.BatchUpdatePartitionResult; import com.amazonaws.services.glue.model.CancelMLTaskRunRequest; import com.amazonaws.services.glue.model.CancelMLTaskRunResult; +import com.amazonaws.services.glue.model.CancelStatementRequest; +import com.amazonaws.services.glue.model.CancelStatementResult; import com.amazonaws.services.glue.model.CheckSchemaVersionValidityRequest; import com.amazonaws.services.glue.model.CheckSchemaVersionValidityResult; +import com.amazonaws.services.glue.model.CreateBlueprintRequest; +import com.amazonaws.services.glue.model.CreateBlueprintResult; import com.amazonaws.services.glue.model.CreateClassifierRequest; import com.amazonaws.services.glue.model.CreateClassifierResult; import com.amazonaws.services.glue.model.CreateConnectionRequest; import com.amazonaws.services.glue.model.CreateConnectionResult; import com.amazonaws.services.glue.model.CreateCrawlerRequest; import com.amazonaws.services.glue.model.CreateCrawlerResult; +import com.amazonaws.services.glue.model.CreateCustomEntityTypeRequest; +import com.amazonaws.services.glue.model.CreateCustomEntityTypeResult; import com.amazonaws.services.glue.model.CreateDatabaseRequest; import com.amazonaws.services.glue.model.CreateDatabaseResult; import com.amazonaws.services.glue.model.CreateDevEndpointRequest; @@ -81,6 +90,8 @@ import com.amazonaws.services.glue.model.CreateScriptRequest; import com.amazonaws.services.glue.model.CreateScriptResult; import com.amazonaws.services.glue.model.CreateSecurityConfigurationRequest; import com.amazonaws.services.glue.model.CreateSecurityConfigurationResult; +import com.amazonaws.services.glue.model.CreateSessionRequest; +import com.amazonaws.services.glue.model.CreateSessionResult; import com.amazonaws.services.glue.model.CreateTableRequest; import com.amazonaws.services.glue.model.CreateTableResult; import com.amazonaws.services.glue.model.CreateTriggerRequest; @@ -89,6 +100,8 @@ import com.amazonaws.services.glue.model.CreateUserDefinedFunctionRequest; import com.amazonaws.services.glue.model.CreateUserDefinedFunctionResult; import com.amazonaws.services.glue.model.CreateWorkflowRequest; import com.amazonaws.services.glue.model.CreateWorkflowResult; +import com.amazonaws.services.glue.model.DeleteBlueprintRequest; +import com.amazonaws.services.glue.model.DeleteBlueprintResult; import com.amazonaws.services.glue.model.DeleteClassifierRequest; import com.amazonaws.services.glue.model.DeleteClassifierResult; import com.amazonaws.services.glue.model.DeleteColumnStatisticsForPartitionRequest; @@ -99,6 +112,8 @@ import com.amazonaws.services.glue.model.DeleteConnectionRequest; import com.amazonaws.services.glue.model.DeleteConnectionResult; import com.amazonaws.services.glue.model.DeleteCrawlerRequest; import com.amazonaws.services.glue.model.DeleteCrawlerResult; +import com.amazonaws.services.glue.model.DeleteCustomEntityTypeRequest; +import com.amazonaws.services.glue.model.DeleteCustomEntityTypeResult; import com.amazonaws.services.glue.model.DeleteDatabaseRequest; import com.amazonaws.services.glue.model.DeleteDatabaseResult; import com.amazonaws.services.glue.model.DeleteDevEndpointRequest; @@ -121,6 +136,8 @@ import com.amazonaws.services.glue.model.DeleteSchemaVersionsRequest; import com.amazonaws.services.glue.model.DeleteSchemaVersionsResult; import com.amazonaws.services.glue.model.DeleteSecurityConfigurationRequest; import com.amazonaws.services.glue.model.DeleteSecurityConfigurationResult; +import com.amazonaws.services.glue.model.DeleteSessionRequest; +import com.amazonaws.services.glue.model.DeleteSessionResult; import com.amazonaws.services.glue.model.DeleteTableRequest; import com.amazonaws.services.glue.model.DeleteTableResult; import com.amazonaws.services.glue.model.DeleteTableVersionRequest; @@ -131,6 +148,12 @@ import com.amazonaws.services.glue.model.DeleteUserDefinedFunctionRequest; import com.amazonaws.services.glue.model.DeleteUserDefinedFunctionResult; import com.amazonaws.services.glue.model.DeleteWorkflowRequest; import com.amazonaws.services.glue.model.DeleteWorkflowResult; +import com.amazonaws.services.glue.model.GetBlueprintRequest; +import com.amazonaws.services.glue.model.GetBlueprintResult; +import com.amazonaws.services.glue.model.GetBlueprintRunRequest; +import com.amazonaws.services.glue.model.GetBlueprintRunResult; +import com.amazonaws.services.glue.model.GetBlueprintRunsRequest; +import com.amazonaws.services.glue.model.GetBlueprintRunsResult; import com.amazonaws.services.glue.model.GetCatalogImportStatusRequest; import com.amazonaws.services.glue.model.GetCatalogImportStatusResult; import com.amazonaws.services.glue.model.GetClassifierRequest; @@ -151,6 +174,8 @@ import com.amazonaws.services.glue.model.GetCrawlerRequest; import com.amazonaws.services.glue.model.GetCrawlerResult; import com.amazonaws.services.glue.model.GetCrawlersRequest; import com.amazonaws.services.glue.model.GetCrawlersResult; +import com.amazonaws.services.glue.model.GetCustomEntityTypeRequest; +import com.amazonaws.services.glue.model.GetCustomEntityTypeResult; import com.amazonaws.services.glue.model.GetDataCatalogEncryptionSettingsRequest; import com.amazonaws.services.glue.model.GetDataCatalogEncryptionSettingsResult; import com.amazonaws.services.glue.model.GetDatabaseRequest; @@ -209,6 +234,10 @@ import com.amazonaws.services.glue.model.GetSecurityConfigurationRequest; import com.amazonaws.services.glue.model.GetSecurityConfigurationResult; import com.amazonaws.services.glue.model.GetSecurityConfigurationsRequest; import com.amazonaws.services.glue.model.GetSecurityConfigurationsResult; +import com.amazonaws.services.glue.model.GetSessionRequest; +import com.amazonaws.services.glue.model.GetSessionResult; +import com.amazonaws.services.glue.model.GetStatementRequest; +import com.amazonaws.services.glue.model.GetStatementResult; import com.amazonaws.services.glue.model.GetTableRequest; import com.amazonaws.services.glue.model.GetTableResult; import com.amazonaws.services.glue.model.GetTableVersionRequest; @@ -223,6 +252,12 @@ import com.amazonaws.services.glue.model.GetTriggerRequest; import com.amazonaws.services.glue.model.GetTriggerResult; import com.amazonaws.services.glue.model.GetTriggersRequest; import com.amazonaws.services.glue.model.GetTriggersResult; +import com.amazonaws.services.glue.model.GetUnfilteredPartitionMetadataRequest; +import com.amazonaws.services.glue.model.GetUnfilteredPartitionMetadataResult; +import com.amazonaws.services.glue.model.GetUnfilteredPartitionsMetadataRequest; +import com.amazonaws.services.glue.model.GetUnfilteredPartitionsMetadataResult; +import com.amazonaws.services.glue.model.GetUnfilteredTableMetadataRequest; +import com.amazonaws.services.glue.model.GetUnfilteredTableMetadataResult; import com.amazonaws.services.glue.model.GetUserDefinedFunctionRequest; import com.amazonaws.services.glue.model.GetUserDefinedFunctionResult; import com.amazonaws.services.glue.model.GetUserDefinedFunctionsRequest; @@ -237,8 +272,14 @@ import com.amazonaws.services.glue.model.GetWorkflowRunsRequest; import com.amazonaws.services.glue.model.GetWorkflowRunsResult; import com.amazonaws.services.glue.model.ImportCatalogToGlueRequest; import com.amazonaws.services.glue.model.ImportCatalogToGlueResult; +import com.amazonaws.services.glue.model.ListBlueprintsRequest; +import com.amazonaws.services.glue.model.ListBlueprintsResult; import com.amazonaws.services.glue.model.ListCrawlersRequest; import com.amazonaws.services.glue.model.ListCrawlersResult; +import com.amazonaws.services.glue.model.ListCrawlsRequest; +import com.amazonaws.services.glue.model.ListCrawlsResult; +import com.amazonaws.services.glue.model.ListCustomEntityTypesRequest; +import com.amazonaws.services.glue.model.ListCustomEntityTypesResult; import com.amazonaws.services.glue.model.ListDevEndpointsRequest; import com.amazonaws.services.glue.model.ListDevEndpointsResult; import com.amazonaws.services.glue.model.ListJobsRequest; @@ -251,6 +292,10 @@ import com.amazonaws.services.glue.model.ListSchemaVersionsRequest; import com.amazonaws.services.glue.model.ListSchemaVersionsResult; import com.amazonaws.services.glue.model.ListSchemasRequest; import com.amazonaws.services.glue.model.ListSchemasResult; +import com.amazonaws.services.glue.model.ListSessionsRequest; +import com.amazonaws.services.glue.model.ListSessionsResult; +import com.amazonaws.services.glue.model.ListStatementsRequest; +import com.amazonaws.services.glue.model.ListStatementsResult; import com.amazonaws.services.glue.model.ListTriggersRequest; import com.amazonaws.services.glue.model.ListTriggersResult; import com.amazonaws.services.glue.model.ListWorkflowsRequest; @@ -273,8 +318,12 @@ import com.amazonaws.services.glue.model.ResetJobBookmarkRequest; import com.amazonaws.services.glue.model.ResetJobBookmarkResult; import com.amazonaws.services.glue.model.ResumeWorkflowRunRequest; import com.amazonaws.services.glue.model.ResumeWorkflowRunResult; +import com.amazonaws.services.glue.model.RunStatementRequest; +import com.amazonaws.services.glue.model.RunStatementResult; import com.amazonaws.services.glue.model.SearchTablesRequest; import com.amazonaws.services.glue.model.SearchTablesResult; +import com.amazonaws.services.glue.model.StartBlueprintRunRequest; +import com.amazonaws.services.glue.model.StartBlueprintRunResult; import com.amazonaws.services.glue.model.StartCrawlerRequest; import com.amazonaws.services.glue.model.StartCrawlerResult; import com.amazonaws.services.glue.model.StartCrawlerScheduleRequest; @@ -297,6 +346,8 @@ import com.amazonaws.services.glue.model.StopCrawlerRequest; import com.amazonaws.services.glue.model.StopCrawlerResult; import com.amazonaws.services.glue.model.StopCrawlerScheduleRequest; import com.amazonaws.services.glue.model.StopCrawlerScheduleResult; +import com.amazonaws.services.glue.model.StopSessionRequest; +import com.amazonaws.services.glue.model.StopSessionResult; import com.amazonaws.services.glue.model.StopTriggerRequest; import com.amazonaws.services.glue.model.StopTriggerResult; import com.amazonaws.services.glue.model.StopWorkflowRunRequest; @@ -305,6 +356,8 @@ import com.amazonaws.services.glue.model.TagResourceRequest; import com.amazonaws.services.glue.model.TagResourceResult; import com.amazonaws.services.glue.model.UntagResourceRequest; import com.amazonaws.services.glue.model.UntagResourceResult; +import com.amazonaws.services.glue.model.UpdateBlueprintRequest; +import com.amazonaws.services.glue.model.UpdateBlueprintResult; import com.amazonaws.services.glue.model.UpdateClassifierRequest; import com.amazonaws.services.glue.model.UpdateClassifierResult; import com.amazonaws.services.glue.model.UpdateColumnStatisticsForPartitionRequest; @@ -347,6 +400,9 @@ import com.amazonaws.services.glue.model.UpdateWorkflowResult; * All @Override methods are generated by IntelliJ IDEA. */ public class AWSGlueDecoratorBase implements AWSGlue { + + + private AWSGlue decoratedAwsGlue; public AWSGlueDecoratorBase(AWSGlue awsGlueToBeDecorated) { @@ -383,6 +439,11 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.batchGetCrawlers(batchGetCrawlersRequest); } + @Override + public BatchGetCustomEntityTypesResult batchGetCustomEntityTypes(BatchGetCustomEntityTypesRequest batchGetCustomEntityTypesRequest) { + return decoratedAwsGlue.batchGetCustomEntityTypes(batchGetCustomEntityTypesRequest); + } + @Override public BatchGetDevEndpointsResult batchGetDevEndpoints(BatchGetDevEndpointsRequest batchGetDevEndpointsRequest) { return decoratedAwsGlue.batchGetDevEndpoints(batchGetDevEndpointsRequest); @@ -423,11 +484,21 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.cancelMLTaskRun(cancelMLTaskRunRequest); } + @Override + public CancelStatementResult cancelStatement(CancelStatementRequest cancelStatementRequest) { + return decoratedAwsGlue.cancelStatement(cancelStatementRequest); + } + @Override public CheckSchemaVersionValidityResult checkSchemaVersionValidity(CheckSchemaVersionValidityRequest checkSchemaVersionValidityRequest) { return null; } + @Override + public CreateBlueprintResult createBlueprint(CreateBlueprintRequest createBlueprintRequest) { + return null; + } + @Override public CreateClassifierResult createClassifier(CreateClassifierRequest createClassifierRequest) { return decoratedAwsGlue.createClassifier(createClassifierRequest); @@ -443,6 +514,11 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.createCrawler(createCrawlerRequest); } + @Override + public CreateCustomEntityTypeResult createCustomEntityType(CreateCustomEntityTypeRequest createCustomEntityTypeRequest) { + return decoratedAwsGlue.createCustomEntityType(createCustomEntityTypeRequest); + } + @Override public CreateDatabaseResult createDatabase(CreateDatabaseRequest createDatabaseRequest) { return decoratedAwsGlue.createDatabase(createDatabaseRequest); @@ -493,6 +569,11 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.createSecurityConfiguration(createSecurityConfigurationRequest); } + @Override + public CreateSessionResult createSession(CreateSessionRequest createSessionRequest) { + return decoratedAwsGlue.createSession(createSessionRequest); + } + @Override public CreateTableResult createTable(CreateTableRequest createTableRequest) { return decoratedAwsGlue.createTable(createTableRequest); @@ -513,6 +594,11 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.createWorkflow(createWorkflowRequest); } + @Override + public DeleteBlueprintResult deleteBlueprint(DeleteBlueprintRequest deleteBlueprintRequest) { + return decoratedAwsGlue.deleteBlueprint(deleteBlueprintRequest); + } + @Override public DeleteClassifierResult deleteClassifier(DeleteClassifierRequest deleteClassifierRequest) { return decoratedAwsGlue.deleteClassifier(deleteClassifierRequest); @@ -528,6 +614,11 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.deleteCrawler(deleteCrawlerRequest); } + @Override + public DeleteCustomEntityTypeResult deleteCustomEntityType(DeleteCustomEntityTypeRequest deleteCustomEntityTypeRequest) { + return decoratedAwsGlue.deleteCustomEntityType(deleteCustomEntityTypeRequest); + } + @Override public DeleteDatabaseResult deleteDatabase(DeleteDatabaseRequest deleteDatabaseRequest) { return decoratedAwsGlue.deleteDatabase(deleteDatabaseRequest); @@ -583,6 +674,11 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.deleteSecurityConfiguration(deleteSecurityConfigurationRequest); } + @Override + public DeleteSessionResult deleteSession(DeleteSessionRequest deleteSessionRequest) { + return decoratedAwsGlue.deleteSession(deleteSessionRequest); + } + @Override public DeleteTableResult deleteTable(DeleteTableRequest deleteTableRequest) { return decoratedAwsGlue.deleteTable(deleteTableRequest); @@ -608,6 +704,21 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.deleteWorkflow(deleteWorkflowRequest); } + @Override + public GetBlueprintResult getBlueprint(GetBlueprintRequest getBlueprintRequest) { + return decoratedAwsGlue.getBlueprint(getBlueprintRequest); + } + + @Override + public GetBlueprintRunResult getBlueprintRun(GetBlueprintRunRequest getBlueprintRunRequest) { + return decoratedAwsGlue.getBlueprintRun(getBlueprintRunRequest); + } + + @Override + public GetBlueprintRunsResult getBlueprintRuns(GetBlueprintRunsRequest getBlueprintRunsRequest) { + return decoratedAwsGlue.getBlueprintRuns(getBlueprintRunsRequest); + } + @Override public GetCatalogImportStatusResult getCatalogImportStatus(GetCatalogImportStatusRequest getCatalogImportStatusRequest) { return decoratedAwsGlue.getCatalogImportStatus(getCatalogImportStatusRequest); @@ -648,6 +759,11 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.getCrawlers(getCrawlersRequest); } + @Override + public GetCustomEntityTypeResult getCustomEntityType(GetCustomEntityTypeRequest getCustomEntityTypeRequest) { + return decoratedAwsGlue.getCustomEntityType(getCustomEntityTypeRequest); + } + @Override public GetDataCatalogEncryptionSettingsResult getDataCatalogEncryptionSettings(GetDataCatalogEncryptionSettingsRequest getDataCatalogEncryptionSettingsRequest) { return decoratedAwsGlue.getDataCatalogEncryptionSettings(getDataCatalogEncryptionSettingsRequest); @@ -788,6 +904,16 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.getSecurityConfigurations(getSecurityConfigurationsRequest); } + @Override + public GetSessionResult getSession(GetSessionRequest getSessionRequest) { + return decoratedAwsGlue.getSession(getSessionRequest); + } + + @Override + public GetStatementResult getStatement(GetStatementRequest getStatementRequest) { + return decoratedAwsGlue.getStatement(getStatementRequest); + } + @Override public GetTableResult getTable(GetTableRequest getTableRequest) { return decoratedAwsGlue.getTable(getTableRequest); @@ -823,6 +949,21 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.getTriggers(getTriggersRequest); } + @Override + public GetUnfilteredPartitionMetadataResult getUnfilteredPartitionMetadata(GetUnfilteredPartitionMetadataRequest getUnfilteredPartitionMetadataRequest) { + return decoratedAwsGlue.getUnfilteredPartitionMetadata(getUnfilteredPartitionMetadataRequest); + } + + @Override + public GetUnfilteredPartitionsMetadataResult getUnfilteredPartitionsMetadata(GetUnfilteredPartitionsMetadataRequest getUnfilteredPartitionsMetadataRequest) { + return decoratedAwsGlue.getUnfilteredPartitionsMetadata(getUnfilteredPartitionsMetadataRequest); + } + + @Override + public GetUnfilteredTableMetadataResult getUnfilteredTableMetadata(GetUnfilteredTableMetadataRequest getUnfilteredTableMetadataRequest) { + return decoratedAwsGlue.getUnfilteredTableMetadata(getUnfilteredTableMetadataRequest); + } + @Override public GetUserDefinedFunctionResult getUserDefinedFunction(GetUserDefinedFunctionRequest getUserDefinedFunctionRequest) { return decoratedAwsGlue.getUserDefinedFunction(getUserDefinedFunctionRequest); @@ -858,11 +999,26 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.importCatalogToGlue(importCatalogToGlueRequest); } + @Override + public ListBlueprintsResult listBlueprints(ListBlueprintsRequest listBlueprintsRequest) { + return decoratedAwsGlue.listBlueprints(listBlueprintsRequest); + } + @Override public ListCrawlersResult listCrawlers(ListCrawlersRequest listCrawlersRequest) { return decoratedAwsGlue.listCrawlers(listCrawlersRequest); } + @Override + public ListCrawlsResult listCrawls(ListCrawlsRequest listCrawlsRequest) { + return decoratedAwsGlue.listCrawls(listCrawlsRequest); + } + + @Override + public ListCustomEntityTypesResult listCustomEntityTypes(ListCustomEntityTypesRequest listCustomEntityTypesRequest) { + return decoratedAwsGlue.listCustomEntityTypes(listCustomEntityTypesRequest); + } + @Override public ListDevEndpointsResult listDevEndpoints(ListDevEndpointsRequest listDevEndpointsRequest) { return decoratedAwsGlue.listDevEndpoints(listDevEndpointsRequest); @@ -893,6 +1049,16 @@ public class AWSGlueDecoratorBase implements AWSGlue { return null; } + @Override + public ListSessionsResult listSessions(ListSessionsRequest listSessionsRequest) { + return decoratedAwsGlue.listSessions(listSessionsRequest); + } + + @Override + public ListStatementsResult listStatements(ListStatementsRequest listStatementsRequest) { + return decoratedAwsGlue.listStatements(listStatementsRequest); + } + @Override public ListTriggersResult listTriggers(ListTriggersRequest listTriggersRequest) { return decoratedAwsGlue.listTriggers(listTriggersRequest); @@ -948,6 +1114,11 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.searchTables(searchTablesRequest); } + @Override + public StartBlueprintRunResult startBlueprintRun(StartBlueprintRunRequest startBlueprintRunRequest) { + return decoratedAwsGlue.startBlueprintRun(startBlueprintRunRequest); + } + @Override public StartCrawlerResult startCrawler(StartCrawlerRequest startCrawlerRequest) { return decoratedAwsGlue.startCrawler(startCrawlerRequest); @@ -1003,6 +1174,11 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.stopCrawlerSchedule(stopCrawlerScheduleRequest); } + @Override + public StopSessionResult stopSession(StopSessionRequest stopSessionRequest) { + return decoratedAwsGlue.stopSession(stopSessionRequest); + } + @Override public StopTriggerResult stopTrigger(StopTriggerRequest stopTriggerRequest) { return decoratedAwsGlue.stopTrigger(stopTriggerRequest); @@ -1023,6 +1199,11 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.untagResource(untagResourceRequest); } + @Override + public UpdateBlueprintResult updateBlueprint(UpdateBlueprintRequest updateBlueprintRequest) { + return decoratedAwsGlue.updateBlueprint(updateBlueprintRequest); + } + @Override public UpdateClassifierResult updateClassifier(UpdateClassifierRequest updateClassifierRequest) { return decoratedAwsGlue.updateClassifier(updateClassifierRequest); @@ -1124,6 +1305,11 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.resumeWorkflowRun(resumeWorkflowRunRequest); } + @Override + public RunStatementResult runStatement(RunStatementRequest runStatementRequest) { + return decoratedAwsGlue.runStatement(runStatementRequest); + } + @Override public GetResourcePoliciesResult getResourcePolicies(GetResourcePoliciesRequest getResourcePoliciesRequest) { return decoratedAwsGlue.getResourcePolicies(getResourcePoliciesRequest); @@ -1149,5 +1335,9 @@ public class AWSGlueDecoratorBase implements AWSGlue { return decoratedAwsGlue.deleteColumnStatisticsForPartition(deleteColumnStatisticsForPartitionRequest); } + @Override + public BatchGetBlueprintsResult batchGetBlueprints(BatchGetBlueprintsRequest batchGetBlueprintsRequest) { + return decoratedAwsGlue.batchGetBlueprints(batchGetBlueprintsRequest); + } } diff --git a/fe/hive-udf/pom.xml b/fe/hive-udf/pom.xml index e6fcb23403..715bc5cb8c 100644 --- a/fe/hive-udf/pom.xml +++ b/fe/hive-udf/pom.xml @@ -35,9 +35,14 @@ under the License. 1 + + org.apache.hive + hive-serde + org.apache.hive hive-exec + core ${hive.version} @@ -58,6 +63,10 @@ under the License. + + org.apache.hive + hive-serde + org.apache.httpcomponents diff --git a/fe/java-udf/pom.xml b/fe/java-udf/pom.xml index 163fa5c0ae..ca7db41b23 100644 --- a/fe/java-udf/pom.xml +++ b/fe/java-udf/pom.xml @@ -58,21 +58,11 @@ under the License. org.apache.hive hive-exec - ${hive.version} - - - org.pentaho - * - - - org.apache.velocity - velocity - - - commons-httpclient - commons-httpclient - - + core + + + org.apache.hive + hive-serde org.apache.velocity @@ -90,26 +80,11 @@ under the License. ojdbc6 11.2.0.4 - com.alibaba druid - - - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - test - - - - org.junit.vintage - junit-vintage-engine - ${junit.version} - test + 1.2.5 diff --git a/fe/java-udf/src/main/java/org/apache/doris/udf/JMXJsonUtil.java b/fe/java-udf/src/main/java/org/apache/doris/udf/JMXJsonUtil.java index fea9bce2dc..5089b45a07 100644 --- a/fe/java-udf/src/main/java/org/apache/doris/udf/JMXJsonUtil.java +++ b/fe/java-udf/src/main/java/org/apache/doris/udf/JMXJsonUtil.java @@ -20,9 +20,9 @@ package org.apache.doris.udf; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; import org.apache.log4j.Logger; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonGenerator; import java.io.IOException; import java.io.StringWriter; diff --git a/fe/pom.xml b/fe/pom.xml index 0e04ddd2bf..44cdd12e37 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache apache - 23 + 25 org.apache.doris fe @@ -161,22 +161,23 @@ under the License. ${basedir}/../ + 1.2-SNAPSHOT UTF-8 1.8 1.8 apache https://sonarcloud.io - 2.2 1.4 + 1.5 1.13 2.6 3.9 2.2 1.7 - 2.8.6 - 29.0-jre - 2.12.3 + 2.8.9 + 30.0-jre + 2.14.2 1.9.13 0.11-a-czt02-cdh 3.18.2-GA @@ -184,17 +185,20 @@ under the License. 18.3.14-doris-SNAPSHOT 1.4.3 1.49 - 2.6 + 2.7 1.1.1 5.8.2 1.2.5 0.13.0 + 8.5.86 2.18.0 + 2.18.0 + 2.0.6 4.0.2 - 4.1.42.Final + 4.1.89.Final 2.1 1.30.0 - 3.15.0 + 3.21.12 3.1.5 1.1.7.2 1.11-8 @@ -208,8 +212,7 @@ under the License. 1.15 1.1.0.Final 0.2.3 - 1.7.5 - 0.10.1.1 + 3.4.0 4.0.0 3.6.5.Final 1.3.2 @@ -218,7 +221,7 @@ under the License. 0.8.13 2.4.6 3.1.3 - 1.32.0 + 1.33.0 1.22.0 @@ -311,8 +315,14 @@ under the License. org.apache.hadoop hadoop-client ${hadoop.version} - compile + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + + ${project.groupId} fe-common @@ -335,6 +345,13 @@ under the License. commons-cli ${commons-cli.version} + + + commons-fileupload + commons-fileupload + ${commons-filerupload.version} + + commons-codec @@ -475,23 +492,36 @@ under the License. - - - org.apache.logging.log4j - log4j-api - ${log4j2.version} - - org.apache.logging.log4j log4j-core ${log4j2.version} - org.apache.logging.log4j log4j-slf4j-impl ${log4j2.version} + + + org.apache.logging.log4j + log4j-core + + + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} @@ -632,9 +662,19 @@ under the License. org.slf4j - slf4j-api + slf4j-1.2-api + ${slf4j-1.2.version} + + + org.slf4j + slf4j-log4j12 ${slf4j.version} + + org.apache.logging.log4j + log4j-1.2-api + ${log4j-1.2.version} + org.apache.kafka kafka-clients @@ -682,6 +722,7 @@ under the License. org.apache.spark spark-core_2.12 ${spark.version} + provided log4j @@ -706,6 +747,7 @@ under the License. org.apache.spark spark-launcher_2.12 ${spark.version} + provided @@ -796,6 +838,11 @@ under the License. + + org.apache.hive + hive-serde + ${hive.version} + org.apache.hadoop hadoop-hdfs @@ -914,7 +961,11 @@ under the License. commons-collections commons-collections ${commons-collections.version} - compile + + + org.apache.commons + commons-compress + ${commons-compress.version} org.scala-lang @@ -926,7 +977,6 @@ under the License. com.esotericsoftware kryo-shaded ${kryo.version} - compile org.apache.spark @@ -977,7 +1027,7 @@ under the License. aws-java-sdk-dynamodb ${aws-java-sdk.version} - + org.mariadb.jdbc mariadb-java-client ${mariadb-java-client.version} @@ -998,8 +1048,41 @@ under the License. joda-time ${joda.version} + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat-embed-core.version} + + + + org.apache.logging.log4j + log4j-core + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-1.2-api + + + + org.junit.jupiter + junit-jupiter-engine + + + org.junit.vintage + junit-vintage-engine + + + org.junit.jupiter + junit-jupiter-params + + diff --git a/regression-test/java-udf-src/pom.xml b/regression-test/java-udf-src/pom.xml index 2b01da10ad..1967e4f0e1 100644 --- a/regression-test/java-udf-src/pom.xml +++ b/regression-test/java-udf-src/pom.xml @@ -28,6 +28,7 @@ under the License. 8 8 + 3.1.3 @@ -42,7 +43,13 @@ under the License. org.apache.hive hive-exec - 2.3.5 + core + ${hive.version} + + + org.apache.hive + hive-serde + ${hive.version}