Skip to content

Commit

Permalink
Upgrading to JDK17 and Spring Boot 3 and deprecating embedded hive cl…
Browse files Browse the repository at this point in the history
…ient support (#630)

* Move to Java 17

* update workflows for java 17

* set timestamp precision

* checkstyle

* better time truncate for tests only

* set docker platform, add module import

* Use jre17 for Tomcat container

* integrate thrift client with fast service

use thrift with fast service
additional fix

add back polaris test

* make rename transactional in thrift client

* back port embededclient + fastService test to thriftClient + fastService

commit

adas

* Upgrading to Spring Boot 3

* Cleaning up embedded tests that are no longer supported after JDK17 and Spring Boot 3 upgrade

* Removing commented out import

---------

Co-authored-by: Bryan Keller <[email protected]>
Co-authored-by: Yingjian Wu <[email protected]>
Co-authored-by: stevie9868 <[email protected]>
  • Loading branch information
4 people authored Feb 19, 2025
1 parent 7841ff6 commit 98f0c85
Show file tree
Hide file tree
Showing 150 changed files with 17,214 additions and 1,826 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/nebula-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# test against JDK 8
java: [ 8 ]
# test against JDK 17
java: [ 17 ]
name: CI with Java ${{ matrix.java }}
steps:
- uses: actions/checkout@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nebula-pr-functional-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# test against JDK 8
java: [ 8 ]
# test against JDK 17
java: [ 17 ]
name: Functional tests with Java ${{ matrix.java }}
steps:
- uses: actions/checkout@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nebula-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Setup jdk 8
- name: Setup jdk 17
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 17
- name: Login to Docker Hub
uses: docker/login-action@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nebula-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# test against JDK 8
java: [ 8 ]
# test against JDK 17
java: [ 17 ]
name: CI with Java ${{ matrix.java }}
steps:
- uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nebula-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 8
java-version: 17
- name: Login to Docker Hub
uses: docker/login-action@v1
with:
Expand Down
30 changes: 11 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ allprojects {

idea {
project {
jdkName = "8"
languageLevel = "8"
jdkName = "17"
languageLevel = "17"
vcs = "Git"
}
}
Expand All @@ -98,8 +98,8 @@ configure(javaProjects) {

group = "com.netflix.${githubProjectName}"

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

dependencyManagement {
imports {
Expand All @@ -110,7 +110,9 @@ configure(javaProjects) {
}
dependencies {
dependency("com.github.spotbugs:spotbugs-annotations:4.8.2")
dependency("org.codehaus.groovy:groovy-all:2.5.9")
dependency("org.apache.groovy:groovy:4.0.24")
dependency("org.apache.groovy:groovy-all:4.0.24")
dependency("org.codehaus.groovy:groovy:3.0.9")
dependencySet(group: "org.ow2.asm", version: "9.2") {
entry "asm"
entry "asm-analysis"
Expand All @@ -126,11 +128,7 @@ configure(javaProjects) {
dependencySet(group: "com.netflix.spectator", version: "1.3.9") {
entry "spectator-api"
}
dependency("io.springfox:springfox-boot-starter:3.0.0")
dependencySet(group: "io.swagger", version: "1.6.2") {
entry "swagger-annotations"
entry "swagger-jersey2-jaxrs"
}
dependency("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0")
dependency("de.danielbechler:java-object-diff:0.91.1")
dependency("io.airlift:testing-mysql-server:0.1")
dependency("net.sf.dozer:dozer:5.5.1")
Expand Down Expand Up @@ -178,14 +176,14 @@ configure(javaProjects) {
* Runtime Dependencies
*******************************/
implementation('com.zaxxer:HikariCP')
implementation('org.hibernate:hibernate-core')
implementation('org.springframework.boot:spring-boot-starter-validation')

/*******************************
* Test Dependencies
*******************************/
testImplementation("log4j:log4j")
testImplementation("cglib:cglib-nodep")
testImplementation("org.codehaus.groovy:groovy-all")
testImplementation("org.apache.groovy:groovy-all")
testImplementation("org.codehaus.gpars:gpars")
testImplementation("org.objenesis:objenesis:3.2")
testImplementation("org.spockframework:spock-core")
Expand All @@ -195,13 +193,6 @@ configure(javaProjects) {
exclude group: 'com.vaadin.external.google', module: 'android-json'
}
testRuntimeOnly("org.hsqldb:hsqldb")
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1'
testImplementation("org.junit.jupiter:junit-jupiter-api:5.4.2")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.4.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.2")
testRuntimeOnly "org.junit.platform:junit-platform-commons:1.7.0"
testImplementation 'org.junit.platform:junit-platform-launcher:1.8.1'
testImplementation 'org.junit.platform:junit-platform-runner:1.8.1'
}

compileJava {
Expand Down Expand Up @@ -251,6 +242,7 @@ configure(javaProjects) {
exceptionFormat = "full"
events "PASSED", "FAILED", "SKIPPED"
}
jvmArgs('--add-opens=java.base/java.lang.invoke=ALL-UNNAMED')
}

javadoc {
Expand Down
1 change: 1 addition & 0 deletions codequality/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
<property name="allowThrowsTagsForSubclasses" value="true"/>
<property name="allowUndeclaredRTE" value="true"/>
<property name="allowMissingPropertyJavadoc" value="true"/>
<property name="suppressLoadErrors" value="true"/>
</module>

<!-- Custom Checkstyle Check to validate Javadoc. -->
Expand Down
32 changes: 32 additions & 0 deletions dependencies.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"annotationProcessor": {
"org.projectlombok:lombok": {
"locked": "1.18.30"
}
},
"compileClasspath": {
"org.projectlombok:lombok": {
"locked": "1.18.30"
}
},
"jacocoAgent": {
"org.jacoco:org.jacoco.agent": {
"locked": "0.8.8"
}
},
"jacocoAnt": {
"org.jacoco:org.jacoco.ant": {
"locked": "0.8.8"
}
},
"testAnnotationProcessor": {
"org.projectlombok:lombok": {
"locked": "1.18.30"
}
},
"testCompileClasspath": {
"org.projectlombok:lombok": {
"locked": "1.18.30"
}
}
}
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
## Spring Dependency Versions

# Used in documentation and for including the Gradle plugin
spring_boot_version=2.7.11
spring_boot_version=3.2.12
spring_cloud_version=Hoxton.SR8
google_guice_version=4.1.0
spock_version=2.1-groovy-3.0
google_guice_version=7.0.0
spock_version=2.3-groovy-4.0

## Override Spring Boot versions

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 98f0c85

Please sign in to comment.