Skip to content

Commit 61b8b63

Browse files
stas-panasiukcdubycarolyndubyvpavlenko-cv
authored
[CYB-77] Java 11 support (#75)
* [CYB-3] java 8 GraalVM * [CYB-3] GraalJS implementation * [CYB-3] Scoring fix * [CYB-3] Concurrent GraalJS eval of the same function fix * [CYB-77] Java 11 update * [CYB-164] default JS engine changed to JS_NASHORN * [CYB-3] Lint fixes + Nashorn deprecations logs * [CYB-77] Version bump to 2.4.0 * [CYB-77] JS engine automatic validation and switchover * [CYB-77] Tests fix across Java8+Java11 * [CYB-77] maven plugin version update * [CYB-77] nashorn synchronized to ensure correct execution --------- Co-authored-by: cduby <[email protected]> Co-authored-by: Carolyn Duby <[email protected]> Co-authored-by: Vladyslav Pavlenko <[email protected]> Co-authored-by: vladyslav.pavlenko <[email protected]>
1 parent 5199d12 commit 61b8b63

File tree

67 files changed

+212
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+212
-130
lines changed

‎.devcontainer.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"image": "maven:3-eclipse-temurin-11"
3+
}

‎flink-cyber/caracal-generator/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/caracal-parser/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/cyber-csd/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222

2323
<artifactId>cyber-csd</artifactId>

‎flink-cyber/cyber-functions/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/cyber-jobs/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323
<artifactId>cyber-jobs</artifactId>

‎flink-cyber/cyber-parcel/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ under the License.
2323
<parent>
2424
<artifactId>flink-cyber</artifactId>
2525
<groupId>com.cloudera.cyber</groupId>
26-
<version>2.3.1</version>
26+
<version>2.4.0</version>
2727
</parent>
2828

2929
<artifactId>cyber-parcel</artifactId>

‎flink-cyber/cyber-services/cyber-service-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.cloudera.cyber</groupId>
66
<artifactId>cyber-services</artifactId>
7-
<version>2.3.1</version>
7+
<version>2.4.0</version>
88
</parent>
99
<artifactId>cyber-service-common</artifactId>
1010
<name>Archetype - cyber-service-common</name>

‎flink-cyber/cyber-services/cyber-worker-service/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.cloudera.cyber</groupId>
77
<artifactId>cyber-services</artifactId>
8-
<version>2.3.1</version>
8+
<version>2.4.0</version>
99
</parent>
1010
<artifactId>cyber-worker-service</artifactId>
1111
<name>cyber-worker-service</name>

‎flink-cyber/cyber-services/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.cloudera.cyber</groupId>
66
<artifactId>flink-cyber</artifactId>
7-
<version>2.3.1</version>
7+
<version>2.4.0</version>
88
</parent>
99
<artifactId>cyber-services</artifactId>
1010
<packaging>pom</packaging>

‎flink-cyber/data-management/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/data-management/retention-cleaner/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>data-management</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

@@ -118,7 +118,7 @@
118118
<plugin>
119119
<groupId>org.apache.maven.plugins</groupId>
120120
<artifactId>maven-surefire-plugin</artifactId>
121-
<version>3.0.0-M5</version>
121+
<version>${maven-surefire-plugin.version}</version>
122122
<dependencies>
123123
<dependency>
124124
<groupId>org.junit.jupiter</groupId>

‎flink-cyber/flink-alert-scoring-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-alert-scoring/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-commands/json-commands/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<artifactId>flink-commands</artifactId>
2121
<groupId>com.cloudera.cyber</groupId>
22-
<version>2.3.1</version>
22+
<version>2.4.0</version>
2323
</parent>
2424

2525
<artifactId>json-commands</artifactId>
@@ -86,10 +86,6 @@
8686
<plugin>
8787
<groupId>org.apache.maven.plugins</groupId>
8888
<artifactId>maven-compiler-plugin</artifactId>
89-
<configuration>
90-
<source>8</source>
91-
<target>8</target>
92-
</configuration>
9389
</plugin>
9490

9591
<!-- We use the maven-shade plugin to create a fat jar that contains all necessary dependencies. -->

‎flink-cyber/flink-commands/kafka-commands/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<artifactId>flink-commands</artifactId>
2121
<groupId>com.cloudera.cyber</groupId>
22-
<version>2.3.1</version>
22+
<version>2.4.0</version>
2323
</parent>
2424

2525
<artifactId>kafka-commands</artifactId>
@@ -89,10 +89,6 @@
8989
<plugin>
9090
<groupId>org.apache.maven.plugins</groupId>
9191
<artifactId>maven-compiler-plugin</artifactId>
92-
<configuration>
93-
<source>8</source>
94-
<target>8</target>
95-
</configuration>
9692
</plugin>
9793

9894
<!-- We use the maven-shade plugin to create a fat jar that contains all necessary dependencies. -->

‎flink-cyber/flink-commands/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-commands/scoring-commands/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-commands</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323
<packaging>jar</packaging>

‎flink-cyber/flink-cyber-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323
<packaging>jar</packaging>

‎flink-cyber/flink-dedupe/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-enrichment/flink-enrichment-cidr/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-enrichment</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-enrichment/flink-enrichment-combined/pom.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-enrichment</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

@@ -27,6 +27,10 @@
2727

2828
<artifactId>flink-enrichment-combined</artifactId>
2929
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.hadoop</groupId>
32+
<artifactId>hadoop-hdfs-client</artifactId>
33+
</dependency>
3034
<dependency>
3135
<groupId>com.cloudera.cyber</groupId>
3236
<artifactId>flink-cyber-api</artifactId>
@@ -67,7 +71,6 @@
6771
<groupId>com.cloudera.cyber</groupId>
6872
<artifactId>flink-enrichment-geocode</artifactId>
6973
<version>${project.parent.version}</version>
70-
<scope>compile</scope>
7174
</dependency>
7275
<dependency>
7376
<groupId>com.cloudera.cyber</groupId>

‎flink-cyber/flink-enrichment/flink-enrichment-geocode/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-enrichment</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-enrichment/flink-enrichment-load/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
<relativePath>../../pom.xml</relativePath>
2222
</parent>
2323
<modelVersion>4.0.0</modelVersion>

‎flink-cyber/flink-enrichment/flink-enrichment-lookup-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-enrichment</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-enrichment/flink-enrichment-lookup-hbase/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-enrichment</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-enrichment/flink-enrichment-lookup-raw/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-enrichment</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-enrichment/flink-enrichment-lookup-rest/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-enrichment</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-enrichment/flink-enrichment-rules/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-enrichment</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-enrichment/flink-enrichment-stellar/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-enrichment</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

@@ -74,13 +74,14 @@
7474
<dependency>
7575
<groupId>org.apache.hadoop</groupId>
7676
<artifactId>hadoop-common</artifactId>
77+
<version>${hadoop.version}</version>
78+
<scope>provided</scope>
7779
<exclusions>
7880
<exclusion>
7981
<groupId>org.slf4j</groupId>
8082
<artifactId>slf4j-log4j12</artifactId>
8183
</exclusion>
8284
</exclusions>
83-
<version>${hadoop.version}</version>
8485
</dependency>
8586

8687
<dependency>

‎flink-cyber/flink-enrichment/flink-enrichment-threatq/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-enrichment</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-enrichment/metron-enrichment-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<groupId>com.cloudera.cyber</groupId>
3131
<artifactId>flink-enrichment</artifactId>
32-
<version>2.3.1</version>
32+
<version>2.4.0</version>
3333
</parent>
3434
<modelVersion>4.0.0</modelVersion>
3535

‎flink-cyber/flink-enrichment/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-hbase-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-cyber</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

‎flink-cyber/flink-indexing/flink-indexing-elastic/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<artifactId>flink-indexing</artifactId>
1919
<groupId>com.cloudera.cyber</groupId>
20-
<version>2.3.1</version>
20+
<version>2.4.0</version>
2121
</parent>
2222
<modelVersion>4.0.0</modelVersion>
2323

@@ -112,7 +112,7 @@
112112
<plugin>
113113
<groupId>org.apache.maven.plugins</groupId>
114114
<artifactId>maven-shade-plugin</artifactId>
115-
<version>3.0.0</version>
115+
<version>${maven-shade-plugin.version}</version>
116116
<executions>
117117
<!-- Run shade goal on package phase -->
118118
<execution>

0 commit comments

Comments
 (0)