summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author窦凤虎 <[email protected]>2024-02-19 01:42:08 +0000
committer窦凤虎 <[email protected]>2024-02-19 01:42:08 +0000
commit346dda6ac57bc8ead0939f30f63f926a0d3c07e1 (patch)
treeeafcece1728601133e9d468d1e2b1d5bfd653f48
parente212210312ad5b8a5ff2edd022ac860a711a9312 (diff)
parent35a0989c488175acbc4505a3babc26c71d7ac41b (diff)
Merge branch 'feature/jdk11' into 'develop'
A Java 11 JRE/JDK is required See merge request galaxy/platform/groot-stream!19
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--README.md4
-rw-r--r--config/grootstream_job_example.yaml (renamed from config/groot_stream_job_example.yaml)0
-rw-r--r--pom.xml2
4 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12c8746..387ba38 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: 192.168.40.153:9080/common/maven:3.8.2-jdk-8-slim
+image: 192.168.40.153:9080/common/maven:3.8.1-openjdk-11-slim
variables:
MAVEN_CLI_OPTS: --batch-mode --errors --show-version
diff --git a/README.md b/README.md
index 92c364b..deae0f5 100644
--- a/README.md
+++ b/README.md
@@ -96,12 +96,12 @@ Can be started by a daemon with `-d`.
- Run the following command to start the groot-stream server for Standalone Mode:
```shell
cd "groot-stream-${version}"
-./bin/start.sh -c ./config/groot_stream_job_example.yaml --target remote -d -n inline-to-print-job
+./bin/start.sh -c ./config/grootstream_job_example.yaml --target remote -d -n inline-to-print-job
```
- Run the following command to start the groot-stream server for Yarn Per-job Mode:
```shell
cd "groot-stream-${version}"
-./bin/start.sh -c ./config/groot_stream_job_example.yaml --target yarn-per-job -d -n inline-to-print-job
+./bin/start.sh -c ./config/grootstream_job_example.yaml --target yarn-per-job -d -n inline-to-print-job
```
### Configuring
diff --git a/config/groot_stream_job_example.yaml b/config/grootstream_job_example.yaml
index daf6e32..daf6e32 100644
--- a/config/groot_stream_job_example.yaml
+++ b/config/grootstream_job_example.yaml
diff --git a/pom.xml b/pom.xml
index dc861e3..b2d3acc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<properties>
<revision>1.0.0</revision>
- <java.version>8</java.version>
+ <java.version>11</java.version>
<flink.scope>provided</flink.scope>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>${java.version}</maven.compiler.source>