Skip to content

Commit 6c4d8ce

Browse files
loserwang1024loserwang1024
committed
support java 11 as default compile version.
1 parent efc8a51 commit 6c4d8ce

File tree

4 files changed

+100
-31
lines changed

4 files changed

+100
-31
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
distribution: 'temurin'
4848
- name: Build
4949
run: |
50-
mvn -T 1C -B clean install -DskipTests
50+
mvn -T 1C -B clean install -DskipTests -Pjava8-target
5151
5252
build-on-jdk11:
5353
runs-on: self-hosted
@@ -65,7 +65,7 @@ jobs:
6565
distribution: 'temurin'
6666
- name: Build
6767
run: |
68-
mvn -T 1C -B clean install -DskipTests -Pjava11-target
68+
mvn -T 1C -B clean install -DskipTests
6969
- name: Test
7070
timeout-minutes: 60
7171
run: |

‎.github/workflows/daily.yaml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
################################################################################
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
################################################################################
18+
name: Daily CI ON JDK 8
19+
on:
20+
schedule:
21+
# Run at 12:00 daily.
22+
- cron: "0 12 * * *"
23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.number || github.run_id }}
25+
cancel-in-progress: true
26+
27+
jobs:
28+
build-on-jdk8:
29+
runs-on: self-hosted
30+
strategy:
31+
fail-fast: false
32+
matrix:
33+
module: [ core, flink ]
34+
steps:
35+
- name: Checkout code
36+
uses: actions/checkout@v2
37+
- name: Set up JDK 8
38+
uses: actions/setup-java@v4
39+
with:
40+
java-version: '8'
41+
distribution: 'temurin'
42+
- name: Build
43+
run: |
44+
mvn -T 1C -B clean install -DskipTests -Pjava8-target
45+
- name: Test
46+
timeout-minutes: 60
47+
run: |
48+
TEST_MODULES=$(./.github/workflows/stage.sh ${{ matrix.module }})
49+
echo "github ref: ${{ github.ref }}"
50+
echo "Start testing modules: $TEST_MODULES"
51+
mvn -B verify $TEST_MODULES -Ptest-coverage -Ptest-${{ matrix.module }} -Dlog.dir=${{ runner.temp }}/fluss-logs -Dlog4j.configurationFile=${{ github.workspace }}/tools/ci/log4j.properties -Pjava8-target
52+
env:
53+
MAVEN_OPTS: -Xmx4096m
54+
ARTIFACTS_OSS_ENDPOINT: ${{ secrets.ARTIFACTS_OSS_ENDPOINT }}
55+
ARTIFACTS_OSS_REGION: ${{ secrets.ARTIFACTS_OSS_REGION }}
56+
ARTIFACTS_OSS_BUCKET: ${{ secrets.ARTIFACTS_OSS_BUCKET }}
57+
ARTIFACTS_OSS_ACCESS_KEY: ${{ secrets.ARTIFACTS_OSS_ACCESS_KEY }}
58+
ARTIFACTS_OSS_SECRET_KEY: ${{ secrets.ARTIFACTS_OSS_SECRET_KEY }}
59+
ARTIFACTS_OSS_STS_ENDPOINT: ${{ secrets.ARTIFACTS_OSS_STS_ENDPOINT }}
60+
ARTIFACTS_OSS_ROLE_ARN: ${{ secrets.ARTIFACTS_OSS_ROLE_ARN }}
61+
- name: Upload build logs
62+
uses: actions/upload-artifact@v4
63+
if: ${{ failure() }}
64+
with:
65+
name: logs-test-${{ matrix.module }}-${{ github.run_number}}#${{ github.run_attempt }}
66+
path: ${{ runner.temp }}/fluss-logs/*
67+
- name: Upload JaCoCo coverage report
68+
uses: actions/upload-artifact@v4
69+
if: ${{ success() && github.ref == 'refs/heads/main' }}
70+
with:
71+
name: jacoco-report-${{ matrix.module }}-${{ github.run_number}}#${{ github.run_attempt }}
72+
path: ${{ github.workspace }}/fluss-test-coverage/target/site/jacoco-aggregate/*

‎.github/workflows/license-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Set JDK
3636
uses: actions/setup-java@v4
3737
with:
38-
java-version: 8
38+
java-version: 11
3939
distribution: 'temurin'
4040
- name: Build
4141
run: |

‎pom.xml‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<properties>
8383
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8484
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
85-
<target.java.version>1.8</target.java.version>
85+
<target.java.version>11</target.java.version>
8686
<maven.compiler.source>${target.java.version}</maven.compiler.source>
8787
<maven.compiler.target>${target.java.version}</maven.compiler.target>
8888
<test.unit.pattern>**/*Test.*</test.unit.pattern>
@@ -424,28 +424,25 @@
424424

425425
<profiles>
426426
<profile>
427-
<id>java11-target</id>
427+
<id>java8-target</id>
428428
<build>
429429
<plugins>
430430
<plugin>
431431
<groupId>org.apache.maven.plugins</groupId>
432432
<artifactId>maven-compiler-plugin</artifactId>
433433
<configuration>
434-
<source>11</source>
435-
<target>11</target>
436-
<compilerArgs combine.children="append">
437-
<arg>--add-exports=java.base/sun.net.util=ALL-UNNAMED</arg>
438-
<arg>--add-exports=java.management/sun.management=ALL-UNNAMED</arg>
439-
<arg>--add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED</arg>
440-
<arg>--add-exports=java.security.jgss/sun.security.krb5=ALL-UNNAMED</arg>
441-
<arg>--add-exports=java.base/sun.nio.ch=ALL-UNNAMED</arg>
434+
<source>8</source>
435+
<target>8</target>
436+
<useIncrementalCompilation>false</useIncrementalCompilation>
437+
<compilerArgs >
438+
<!-- Prevents recompilation due to missing package-info.class, see MCOMPILER-205 -->
439+
<arg>-Xpkginfo:always</arg>
442440
</compilerArgs>
443441
</configuration>
444442
</plugin>
445443
</plugins>
446444
</build>
447445
</profile>
448-
449446
<profile>
450447
<id>test-coverage</id>
451448
<properties>
@@ -531,6 +528,22 @@
531528
<plugin>
532529
<groupId>org.apache.maven.plugins</groupId>
533530
<artifactId>maven-compiler-plugin</artifactId>
531+
<version>3.8.0</version>
532+
<configuration>
533+
<source>${target.java.version}</source>
534+
<target>${target.java.version}</target>
535+
<!-- The semantics of this option are reversed, see MCOMPILER-209. -->
536+
<useIncrementalCompilation>false</useIncrementalCompilation>
537+
<compilerArgs >
538+
<arg>--add-exports=java.base/sun.net.util=ALL-UNNAMED</arg>
539+
<arg>--add-exports=java.management/sun.management=ALL-UNNAMED</arg>
540+
<arg>--add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED</arg>
541+
<arg>--add-exports=java.security.jgss/sun.security.krb5=ALL-UNNAMED</arg>
542+
<arg>--add-exports=java.base/sun.nio.ch=ALL-UNNAMED</arg>
543+
<!-- Prevents recompilation due to missing package-info.class, see MCOMPILER-205 -->
544+
<arg>-Xpkginfo:always</arg>
545+
</compilerArgs>
546+
</configuration>
534547
</plugin>
535548

536549
<plugin>
@@ -718,7 +731,7 @@
718731
<version>[3.1.1,)</version>
719732
</requireMavenVersion>
720733
<requireJavaVersion>
721-
<version>${target.java.version}</version>
734+
<version>[1.8,)</version>
722735
</requireJavaVersion>
723736
</rules>
724737
</configuration>
@@ -903,22 +916,6 @@
903916
<skip>true</skip>
904917
</configuration>
905918
</plugin>
906-
<plugin>
907-
<groupId>org.apache.maven.plugins</groupId>
908-
<artifactId>maven-compiler-plugin</artifactId>
909-
<version>3.8.0</version>
910-
<configuration>
911-
<!-- Make sure that we only use Java 8 compatible APIs -->
912-
<source>${target.java.version}</source>
913-
<target>${target.java.version}</target>
914-
<!-- The semantics of this option are reversed, see MCOMPILER-209. -->
915-
<useIncrementalCompilation>false</useIncrementalCompilation>
916-
<compilerArgs>
917-
<!-- Prevents recompilation due to missing package-info.class, see MCOMPILER-205 -->
918-
<arg>-Xpkginfo:always</arg>
919-
</compilerArgs>
920-
</configuration>
921-
</plugin>
922919

923920
<plugin>
924921
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)