Skip to content

Commit 2cc5557

Browse files
committed
feat(spring): upgrade to Spring 3.4
* Deprecate No Code migration
1 parent ed0cfe9 commit 2cc5557

File tree

33 files changed

+48
-1615
lines changed

33 files changed

+48
-1615
lines changed

build.gradle

+10-10
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ buildscript {
3838
ext.pegasusVersion = '29.57.0'
3939
ext.mavenVersion = '3.6.3'
4040
ext.versionGradle = '8.11.1'
41-
ext.springVersion = '6.1.14'
42-
ext.springBootVersion = '3.2.9'
43-
ext.springKafkaVersion = '3.1.6'
41+
ext.springVersion = '6.2.5'
42+
ext.springBootVersion = '3.4.4'
43+
ext.springKafkaVersion = '3.3.4'
4444
ext.openTelemetryVersion = '1.45.0'
4545
ext.neo4jVersion = '5.20.0'
4646
ext.neo4jTestVersion = '5.20.0'
@@ -55,7 +55,7 @@ buildscript {
5555
ext.akkaVersion = '2.6.21' // 2.7.0+ has incompatible license
5656
ext.log4jVersion = '2.23.1'
5757
ext.slf4jVersion = '1.7.36'
58-
ext.logbackClassic = '1.4.14'
58+
ext.logbackClassic = '1.5.18'
5959
ext.hadoop3Version = '3.3.6'
6060
ext.kafkaVersion = '5.5.15'
6161
ext.hazelcastVersion = '5.3.6'
@@ -167,7 +167,7 @@ project.ext.externalDependency = [
167167
'hazelcastSpring':"com.hazelcast:hazelcast-spring:$hazelcastVersion",
168168
'hazelcastTest':"com.hazelcast:hazelcast:$hazelcastVersion:tests",
169169
'hibernateCore': 'org.hibernate:hibernate-core:5.2.16.Final',
170-
'httpClient': 'org.apache.httpcomponents.client5:httpclient5:5.3',
170+
'httpClient': 'org.apache.httpcomponents.client5:httpclient5:5.4.3',
171171
'iStackCommons': 'com.sun.istack:istack-commons-runtime:4.0.1',
172172
'jacksonJDK8': "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion",
173173
'jacksonDataPropertyFormat': "com.fasterxml.jackson.dataformat:jackson-dataformat-properties:$jacksonVersion",
@@ -263,7 +263,7 @@ project.ext.externalDependency = [
263263
'springBeans': "org.springframework:spring-beans:$springVersion",
264264
'springContext': "org.springframework:spring-context:$springVersion",
265265
'springCore': "org.springframework:spring-core:$springVersion",
266-
'springDocUI': 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0',
266+
'springDocUI': 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.6',
267267
'springJdbc': "org.springframework:spring-jdbc:$springVersion",
268268
'springWeb': "org.springframework:spring-web:$springVersion",
269269
'springWebMVC': "org.springframework:spring-webmvc:$springVersion",
@@ -276,11 +276,11 @@ project.ext.externalDependency = [
276276
'springBootStarterValidation': "org.springframework.boot:spring-boot-starter-validation:$springBootVersion",
277277
'springKafka': "org.springframework.kafka:spring-kafka:$springKafkaVersion",
278278
'springActuator': "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion",
279-
'springRetry': "org.springframework.retry:spring-retry:2.0.6",
280-
'swaggerAnnotations': 'io.swagger.core.v3:swagger-annotations:2.2.15',
279+
'springRetry': "org.springframework.retry:spring-retry:2.0.11",
280+
'swaggerAnnotations': 'io.swagger.core.v3:swagger-annotations:2.2.30',
281281
'swaggerCli': 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.46',
282-
'swaggerCore': 'io.swagger.core.v3:swagger-core:2.2.7',
283-
'swaggerParser': 'io.swagger.parser.v3:swagger-parser:2.1.15',
282+
'swaggerCore': 'io.swagger.core.v3:swagger-core:2.2.30',
283+
'swaggerParser': 'io.swagger.parser.v3:swagger-parser:2.1.26',
284284
'springBootAutoconfigureJdk11': 'org.springframework.boot:spring-boot-autoconfigure:2.7.18',
285285
'testng': 'org.testng:testng:7.8.0',
286286
'testContainers': 'org.testcontainers:testcontainers:' + testContainersVersion,

datahub-upgrade/build.gradle

-12
Original file line numberDiff line numberDiff line change
@@ -158,18 +158,6 @@ task runRestoreIndicesUrn(type: Exec) {
158158
bootJar.getArchiveFile().get(), "-u", "RestoreIndices", "-a", "batchSize=100", "-a", "urnBasedPagination=true"
159159
}
160160

161-
task runNoCode(type: Exec) {
162-
dependsOn bootJar
163-
group = "Execution"
164-
description = "Run the NoCodeDataMigration process locally."
165-
environment "ENTITY_REGISTRY_CONFIG_PATH", "../metadata-models/src/main/resources/entity-registry.yml"
166-
commandLine "java", "-agentlib:jdwp=transport=dt_socket,address=5003,server=y,suspend=n",
167-
"-jar",
168-
"-Dkafka.schemaRegistry.url=http://localhost:8080/schema-registry/api",
169-
"-Dserver.port=8083",
170-
bootJar.getArchiveFile().get(), "-u", "NoCodeDataMigration", "-a", "batchSize=100", "-a", "dbType=MYSQL"
171-
}
172-
173161
docker {
174162
dependsOn(bootJar)
175163
name "${docker_registry}/${docker_repo}:${versionTag}"

datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/UpgradeCli.java

-12
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.linkedin.datahub.upgrade;
22

33
import com.linkedin.datahub.upgrade.impl.DefaultUpgradeManager;
4-
import com.linkedin.datahub.upgrade.nocode.NoCodeUpgrade;
5-
import com.linkedin.datahub.upgrade.nocodecleanup.NoCodeCleanupUpgrade;
64
import com.linkedin.datahub.upgrade.removeunknownaspects.RemoveUnknownAspects;
75
import com.linkedin.datahub.upgrade.restorebackup.RestoreBackup;
86
import com.linkedin.datahub.upgrade.restoreindices.RestoreIndices;
@@ -34,14 +32,6 @@ private static final class Args {
3432

3533
private final UpgradeManager _upgradeManager = new DefaultUpgradeManager();
3634

37-
@Inject
38-
@Named("noCodeUpgrade")
39-
private NoCodeUpgrade noCodeUpgrade;
40-
41-
@Inject
42-
@Named("noCodeCleanup")
43-
private NoCodeCleanupUpgrade noCodeCleanup;
44-
4535
@Inject
4636
@Named("restoreIndices")
4737
private RestoreIndices restoreIndices;
@@ -72,8 +62,6 @@ private static final class Args {
7262

7363
@Override
7464
public void run(String... cmdLineArgs) {
75-
_upgradeManager.register(noCodeUpgrade);
76-
_upgradeManager.register(noCodeCleanup);
7765
_upgradeManager.register(restoreIndices);
7866
_upgradeManager.register(restoreBackup);
7967
_upgradeManager.register(removeUnknownAspects);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.linkedin.datahub.upgrade.common;
2+
3+
public class Constants {
4+
private Constants() {}
5+
6+
public static final String CLEAN_ARG_NAME = "clean";
7+
}

datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearGraphServiceStep.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.linkedin.datahub.upgrade.common.steps;
22

3+
import static com.linkedin.datahub.upgrade.common.Constants.CLEAN_ARG_NAME;
4+
35
import com.linkedin.datahub.upgrade.UpgradeContext;
46
import com.linkedin.datahub.upgrade.UpgradeStep;
57
import com.linkedin.datahub.upgrade.UpgradeStepResult;
68
import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
7-
import com.linkedin.datahub.upgrade.nocode.NoCodeUpgrade;
89
import com.linkedin.metadata.graph.GraphService;
910
import com.linkedin.upgrade.DataHubUpgradeState;
1011
import java.util.function.Function;
@@ -31,7 +32,7 @@ public boolean skip(UpgradeContext context) {
3132
if (_alwaysRun) {
3233
return false;
3334
}
34-
if (context.parsedArgs().containsKey(NoCodeUpgrade.CLEAN_ARG_NAME)) {
35+
if (context.parsedArgs().containsKey(CLEAN_ARG_NAME)) {
3536
return false;
3637
}
3738
context.report().addLine("Cleanup has not been requested.");

datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearSearchServiceStep.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.linkedin.datahub.upgrade.common.steps;
22

3+
import static com.linkedin.datahub.upgrade.common.Constants.CLEAN_ARG_NAME;
4+
35
import com.linkedin.datahub.upgrade.UpgradeContext;
46
import com.linkedin.datahub.upgrade.UpgradeStep;
57
import com.linkedin.datahub.upgrade.UpgradeStepResult;
68
import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
7-
import com.linkedin.datahub.upgrade.nocode.NoCodeUpgrade;
89
import com.linkedin.metadata.search.EntitySearchService;
910
import com.linkedin.upgrade.DataHubUpgradeState;
1011
import java.util.function.Function;
@@ -30,7 +31,7 @@ public boolean skip(UpgradeContext context) {
3031
if (_alwaysRun) {
3132
return false;
3233
}
33-
if (context.parsedArgs().containsKey(NoCodeUpgrade.CLEAN_ARG_NAME)) {
34+
if (context.parsedArgs().containsKey(CLEAN_ARG_NAME)) {
3435
return false;
3536
}
3637
context.report().addLine("Cleanup has not been requested.");

datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/common/steps/ClearSystemMetadataServiceStep.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.linkedin.datahub.upgrade.common.steps;
22

3+
import static com.linkedin.datahub.upgrade.common.Constants.CLEAN_ARG_NAME;
4+
35
import com.linkedin.datahub.upgrade.UpgradeContext;
46
import com.linkedin.datahub.upgrade.UpgradeStep;
57
import com.linkedin.datahub.upgrade.UpgradeStepResult;
68
import com.linkedin.datahub.upgrade.impl.DefaultUpgradeStepResult;
7-
import com.linkedin.datahub.upgrade.nocode.NoCodeUpgrade;
89
import com.linkedin.metadata.systemmetadata.SystemMetadataService;
910
import com.linkedin.upgrade.DataHubUpgradeState;
1011
import java.util.function.Function;
@@ -30,7 +31,7 @@ public boolean skip(UpgradeContext context) {
3031
if (_alwaysRun) {
3132
return false;
3233
}
33-
if (context.parsedArgs().containsKey(NoCodeUpgrade.CLEAN_ARG_NAME)) {
34+
if (context.parsedArgs().containsKey(CLEAN_ARG_NAME)) {
3435
return false;
3536
}
3637
context.report().addLine("Cleanup has not been requested.");

datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/NoCodeCleanupConfig.java

-49
This file was deleted.

datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/config/NoCodeUpgradeConfig.java

-43
This file was deleted.

datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/nocode/CreateAspectTableStep.java

-88
This file was deleted.

0 commit comments

Comments
 (0)