Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Update to Java 17 #3733

Merged
merged 16 commits into from
Sep 16, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Binaries are available from [Netflix OSS Maven](https://artifacts.netflix.net/ne
* The indexing backend is [Elasticsearch](https://www.elastic.co/) (6.x)

## Other Requirements
* JDK 11+
* JDK 17+
* UI requires Node 14 to build. Earlier Node versions may work but is untested.

## Get Support
Expand Down
12 changes: 12 additions & 0 deletions awss3-storage/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,12 @@
"com.netflix.conductor:conductor-core"
],
"locked": "2.17.2"
},
"org.openjdk.nashorn:nashorn-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
],
"locked": "15.4"
}
},
"testCompileClasspath": {
Expand Down Expand Up @@ -392,6 +398,12 @@
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.openjdk.nashorn:nashorn-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
],
"locked": "15.4"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
},
Expand Down
12 changes: 12 additions & 0 deletions awssqs-event-queue/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,12 @@
"com.netflix.conductor:conductor-core"
],
"locked": "2.17.2"
},
"org.openjdk.nashorn:nashorn-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
],
"locked": "15.4"
}
},
"testCompileClasspath": {
Expand Down Expand Up @@ -413,6 +419,12 @@
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.openjdk.nashorn:nashorn-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
],
"locked": "15.4"
},
"org.springframework.boot:spring-boot-starter": {
"locked": "2.7.3"
},
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ allprojects {
apply plugin: 'java-library'
apply plugin: 'project-report'

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

group = 'com.netflix.conductor'

Expand Down Expand Up @@ -164,11 +164,11 @@ allprojects {
}
}

// all client and their related modules are published with Java 11 compatibility
// all client and their related modules are published with Java 17 compatibility
["annotations", "common", "client", "client-spring", "grpc", "grpc-client"].each {
project(":conductor-$it") {
compileJava {
options.release = 11
options.release = 17
}
}
}
Expand Down
16 changes: 14 additions & 2 deletions cassandra-persistence/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,12 @@
"com.netflix.conductor:conductor-core"
],
"locked": "2.17.2"
},
"org.openjdk.nashorn:nashorn-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
],
"locked": "15.4"
}
},
"testCompileClasspath": {
Expand Down Expand Up @@ -226,7 +232,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.13"
"locked": "2.5.22"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
Expand Down Expand Up @@ -408,11 +414,17 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.13"
"locked": "2.5.22"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.openjdk.nashorn:nashorn-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
],
"locked": "15.4"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
},
Expand Down
12 changes: 12 additions & 0 deletions client-spring/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,12 @@
],
"locked": "2.35"
},
"org.openjdk.nashorn:nashorn-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "15.4"
},
"org.slf4j:slf4j-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client"
Expand Down Expand Up @@ -446,6 +452,12 @@
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.openjdk.nashorn:nashorn-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-java-sdk"
],
"locked": "15.4"
},
"org.slf4j:slf4j-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-client"
Expand Down
4 changes: 2 additions & 2 deletions client/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.13"
"locked": "2.5.22"
},
"org.glassfish.jersey.core:jersey-common": {
"locked": "2.22.2"
Expand Down Expand Up @@ -361,7 +361,7 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.13"
"locked": "2.5.22"
},
"org.glassfish.jersey.core:jersey-common": {
"locked": "2.22.2"
Expand Down
2 changes: 2 additions & 0 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ dependencies {

implementation "com.github.ben-manes.caffeine:caffeine"

implementation "org.openjdk.nashorn:nashorn-core:15.4"

// JAXB is not bundled with Java 11, dependencies added explicitly
// These are needed by Apache BVAL
implementation "jakarta.xml.bind:jakarta.xml.bind-api:${revJAXB}"
Expand Down
16 changes: 14 additions & 2 deletions core/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.openjdk.nashorn:nashorn-core": {
"locked": "15.4"
},
"org.springframework.boot:spring-boot-starter": {
"locked": "2.7.3"
},
Expand Down Expand Up @@ -182,6 +185,9 @@
"com.netflix.conductor:conductor-common"
],
"locked": "2.17.2"
},
"org.openjdk.nashorn:nashorn-core": {
"locked": "15.4"
}
},
"testCompileClasspath": {
Expand Down Expand Up @@ -249,14 +255,17 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.13"
"locked": "2.5.22"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "2.3.3"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.openjdk.nashorn:nashorn-core": {
"locked": "15.4"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
},
Expand Down Expand Up @@ -388,14 +397,17 @@
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "2.5.13"
"locked": "2.5.22"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "2.3.3"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.openjdk.nashorn:nashorn-core": {
"locked": "15.4"
},
"org.spockframework:spock-core": {
"locked": "1.3-groovy-2.5"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@

import javax.script.Bindings;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;

import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;

public class ScriptEvaluator {

private static final ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn");
private static final ScriptEngine engine = new NashornScriptEngineFactory().getScriptEngine();

private ScriptEvaluator() {}

Expand Down
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ext {
revElasticSearch6 = '6.8.12'
revEmbeddedRedis = '0.6'
revEurekaClient = '1.10.10'
revGroovy = '2.5.13'
revGroovy = '2.5.22'
revGrpc = '1.+'
revGuava = '30.0-jre'
revHamcrestAllMatchers = '1.8'
Expand Down
2 changes: 1 addition & 1 deletion docker/ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11-jdk
FROM openjdk:17-jdk

WORKDIR /workspace/conductor
COPY . /workspace/conductor
Expand Down
4 changes: 2 additions & 2 deletions docker/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# ===========================================================================================================
# 0. Builder stage
# ===========================================================================================================
FROM eclipse-temurin:11-jdk-jammy AS builder
FROM eclipse-temurin:17-jdk-focal AS builder

LABEL maintainer="Netflix OSS <conductor@netflix.com>"

Expand All @@ -19,7 +19,7 @@ RUN ./gradlew build -x test --stacktrace
# ===========================================================================================================
# 1. Bin stage
# ===========================================================================================================
FROM eclipse-temurin:11-jre-jammy
FROM eclipse-temurin:17-jre-focal

LABEL maintainer="Netflix OSS <conductor@netflix.com>"

Expand Down
4 changes: 2 additions & 2 deletions docker/serverAndUI/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# ===========================================================================================================
# 0. Builder stage
# ===========================================================================================================
FROM openjdk:11-jdk AS builder
FROM openjdk:17-jdk AS builder
LABEL maintainer="Netflix OSS <conductor@netflix.com>"

# Install Node
Expand Down Expand Up @@ -36,7 +36,7 @@ RUN yarn install && yarn build
# ===========================================================================================================

FROM nginx:alpine
RUN apk add openjdk11-jre
RUN apk add openjdk17-jre

LABEL maintainer="Netflix OSS <conductor@netflix.com>"

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/gettingstarted/source.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ In this article we will explore how you can set up Netflix Conductor on your loc
features.

### Prerequisites
1. JDK 11 or greater
1. JDK 17 or greater
2. (Optional) Docker if you want to run tests. You can install docker from [here](https://www.docker.com/get-started/).
3. Node for building and running UI. Instructions at [https://nodejs.org](https://nodejs.org).
4. Yarn for building and running UI. Instructions at [https://classic.yarnpkg.com/en/docs/install](https://classic.yarnpkg.com/en/docs/install).
Expand Down
12 changes: 12 additions & 0 deletions es6-persistence/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,12 @@
},
"org.elasticsearch.client:transport": {
"locked": "6.8.12"
},
"org.openjdk.nashorn:nashorn-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
],
"locked": "15.4"
}
},
"testCompileClasspath": {
Expand Down Expand Up @@ -449,6 +455,12 @@
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.openjdk.nashorn:nashorn-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-core"
],
"locked": "15.4"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.3"
},
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionSha256Sum=a01b6587e15fe7ed120a0ee299c25982a1eee045abd6a9dd5e216b2f628ef9ac
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists