This is an automated email from the ASF dual-hosted git repository.

jongyoul pushed a change to branch branch-0.11
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


    from 6c85e87967 [MINOR][NOTICE] Update copyright year in NOTICE (#4666)
     add 3d700fbe73 [ZEPPELIN-5967] Remove support for deb packaging (#4670)
     add b9cb004515 [ZEPPELIN-5946][FOLLOWUP] Clean up code for legacy Spark 
versions (#4668)
     add b5d75d4af3 [ZEPPELIN-5968] Bump Jetty 9.4.52.v20230823 (#4673)
     add afd4c3ec10 [ZEPPELIN-5966] Support Spark 3.5 (#4665)
     add fb9d2045f3 Bump @babel/traverse from 7.6.3 to 7.23.2 in 
/zeppelin-web-angular (#4679)
     add 9680241285 Bump guava from 24.1.1-jre to 32.0.0-jre in /shell (#4615)
     add efadcd6aea [ZEPPELIN-5972] Support Flink 1.17 (#4677)
     add 5e68a916ee [MINOR] Remove unused conda env for Flink 1.12 (#4680)
     add 579074ea25 [ZEPPELIN-3725] Fix SQL injection (#4676)
     add 4352a10ab9 [ZEPPELIN-5875] Add: z.show works with subtypes of 
DataFrame (#4683)
     add 9dadde36d8 [ZEPPELIN-5978] Remove support for old Flink 1.13 and 1.14 
(#4688)
     add 73e1aa37d4 [ZEPPELIN-5979] Support and use Python 3.9 in default 
(#4690)
     add 6a388a9b54 [MINOR] Fix log message in YarnAppMonitor (#4695)
     add ebb03865f2 [ZEPPELIN-5980] Merge zeppelin-display into 
spark-interperter (#4692)
     add a3723c552a [ZEPPELIN-5983] Upgrade to NodeJS 16 (#4696)
     add 464761e3a3 [ZEPPELIN-5982] Merge flink-scala-parent module into 
flink-scala-2.12 (#4694)
     add c9c3437a11 [ZEPPELIN-5970][ZEPPELIN-5971] bugs occur when 
zeppelin.livy.tableWithUTFCharacters is enabled (#4675)
     add 56da029ffe remove global scala-* profiles (#4698)

No new revisions were added by this update.

Summary of changes:
 .github/workflows/core.yml                         |    73 +-
 .github/workflows/frontend.yml                     |     8 +-
 .gitignore                                         |     7 +
 cassandra/pom.xml                                  |     6 +-
 .../zeppelin/cassandra/BoundValuesParserTest.scala |     8 +-
 .../zeppelin/cassandra/CqlFormatterTest.scala      |     8 +-
 .../zeppelin/cassandra/EnhancedSessionTest.scala   |     4 +-
 .../zeppelin/cassandra/ParagraphParserTest.scala   |    15 +-
 dev/change_scala_version.sh                        |    75 -
 dev/create_release.sh                              |     5 +-
 dev/publish_release.sh                             |     6 +-
 .../contribution/useful_developer_tools.md         |     7 +-
 docs/interpreter/flink.md                          |    12 +-
 docs/interpreter/python.md                         |     2 +-
 docs/interpreter/r.md                              |     2 +-
 docs/setup/basics/how_to_build.md                  |    15 +-
 flink/README.md                                    |    37 +-
 flink/flink-scala-2.11/flink-scala-parent          |     1 -
 flink/flink-scala-2.11/pom.xml                     |    83 -
 .../org/apache/zeppelin/flink/FlinkExprTyper.scala |    75 -
 .../zeppelin/flink/FlinkILoopInterpreter.scala     |   240 -
 .../zeppelin/flink/FlinkScala211Interpreter.scala  |    54 -
 flink/flink-scala-2.12/flink-scala-parent          |     1 -
 flink/flink-scala-2.12/pom.xml                     |   850 +-
 .../flink/ApplicationModeExecutionEnvironment.java |     0
 .../flink/ApplicationModeStreamEnvironment.java    |     0
 .../zeppelin/flink/FlinkBatchSqlInterpreter.java   |     0
 .../apache/zeppelin/flink/FlinkInterpreter.java    |     0
 .../apache/zeppelin/flink/FlinkSqlInterpreter.java |     0
 .../zeppelin/flink/FlinkStreamSqlInterpreter.java  |     0
 .../org/apache/zeppelin/flink/HadoopUtils.java     |     0
 .../apache/zeppelin/flink/IPyFlinkInterpreter.java |     0
 .../java/org/apache/zeppelin/flink/JobManager.java |     0
 .../apache/zeppelin/flink/PyFlinkInterpreter.java  |     0
 .../org/apache/zeppelin/flink/TableEnvFactory.java |     0
 .../apache/zeppelin/flink/internal/JarHelper.java  |     0
 .../flink/internal/ScalaShellEnvironment.java      |     0
 .../internal/ScalaShellStreamEnvironment.java      |     0
 .../zeppelin/flink/sql/AbstractStreamSqlJob.java   |     0
 .../zeppelin/flink/sql/AppendStreamSqlJob.java     |     0
 .../zeppelin/flink/sql/SingleRowStreamSqlJob.java  |     0
 .../zeppelin/flink/sql/UpdateStreamSqlJob.java     |     0
 .../src/main/resources/interpreter-setting.json    |     0
 .../src/main/resources/python/zeppelin_ipyflink.py |     0
 .../src/main/resources/python/zeppelin_pyflink.py  |     0
 .../zeppelin/flink/FlinkScalaInterpreter.scala     |     0
 .../zeppelin/flink/FlinkZeppelinContext.scala      |     0
 .../zeppelin/flink/internal/FlinkILoop.scala       |     0
 .../zeppelin/flink/internal/FlinkShell.scala       |     0
 .../flink/FlinkBatchSqlInterpreterTest.java        |     0
 .../zeppelin/flink/FlinkInterpreterTest.java       |     0
 .../zeppelin/flink/FlinkSqlInterpreterTest.java    |     7 +-
 .../flink/FlinkStreamSqlInterpreterTest.java       |     0
 .../zeppelin/flink/IPyFlinkInterpreterTest.java    |     0
 .../java/org/apache/zeppelin/flink/JavaLower.java  |     0
 .../java/org/apache/zeppelin/flink/JavaUpper.java  |     0
 .../org/apache/zeppelin/flink/JobManagerTest.java  |     0
 .../zeppelin/flink/PyFlinkInterpreterTest.java     |     0
 .../src/test/resources/flink-conf.yaml             |     0
 .../src/test/resources/init_stream.scala2          |     0
 .../src/test/resources/log4j.properties            |     0
 .../src/test/resources/log4j2.properties           |     0
 flink/flink-scala-parent/pom.xml                   |  1036 -
 .../java/org/apache/zeppelin/flink/FlinkShims.java |     3 +
 flink/flink1.13-shims/pom.xml                      |   213 -
 .../org/apache/zeppelin/flink/Flink113Shims.java   |   380 -
 .../zeppelin/flink/Flink113SqlInterpreter.java     |   562 -
 .../flink/shims113/Flink113ScalaShims.scala        |    36 -
 .../flink/shims114/CollectStreamTableSink.java     |    97 -
 .../org/apache/zeppelin/flink/Flink116Shims.java   |     2 -
 flink/{flink1.14-shims => flink1.17-shims}/pom.xml |    19 +-
 .../org/apache/zeppelin/flink/Flink117Shims.java}  |    89 +-
 .../zeppelin/flink/Flink117SqlInterpreter.java}    |    12 +-
 .../java/org/apache/zeppelin/flink/PrintUtils.java |     0
 .../zeppelin/flink/TimestampStringUtils.java       |     0
 .../flink/shims117}/CollectStreamTableSink.java    |     2 +-
 flink/pom.xml                                      |    52 +-
 .../zeppelin/livy/LivySparkSQLInterpreter.java     |    36 +-
 .../zeppelin/livy/LivySQLInterpreterTest.java      |    14 +-
 pom.xml                                            |    33 +-
 .../apache/zeppelin/python/IPythonInterpreter.java |     8 +-
 .../apache/zeppelin/python/PythonInterpreter.java  |     9 +-
 .../org/apache/zeppelin/python/PythonUtils.java    |    41 +-
 .../src/main/resources/python/zeppelin_context.py  |     2 +-
 .../zeppelin/python/BasePythonInterpreterTest.java |    16 +
 .../java/org/apache/zeppelin/r/IRInterpreter.java  |    11 +-
 .../java/org/apache/zeppelin/r/RInterpreter.java   |    11 +-
 .../java/org/apache/zeppelin/r/SparkRBackend.java  |    17 +-
 .../main/java/org/apache/zeppelin/r/ZeppelinR.java |     6 +-
 shell/pom.xml                                      |     2 +-
 spark/interpreter/pom.xml                          |   125 +-
 .../apache/zeppelin/spark/IPySparkInterpreter.java |     4 -
 .../apache/zeppelin/spark/PySparkInterpreter.java  |     2 -
 .../apache/zeppelin/spark/SparkIRInterpreter.java  |    35 +-
 .../apache/zeppelin/spark/SparkInterpreter.java    |     6 -
 .../apache/zeppelin/spark/SparkRInterpreter.java   |    19 +-
 .../main/java/org/apache/zeppelin/spark/Utils.java |    21 +-
 .../display/angular/AbstractAngularElem.scala      |     0
 .../display/angular/AbstractAngularModel.scala     |     0
 .../angular/notebookscope/AngularElem.scala        |     4 +-
 .../angular/notebookscope/AngularModel.scala       |     0
 .../angular/paragraphscope/AngularElem.scala       |     4 +-
 .../angular/paragraphscope/AngularModel.scala      |     0
 .../zeppelin/spark/SparkInterpreterTest.java       |     4 +-
 .../org/apache/zeppelin/spark/SparkShimsTest.java  |     8 +-
 .../apache/zeppelin/spark/SparkVersionTest.java    |    30 +-
 .../display/angular/AbstractAngularElemTest.scala  |    10 +-
 .../display/angular/AbstractAngularModelTest.scala |    11 +-
 .../angular/notebookscope/AngularElemTest.scala    |     0
 .../angular/notebookscope/AngularModelTest.scala   |     0
 .../angular/paragraphscope/AngularElemTest.scala   |     0
 .../angular/paragraphscope/AngularModelTest.scala  |     0
 .../java/org/apache/zeppelin/spark/SparkShims.java |     3 -
 .../org/apache/zeppelin/spark/SparkVersion.java    |    21 +-
 ...on_3.8_with_R.yml => env_python_3.9_with_R.yml} |     0
 testing/env_python_3.yml                           |    28 +-
 testing/env_python_3_with_R.yml                    |     3 +-
 testing/env_python_3_with_R_and_tensorflow.yml     |     5 +-
 testing/env_python_3_with_flink_113.yml            |    30 -
 testing/env_python_3_with_flink_114.yml            |    30 -
 ...ink_112.yml => env_python_3_with_flink_117.yml} |     2 +-
 zeppelin-display/pom.xml                           |   170 -
 zeppelin-distribution/pom.xml                      |   221 -
 zeppelin-distribution/src/deb/control/control      |    26 -
 zeppelin-distribution/src/deb/control/prerm        |    27 -
 zeppelin-distribution/src/deb/init.d/zeppelind     |    36 -
 .../integration/ZSessionIntegrationTest.java       |     2 +-
 .../service/ShiroAuthenticationService.java        |     4 +-
 zeppelin-web-angular/README.md                     |     2 +-
 zeppelin-web-angular/package-lock.json             | 33276 ++++++++++++++-----
 zeppelin-web-angular/package.json                  |    12 +-
 zeppelin-web/README.md                             |     2 +-
 zeppelin-web/package-lock.json                     | 25502 ++++++++++++--
 zeppelin-web/package.json                          |    10 +-
 .../zeppelin/interpreter/YarnAppMonitor.java       |     4 +-
 .../launcher/SparkInterpreterLauncher.java         |    53 +-
 .../interpreter/integration/DownloadUtils.java     |    19 +
 .../interpreter/integration/SemanticVersion.java   |    76 +-
 138 files changed, 49311 insertions(+), 14846 deletions(-)
 delete mode 100755 dev/change_scala_version.sh
 delete mode 120000 flink/flink-scala-2.11/flink-scala-parent
 delete mode 100644 flink/flink-scala-2.11/pom.xml
 delete mode 100644 
flink/flink-scala-2.11/src/main/scala/org/apache/zeppelin/flink/FlinkExprTyper.scala
 delete mode 100644 
flink/flink-scala-2.11/src/main/scala/org/apache/zeppelin/flink/FlinkILoopInterpreter.scala
 delete mode 100644 
flink/flink-scala-2.11/src/main/scala/org/apache/zeppelin/flink/FlinkScala211Interpreter.scala
 delete mode 120000 flink/flink-scala-2.12/flink-scala-parent
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/ApplicationModeExecutionEnvironment.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/ApplicationModeStreamEnvironment.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/FlinkBatchSqlInterpreter.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/FlinkInterpreter.java 
(100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/FlinkSqlInterpreter.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/FlinkStreamSqlInterpreter.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/HadoopUtils.java 
(100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/IPyFlinkInterpreter.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/JobManager.java (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/PyFlinkInterpreter.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/TableEnvFactory.java 
(100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/internal/JarHelper.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/internal/ScalaShellEnvironment.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/internal/ScalaShellStreamEnvironment.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/sql/AbstractStreamSqlJob.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/sql/AppendStreamSqlJob.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/sql/SingleRowStreamSqlJob.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/java/org/apache/zeppelin/flink/sql/UpdateStreamSqlJob.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/resources/interpreter-setting.json (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/resources/python/zeppelin_ipyflink.py (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/resources/python/zeppelin_pyflink.py (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/scala/org/apache/zeppelin/flink/FlinkScalaInterpreter.scala
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/scala/org/apache/zeppelin/flink/FlinkZeppelinContext.scala
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/scala/org/apache/zeppelin/flink/internal/FlinkILoop.scala
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/main/scala/org/apache/zeppelin/flink/internal/FlinkShell.scala
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/java/org/apache/zeppelin/flink/FlinkBatchSqlInterpreterTest.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/java/org/apache/zeppelin/flink/FlinkInterpreterTest.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/java/org/apache/zeppelin/flink/FlinkSqlInterpreterTest.java
 (99%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/java/org/apache/zeppelin/flink/FlinkStreamSqlInterpreterTest.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/java/org/apache/zeppelin/flink/IPyFlinkInterpreterTest.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/java/org/apache/zeppelin/flink/JavaLower.java (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/java/org/apache/zeppelin/flink/JavaUpper.java (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/java/org/apache/zeppelin/flink/JobManagerTest.java 
(100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/java/org/apache/zeppelin/flink/PyFlinkInterpreterTest.java
 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/resources/flink-conf.yaml (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/resources/init_stream.scala2 (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/resources/log4j.properties (100%)
 rename flink/{flink-scala-parent => 
flink-scala-2.12}/src/test/resources/log4j2.properties (100%)
 delete mode 100644 flink/flink-scala-parent/pom.xml
 delete mode 100644 flink/flink1.13-shims/pom.xml
 delete mode 100644 
flink/flink1.13-shims/src/main/java/org/apache/zeppelin/flink/Flink113Shims.java
 delete mode 100644 
flink/flink1.13-shims/src/main/java/org/apache/zeppelin/flink/Flink113SqlInterpreter.java
 delete mode 100644 
flink/flink1.13-shims/src/main/scala/org/apache/zeppelin/flink/shims113/Flink113ScalaShims.scala
 delete mode 100644 
flink/flink1.14-shims/src/main/java/org/apache/zeppelin/flink/shims114/CollectStreamTableSink.java
 rename flink/{flink1.14-shims => flink1.17-shims}/pom.xml (92%)
 rename 
flink/{flink1.14-shims/src/main/java/org/apache/zeppelin/flink/Flink114Shims.java
 => flink1.17-shims/src/main/java/org/apache/zeppelin/flink/Flink117Shims.java} 
(82%)
 rename 
flink/{flink1.14-shims/src/main/java/org/apache/zeppelin/flink/Flink114SqlInterpreter.java
 => 
flink1.17-shims/src/main/java/org/apache/zeppelin/flink/Flink117SqlInterpreter.java}
 (98%)
 copy flink/{flink1.15-shims => 
flink1.17-shims}/src/main/java/org/apache/zeppelin/flink/PrintUtils.java (100%)
 copy flink/{flink1.15-shims => 
flink1.17-shims}/src/main/java/org/apache/zeppelin/flink/TimestampStringUtils.java
 (100%)
 rename flink/{flink1.13-shims/src/main/java/org/apache/zeppelin/flink/shims113 
=> 
flink1.17-shims/src/main/java/org/apache/zeppelin/flink/shims117}/CollectStreamTableSink.java
 (98%)
 rename {zeppelin-display => 
spark/interpreter}/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularElem.scala
 (100%)
 rename {zeppelin-display => 
spark/interpreter}/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularModel.scala
 (100%)
 rename {zeppelin-display => 
spark/interpreter}/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala
 (95%)
 rename {zeppelin-display => 
spark/interpreter}/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModel.scala
 (100%)
 rename {zeppelin-display => 
spark/interpreter}/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala
 (95%)
 rename {zeppelin-display => 
spark/interpreter}/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModel.scala
 (100%)
 rename {zeppelin-display => 
spark/interpreter}/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala
 (94%)
 rename {zeppelin-display => 
spark/interpreter}/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala
 (89%)
 rename {zeppelin-display => 
spark/interpreter}/src/test/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElemTest.scala
 (100%)
 rename {zeppelin-display => 
spark/interpreter}/src/test/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModelTest.scala
 (100%)
 rename {zeppelin-display => 
spark/interpreter}/src/test/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElemTest.scala
 (100%)
 rename {zeppelin-display => 
spark/interpreter}/src/test/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModelTest.scala
 (100%)
 copy testing/{env_python_3.8_with_R.yml => env_python_3.9_with_R.yml} (100%)
 delete mode 100644 testing/env_python_3_with_flink_113.yml
 delete mode 100644 testing/env_python_3_with_flink_114.yml
 rename testing/{env_python_3_with_flink_112.yml => 
env_python_3_with_flink_117.yml} (93%)
 delete mode 100644 zeppelin-display/pom.xml
 delete mode 100644 zeppelin-distribution/src/deb/control/control
 delete mode 100644 zeppelin-distribution/src/deb/control/prerm
 delete mode 100755 zeppelin-distribution/src/deb/init.d/zeppelind
 copy livy/src/main/java/org/apache/zeppelin/livy/LivyVersion.java => 
zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/integration/SemanticVersion.java
 (50%)

Reply via email to