Skip to content

feat(spring): upgrade to SpringBoot 3.4 #13186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ buildscript {
ext.pegasusVersion = '29.57.0'
ext.mavenVersion = '3.6.3'
ext.versionGradle = '8.11.1'
ext.springVersion = '6.1.14'
ext.springBootVersion = '3.2.9'
ext.springKafkaVersion = '3.1.6'
ext.springVersion = '6.2.5'
ext.springBootVersion = '3.4.4'
ext.springKafkaVersion = '3.3.4'
ext.openTelemetryVersion = '1.45.0'
ext.neo4jVersion = '5.20.0'
ext.neo4jTestVersion = '5.20.0'
Expand All @@ -55,7 +55,7 @@ buildscript {
ext.akkaVersion = '2.6.21' // 2.7.0+ has incompatible license
ext.log4jVersion = '2.23.1'
ext.slf4jVersion = '1.7.36'
ext.logbackClassic = '1.4.14'
ext.logbackClassic = '1.5.18'
ext.hadoop3Version = '3.3.6'
ext.kafkaVersion = '5.5.15'
ext.hazelcastVersion = '5.3.6'
Expand Down Expand Up @@ -167,7 +167,7 @@ project.ext.externalDependency = [
'hazelcastSpring':"com.hazelcast:hazelcast-spring:$hazelcastVersion",
'hazelcastTest':"com.hazelcast:hazelcast:$hazelcastVersion:tests",
'hibernateCore': 'org.hibernate:hibernate-core:5.2.16.Final',
'httpClient': 'org.apache.httpcomponents.client5:httpclient5:5.3',
'httpClient': 'org.apache.httpcomponents.client5:httpclient5:5.4.3',
'iStackCommons': 'com.sun.istack:istack-commons-runtime:4.0.1',
'jacksonJDK8': "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion",
'jacksonDataPropertyFormat': "com.fasterxml.jackson.dataformat:jackson-dataformat-properties:$jacksonVersion",
Expand Down Expand Up @@ -263,7 +263,7 @@ project.ext.externalDependency = [
'springBeans': "org.springframework:spring-beans:$springVersion",
'springContext': "org.springframework:spring-context:$springVersion",
'springCore': "org.springframework:spring-core:$springVersion",
'springDocUI': 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0',
'springDocUI': 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.6',
'springJdbc': "org.springframework:spring-jdbc:$springVersion",
'springWeb': "org.springframework:spring-web:$springVersion",
'springWebMVC': "org.springframework:spring-webmvc:$springVersion",
Expand All @@ -276,11 +276,11 @@ project.ext.externalDependency = [
'springBootStarterValidation': "org.springframework.boot:spring-boot-starter-validation:$springBootVersion",
'springKafka': "org.springframework.kafka:spring-kafka:$springKafkaVersion",
'springActuator': "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion",
'springRetry': "org.springframework.retry:spring-retry:2.0.6",
'swaggerAnnotations': 'io.swagger.core.v3:swagger-annotations:2.2.15',
'springRetry': "org.springframework.retry:spring-retry:2.0.11",
'swaggerAnnotations': 'io.swagger.core.v3:swagger-annotations:2.2.30',
'swaggerCli': 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.46',
'swaggerCore': 'io.swagger.core.v3:swagger-core:2.2.7',
'swaggerParser': 'io.swagger.parser.v3:swagger-parser:2.1.15',
'swaggerCore': 'io.swagger.core.v3:swagger-core:2.2.30',
'swaggerParser': 'io.swagger.parser.v3:swagger-parser:2.1.26',
'springBootAutoconfigureJdk11': 'org.springframework.boot:spring-boot-autoconfigure:2.7.18',
'testng': 'org.testng:testng:7.8.0',
'testContainers': 'org.testcontainers:testcontainers:' + testContainersVersion,
Expand Down
12 changes: 0 additions & 12 deletions datahub-upgrade/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -158,18 +158,6 @@ task runRestoreIndicesUrn(type: Exec) {
bootJar.getArchiveFile().get(), "-u", "RestoreIndices", "-a", "batchSize=100", "-a", "urnBasedPagination=true"
}

task runNoCode(type: Exec) {
dependsOn bootJar
group = "Execution"
description = "Run the NoCodeDataMigration process locally."
environment "ENTITY_REGISTRY_CONFIG_PATH", "../metadata-models/src/main/resources/entity-registry.yml"
commandLine "java", "-agentlib:jdwp=transport=dt_socket,address=5003,server=y,suspend=n",
"-jar",
"-Dkafka.schemaRegistry.url=http://localhost:8080/schema-registry/api",
"-Dserver.port=8083",
bootJar.getArchiveFile().get(), "-u", "NoCodeDataMigration", "-a", "batchSize=100", "-a", "dbType=MYSQL"
}

docker {
dependsOn(bootJar)
name "${docker_registry}/${docker_repo}:${versionTag}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.linkedin.datahub.upgrade;

import com.linkedin.datahub.upgrade.impl.DefaultUpgradeManager;
import com.linkedin.datahub.upgrade.nocode.NoCodeUpgrade;
import com.linkedin.datahub.upgrade.nocodecleanup.NoCodeCleanupUpgrade;
import com.linkedin.datahub.upgrade.removeunknownaspects.RemoveUnknownAspects;
import com.linkedin.datahub.upgrade.restorebackup.RestoreBackup;
import com.linkedin.datahub.upgrade.restoreindices.RestoreIndices;
Expand Down Expand Up @@ -34,14 +32,6 @@ private static final class Args {

private final UpgradeManager _upgradeManager = new DefaultUpgradeManager();

@Inject
@Named("noCodeUpgrade")
private NoCodeUpgrade noCodeUpgrade;

@Inject
@Named("noCodeCleanup")
private NoCodeCleanupUpgrade noCodeCleanup;

@Inject
@Named("restoreIndices")
private RestoreIndices restoreIndices;
Expand Down Expand Up @@ -72,8 +62,6 @@ private static final class Args {

@Override
public void run(String... cmdLineArgs) {
_upgradeManager.register(noCodeUpgrade);
_upgradeManager.register(noCodeCleanup);
_upgradeManager.register(restoreIndices);
_upgradeManager.register(restoreBackup);
_upgradeManager.register(removeUnknownAspects);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ enum Action {
default Action action() {
return Action.CONTINUE;
}
;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.linkedin.datahub.upgrade.common;

public class Constants {
private Constants() {}

public static final String CLEAN_ARG_NAME = "clean";
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.linkedin.datahub.upgrade.common.steps;

import static com.linkedin.datahub.upgrade.common.Constants.CLEAN_ARG_NAME;

import com.linkedin.datahub.upgrade.UpgradeContext;
import com.linkedin.datahub.upgrade.UpgradeStep;
import com.linkedin.datahub.upgrade.UpgradeStepResult;
import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
import com.linkedin.datahub.upgrade.nocode.NoCodeUpgrade;
import com.linkedin.metadata.graph.GraphService;
import com.linkedin.upgrade.DataHubUpgradeState;
import java.util.function.Function;
Expand All @@ -31,7 +32,7 @@ public boolean skip(UpgradeContext context) {
if (_alwaysRun) {
return false;
}
if (context.parsedArgs().containsKey(NoCodeUpgrade.CLEAN_ARG_NAME)) {
if (context.parsedArgs().containsKey(CLEAN_ARG_NAME)) {
return false;
}
context.report().addLine("Cleanup has not been requested.");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.linkedin.datahub.upgrade.common.steps;

import static com.linkedin.datahub.upgrade.common.Constants.CLEAN_ARG_NAME;

import com.linkedin.datahub.upgrade.UpgradeContext;
import com.linkedin.datahub.upgrade.UpgradeStep;
import com.linkedin.datahub.upgrade.UpgradeStepResult;
import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
import com.linkedin.datahub.upgrade.nocode.NoCodeUpgrade;
import com.linkedin.metadata.search.EntitySearchService;
import com.linkedin.upgrade.DataHubUpgradeState;
import java.util.function.Function;
Expand All @@ -30,7 +31,7 @@ public boolean skip(UpgradeContext context) {
if (_alwaysRun) {
return false;
}
if (context.parsedArgs().containsKey(NoCodeUpgrade.CLEAN_ARG_NAME)) {
if (context.parsedArgs().containsKey(CLEAN_ARG_NAME)) {
return false;
}
context.report().addLine("Cleanup has not been requested.");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.linkedin.datahub.upgrade.common.steps;

import static com.linkedin.datahub.upgrade.common.Constants.CLEAN_ARG_NAME;

import com.linkedin.datahub.upgrade.UpgradeContext;
import com.linkedin.datahub.upgrade.UpgradeStep;
import com.linkedin.datahub.upgrade.UpgradeStepResult;
import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
import com.linkedin.datahub.upgrade.nocode.NoCodeUpgrade;
import com.linkedin.metadata.systemmetadata.SystemMetadataService;
import com.linkedin.upgrade.DataHubUpgradeState;
import java.util.function.Function;
Expand All @@ -30,7 +31,7 @@ public boolean skip(UpgradeContext context) {
if (_alwaysRun) {
return false;
}
if (context.parsedArgs().containsKey(NoCodeUpgrade.CLEAN_ARG_NAME)) {
if (context.parsedArgs().containsKey(CLEAN_ARG_NAME)) {
return false;
}
context.report().addLine("Cleanup has not been requested.");
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading