fix some test , apache#4036

hansva · Jun 10, 2024 · 1edb46e · 1edb46e
1 parent d5ca041
commit 1edb46e
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 4 deletions.
diff --git a/assemblies/lib/pom.xml b/assemblies/lib/pom.xml
@@ -130,6 +130,18 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>${byte-buddy.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>net.sf.flexjson</groupId>
             <artifactId>flexjson</artifactId>
@@ -146,7 +158,6 @@
             <artifactId>hadoop-hdfs-client</artifactId>
             <version>${hadoop.version}</version>
         </dependency>
-        <!-- hop -->
         <dependency>
             <groupId>org.apache.hop</groupId>
             <artifactId>hop-core</artifactId>

diff --git a/assemblies/plugins/transforms/script/pom.xml b/assemblies/plugins/transforms/script/pom.xml
@@ -48,6 +48,11 @@
             <artifactId>hop-transform-script</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.openjdk.nashorn</groupId>
+            <artifactId>nashorn-core</artifactId>
+            <version>15.4</version>
+        </dependency>
         <dependency>
             <groupId>org.python</groupId>
             <artifactId>jython-standalone</artifactId>

diff --git a/assemblies/plugins/transforms/script/src/assembly/assembly.xml b/assemblies/plugins/transforms/script/src/assembly/assembly.xml
@@ -53,6 +53,11 @@
                 <include>org.apache.groovy:groovy:jar</include>
                 <include>org.apache.groovy:groovy-jsr223:jar</include>
                 <include>org.python:jython-standalone:jar</include>
+                <include>org.openjdk.nashorn:nashorn-core:jar</include>
+                <include>org.ow2.asm:asm:jar</include>
+                <include>org.ow2.asm:asm-commons:jar</include>
+                <include>org.ow2.asm:asm-tree:jar</include>
+                <include>org.ow2.asm:asm-util:jar</include>
             </includes>
         </dependencySet>
     </dependencySets>

diff --git a/docker/integration-tests/Dockerfile.unit-tests b/docker/integration-tests/Dockerfile.unit-tests
@@ -85,7 +85,8 @@ RUN chown -R ${JENKINS_USER}:${JENKINS_GROUP} ${DEPLOYMENT_PATH}/hop \
   && cd ${DEPLOYMENT_PATH}/hop \
   && ./hop-conf.sh --generate-fat-jar=/tmp/hop-fatjar.jar \
   # Download the Vertica JDBC driver
-  && wget -c https://repo1.maven.org/maven2/com/vertica/jdbc/vertica-jdbc/23.4.0-0/vertica-jdbc-23.4.0-0.jar -O /opt/hop/lib/jdbc/vertica-jdbc-23.4.0-0.jar
+  && wget -c https://repo1.maven.org/maven2/com/vertica/jdbc/vertica-jdbc/23.4.0-0/vertica-jdbc-23.4.0-0.jar -O /opt/hop/lib/jdbc/vertica-jdbc-23.4.0-0.jar \
+  && wget -c https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.4/nashorn-core-15.4.jar -O /opt/hop/plugins/transforms/script/lib/nashorn-core-15.4.jar
 
 # make volume available so that hop pipeline and workflow files can be provided easily
 VOLUME ["/files"]
@@ -95,3 +96,5 @@ ENV GOOGLE_APPLICATION_CREDENTIALS="/tmp/google-key-apache-hop-it.json"
 WORKDIR /home/${JENKINS_USER}
 # CMD ["/bin/bash"]
 ENTRYPOINT []
+
+
diff --git a/docker/integration-tests/integration-tests-flink.yaml b/docker/integration-tests/integration-tests-flink.yaml
@@ -27,7 +27,7 @@ services:
       - taskmanager
 
   jobmanager:
-    image: flink:1.16.2-java11
+    image: flink:1.18.1-java17
     ports:
       - "8081"
     command: jobmanager
@@ -37,7 +37,7 @@ services:
         jobmanager.rpc.address: jobmanager        
 
   taskmanager:
-    image: flink:1.16.2-java11
+    image: flink:1.18.1-java17
     depends_on:
       - jobmanager
     command: taskmanager

diff --git a/integration-tests/flink/disabled.txt b/integration-tests/flink/disabled.txt
@@ -0,0 +1,17 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
diff --git a/integration-tests/spreadsheet/files/sample-file-append.xlsx b/integration-tests/spreadsheet/files/sample-file-append.xlsx
diff --git a/...ransforms/script/src/main/java/org/apache/hop/pipeline/transforms/script/ScriptUtils.java b/...ransforms/script/src/main/java/org/apache/hop/pipeline/transforms/script/ScriptUtils.java
@@ -105,6 +105,7 @@ private static ScriptEngineManager getScriptEngineManager() {
       System.setProperty(
           "org.jruby.embed.localvariable.behavior",
           "persistent"); // required for JRuby, transparent
+      System.setProperty("nashorn.args", "--language=es6");
       // for others
       scriptEngineManager = new ScriptEngineManager(ScriptUtils.class.getClassLoader());
     }