Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
d2e28ea
[Build] Raise StreamPark compile and CI baseline to JDK 11
shangeyao Jul 1, 2026
8afc897
[Common] Fix ClassLoaderUtils dynamic classpath on JDK 9+
shangeyao Jul 1, 2026
beea01a
[Console] JDK 11 runtime readiness for StreamPark Console
shangeyao Jul 1, 2026
fbc1fc7
[Build][E2E] Fix JDK 11 MavenWrapper and stabilize local basic E2E
shangeyao Jul 1, 2026
2322bd5
[Build] Remove Scala on JDK 11 baseline for StreamPark 3.0
shangeyao Jul 5, 2026
aa59773
[Flink] Drop 1.12–1.16 shims, baseline 1.17+, add 2.0/2.1/2.2 support
shangeyao Jul 5, 2026
7223836
[Build] Bump common module version to 3.0.0-preview
shangeyao Jul 7, 2026
208398e
[Build] Bump Flink module version to 3.0.0-preview
shangeyao Jul 7, 2026
15ea6cd
[Common] Fix Sonar security findings after Scala-to-Java migration
shangeyao Jul 8, 2026
4dc91ae
Merge feature/remove-scala into feature/flink-1.17-plus
shangeyao Jul 8, 2026
1f3512b
[Flink] Fix Sonar security findings in Flink modules
shangeyao Jul 8, 2026
a48bc62
[Common] Fix Sonar security findings for path handling and debug output
shangeyao Jul 8, 2026
e965f83
Merge branch 'feature/remove-scala' into feature/flink-1.17-plus
shangeyao Jul 8, 2026
51168ec
[Common] Harden path validation and fix Sonar reliability findings
shangeyao Jul 8, 2026
72212e2
Merge branch 'feature/remove-scala' into feature/flink-1.17-plus
shangeyao Jul 8, 2026
1660cec
[Common] Address Sonar path injection review comments
shangeyao Jul 8, 2026
efdf40b
Merge branch 'feature/remove-scala' into feature/flink-1.17-plus
shangeyao Jul 8, 2026
752fa8a
[Common] Fix Sonar path I/O taint and reliability findings
shangeyao Jul 8, 2026
23bdbcb
Merge branch 'feature/remove-scala' into feature/flink-1.17-plus
shangeyao Jul 8, 2026
5a1ff40
[Common] Add NOSONAR for validated config/jar path I/O
shangeyao Jul 8, 2026
16bda3d
Merge branch 'feature/remove-scala' into feature/flink-1.17-plus
shangeyao Jul 8, 2026
2cd1f3d
[Common] Fix Sonar reliability bugs across common and flink modules
shangeyao Jul 8, 2026
f71a1a8
Merge branch 'feature/remove-scala' into feature/flink-1.17-plus
shangeyao Jul 8, 2026
c78c1e1
[Common] Fix remaining Sonar bugs and add SonarCloud CPD exclusions
shangeyao Jul 8, 2026
d49f927
Merge branch 'feature/remove-scala' into feature/flink-1.17-plus
shangeyao Jul 8, 2026
e90b94a
[Flink] Throw IllegalArgumentException in FlinkTableInitializerV2 SQL…
shangeyao Jul 8, 2026
ea321fe
[Build] Apply Spotless formatting and fix FlinkCheckpointWatcher syntax
shangeyao Jul 8, 2026
2c52e14
[Build] Merge remove-scala Spotless fixes and align version to 3.0.0-…
shangeyao Jul 8, 2026
1010062
[CI] Sync workflow config with StreamPark 3.0 baseline
shangeyao Jul 8, 2026
4564f87
[CI] Sync workflow config with StreamPark 3.0 baseline
shangeyao Jul 8, 2026
898fcc8
[CI] Add ASF license headers and SafePathUtils Sonar ignore rules
shangeyao Jul 8, 2026
0113fae
[CI] Add ASF license headers and SafePathUtils Sonar ignore rules
shangeyao Jul 8, 2026
3743c96
[Common] Address Sonar issues after Scala-to-Java migration
shangeyao Jul 8, 2026
5504a19
Merge feature/remove-scala Sonar fixes
shangeyao Jul 8, 2026
729e40d
[Build] Align project version to 3.0.0-SNAPSHOT
shangeyao Jul 11, 2026
a7a35df
Merge branch 'dev' into feature/flink-1.17-plus
shangeyao Aug 3, 2026
0882846
[Flink] Align PR #4419 with post-Scala Java artifact model
shangeyao Aug 3, 2026
70a8feb
[Flink] Finish no-scala artifact and FlinkVersion cleanup
shangeyao Aug 3, 2026
4c5cb4c
Merge branch 'dev' into feature/flink-1.17-plus
shangeyao Aug 3, 2026
d957216
[Flink] Reduce shims duplication via layered base architecture
shangeyao Aug 3, 2026
2a36fdc
[Flink] Revert aggressive shims dedup; keep layered base reuse
shangeyao Aug 3, 2026
30473e3
[CI] Exclude Flink shims from SonarCloud duplication analysis
shangeyao Aug 3, 2026
d6f1487
[Flink] Fix SonarCloud new code smells for PR #4419
shangeyao Aug 3, 2026
1c0e587
[Flink] Refactor Sonar fixes without SuppressWarnings masking
shangeyao Aug 3, 2026
ecabd7c
[Spark] Restore streampark-spark to match dev branch
shangeyao Aug 4, 2026
29a140d
[Flink] Fix build and shims test issues from compile verification
shangeyao Aug 4, 2026
a346688
[Flink] Fix Sonar reliability bug in FlinkSqlExecutor.setConfig
shangeyao Aug 4, 2026
8d4c32b
[Build] Fix root POM full build after common artifact rename
shangeyao Aug 4, 2026
b73435b
[Build] Remove leftover connector migration script without license he…
shangeyao Aug 4, 2026
eadb96c
[Flink] Restore packer test deps and workspace config after Java migr…
shangeyao Aug 4, 2026
bd6799d
[Flink] Defer YarnPerJobTestCase init until FLINK_HOME is set
shangeyao Aug 4, 2026
e7b9c6d
[Flink] Replace YarnPerJobTestCase skip with harness compatibility ch…
shangeyao Aug 4, 2026
470b064
[Build] Remove stale scala runtime jars from known-dependencies
shangeyao Aug 4, 2026
75f0345
[Console] Restore scala runtime deps in dist assembly
shangeyao Aug 4, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 8 , 11 ]
java: [ 11 ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Setup Java and Scala
uses: olafurpg/setup-scala@v13
with:
java-version: adopt@1.8
java-version: adopt@11

- uses: actions/setup-node@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- name: Set up JDK 8
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: 8
java-version: 11
distribution: 'adopt'
- name: Cache local Maven repository
uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 8 , 11 ]
java: [ 11 ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ FROM ubuntu:22.04
USER root

ENV LANG=C.UTF-8 \
JAVA_HOME=/usr/lib/jvm/jdk8
JAVA_HOME=/usr/lib/jvm/jdk11

# Build arguments for version management
ARG JAVA_MAJOR_VERSION=8
ARG JAVA_MAJOR_VERSION=11
ARG TINI_VERSION=v0.19.0

# Base system setup
Expand Down
2 changes: 1 addition & 1 deletion mvnw

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

246 changes: 28 additions & 218 deletions pom.xml

Large diffs are not rendered by default.

51 changes: 25 additions & 26 deletions streampark-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,14 @@
<parent>
<groupId>org.apache.streampark</groupId>
<artifactId>streampark</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
</parent>

<artifactId>streampark-common_${scala.binary.version}</artifactId>
<artifactId>streampark-common</artifactId>
<name>StreamPark : Common</name>

<dependencies>

<!-- test -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-scala_${scala.binary.version}</artifactId>
<version>${mockito-scala.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
<version>${scalatest.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
Expand All @@ -58,10 +43,10 @@
<scope>test</scope>
</dependency>

<!-- enumeratum -->
<dependency>
<groupId>com.beachape</groupId>
<artifactId>enumeratum_${scala.binary.version}</artifactId>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -151,11 +136,6 @@
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand All @@ -170,7 +150,6 @@
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<artifactSet>
<includes>
<include>com.beachape:*</include>
<include>io.netty:netty-resolver</include>
</includes>
</artifactSet>
Expand All @@ -197,4 +176,24 @@

</plugins>
</build>

<profiles>
<profile>
<id>jdk9-plus-test-opens</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-opens jdk.zipfs/jdk.nio.zipfs=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
/*
* 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.
*/
package org.apache.streampark.common.conf;

/** Common internal configuration options. */
public final class CommonConfig {

private CommonConfig() {}

private static final InternalOption STREAMPARK_WORKSPACE_LOCAL_OPTION =
new InternalOption("streampark.workspace.local", "/streampark", String.class);

private static final InternalOption STREAMPARK_WORKSPACE_REMOTE_OPTION =
new InternalOption("streampark.workspace.remote", "/streampark", String.class);

private static final InternalOption STREAMPARK_HADOOP_USER_NAME_OPTION =
new InternalOption("streampark.hadoop-user-name", "hdfs", String.class);

private static final InternalOption STREAMPARK_PROXY_YARN_URL_OPTION =
new InternalOption(
"streampark.proxy.yarn-url",
"",
String.class,
"proxy yarn url. ex: knox proxy or other");

private static final InternalOption STREAMPARK_YARN_AUTH_OPTION =
new InternalOption(
"streampark.yarn.http-auth",
"",
String.class,
"yarn http auth type. ex: simple, kerberos");

private static final InternalOption DOCKER_HOST_OPTION =
new InternalOption(
"streampark.docker.http-client.docker-host",
"",
String.class,
"docker host for DockerHttpClient");

private static final InternalOption DOCKER_MAX_CONNECTIONS_OPTION =
new InternalOption(
"streampark.docker.http-client.max-connections",
100,
Integer.class,
"instantiating max connections for DockerHttpClient");

private static final InternalOption DOCKER_CONNECTION_TIMEOUT_SEC_OPTION =
new InternalOption(
"streampark.docker.http-client.connection-timeout-sec",
100L,
Long.class,
"instantiating connection timeout for DockerHttpClient");

private static final InternalOption DOCKER_RESPONSE_TIMEOUT_SEC_OPTION =
new InternalOption(
"streampark.docker.http-client.response-timeout-sec",
120L,
Long.class,
"instantiating connection timeout for DockerHttpClient");

private static final InternalOption MAVEN_SETTINGS_PATH_OPTION =
new InternalOption(
"streampark.maven.settings",
null,
String.class,
"maven settings.xml full path");

private static final InternalOption MAVEN_REMOTE_URL_OPTION =
new InternalOption(
"streampark.maven.central.repository",
"https://repo1.maven.org/maven2/",
String.class,
"maven repository used for built-in compilation");

private static final InternalOption MAVEN_AUTH_USER_OPTION =
new InternalOption(
"streampark.maven.auth.user",
null,
String.class,
"maven repository used for built-in compilation");

private static final InternalOption MAVEN_AUTH_PASSWORD_OPTION =
new InternalOption(
"streampark.maven.auth.password",
null,
String.class,
"maven repository used for built-in compilation");

private static final InternalOption KERBEROS_TTL_OPTION =
new InternalOption("security.kerberos.ttl", "2h", String.class, "kerberos default ttl");

private static final InternalOption READ_LOG_MAX_SIZE_OPTION =
new InternalOption(
"streampark.read-log.max-size",
"1mb",
String.class,
"The maximum size of the default read log");

private static final InternalOption SPRING_PROFILES_ACTIVE_OPTION =
new InternalOption(
"spring.profiles.active", "h2", String.class, "Use the database type");

public static InternalOption STREAMPARK_WORKSPACE_LOCAL() {
return STREAMPARK_WORKSPACE_LOCAL_OPTION;
}

public static InternalOption STREAMPARK_WORKSPACE_REMOTE() {

Check warning on line 121 in streampark-common/src/main/java/org/apache/streampark/common/conf/CommonConfig.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.

See more on https://sonarcloud.io/project/issues?id=apache_incubator-streampark&issues=AZ8yvnISlWsfFY_QVhoR&open=AZ8yvnISlWsfFY_QVhoR&pullRequest=4419
return STREAMPARK_WORKSPACE_REMOTE_OPTION;
}

public static InternalOption STREAMPARK_HADOOP_USER_NAME() {
return STREAMPARK_HADOOP_USER_NAME_OPTION;
}

public static InternalOption STREAMPARK_PROXY_YARN_URL() {
return STREAMPARK_PROXY_YARN_URL_OPTION;
}

public static InternalOption STREAMPARK_YARN_AUTH() {
return STREAMPARK_YARN_AUTH_OPTION;
}

public static InternalOption DOCKER_HOST() {
return DOCKER_HOST_OPTION;
}

public static InternalOption DOCKER_MAX_CONNECTIONS() {
return DOCKER_MAX_CONNECTIONS_OPTION;
}

public static InternalOption DOCKER_CONNECTION_TIMEOUT_SEC() {
return DOCKER_CONNECTION_TIMEOUT_SEC_OPTION;
}

public static InternalOption DOCKER_RESPONSE_TIMEOUT_SEC() {
return DOCKER_RESPONSE_TIMEOUT_SEC_OPTION;
}

public static InternalOption MAVEN_SETTINGS_PATH() {
return MAVEN_SETTINGS_PATH_OPTION;
}

public static InternalOption MAVEN_REMOTE_URL() {
return MAVEN_REMOTE_URL_OPTION;
}

public static InternalOption MAVEN_AUTH_USER() {
return MAVEN_AUTH_USER_OPTION;
}

public static InternalOption MAVEN_AUTH_PASSWORD() {
return MAVEN_AUTH_PASSWORD_OPTION;
}

public static InternalOption KERBEROS_TTL() {
return KERBEROS_TTL_OPTION;
}

public static InternalOption READ_LOG_MAX_SIZE() {
return READ_LOG_MAX_SIZE_OPTION;
}

public static InternalOption SPRING_PROFILES_ACTIVE() {
return SPRING_PROFILES_ACTIVE_OPTION;
}
}
Loading
Loading