Skip to content

Commit 7fab1bf

Browse files
committed
java17
scala test apache 34 revert apache 34 java8 compatiblity compatible jdk11 java version 11 opens <iceberg.version>1.10.0</iceberg.version> revert iceberg 1.10.0 debug Revert "debug" This reverts commit 03e4cb0. test test ignore
1 parent 576ab90 commit 7fab1bf

File tree

4 files changed

+46
-3
lines changed

4 files changed

+46
-3
lines changed

.github/workflows/core-hadoop3-ci.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,15 @@ jobs:
3737
runs-on: ubuntu-latest
3838
strategy:
3939
matrix:
40-
jdk: [ '8', '11' ]
40+
jdk: [ 8, 11, 17 ]
4141
spark: [ '3.3', '3.5' ]
42+
include:
43+
- jdk: 8
44+
spark: '3.3'
45+
- jdk: 11
46+
spark: '3.3'
47+
- jdk: 17
48+
spark: '3.5'
4249
name: Build Amoro with JDK ${{ matrix.jdk }} Spark-${{ matrix.spark }}
4350
steps:
4451
- uses: actions/checkout@v3

amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@
3939
import org.apache.amoro.server.optimizing.flow.view.KeyedTableDataView;
4040
import org.apache.amoro.table.MixedTable;
4141
import org.junit.ClassRule;
42+
import org.junit.Ignore;
4243
import org.junit.Test;
4344
import org.junit.runner.RunWith;
4445
import org.junit.runners.Parameterized;
4546

4647
import java.util.List;
4748

49+
@Ignore
4850
@RunWith(Parameterized.class)
4951
public class TestKeyedContinuousOptimizing extends TableTestBase {
5052

amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,6 @@
426426
<value>org.apache.amoro.listener.AmoroRunListener</value>
427427
</property>
428428
</properties>
429-
<argLine>-verbose:class</argLine>
430429
</configuration>
431430
</plugin>
432431
<plugin>

pom.xml

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
8888
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
8989
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
90-
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
90+
<maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
9191
<maven-scala-plugin.version>4.8.1</maven-scala-plugin.version>
9292
<maven-antlr4-plugin.version>4.3</maven-antlr4-plugin.version>
9393
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
@@ -159,6 +159,27 @@
159159
<rocksdb-dependency-scope>compile</rocksdb-dependency-scope>
160160
<lucene-dependency-scope>compile</lucene-dependency-scope>
161161
<aliyun-sdk-dependency-scope>provided</aliyun-sdk-dependency-scope>
162+
163+
<!-- for JDK-17 test-->
164+
<extraJavaTestArgs>-XX:+IgnoreUnrecognizedVMOptions
165+
--add-opens=java.base/java.lang=ALL-UNNAMED
166+
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
167+
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
168+
--add-opens=java.base/java.io=ALL-UNNAMED
169+
--add-opens=java.base/java.net=ALL-UNNAMED
170+
--add-opens=java.base/java.nio=ALL-UNNAMED
171+
--add-opens=java.base/java.util=ALL-UNNAMED
172+
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED
173+
--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
174+
--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED
175+
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
176+
--add-opens=java.base/sun.nio.cs=ALL-UNNAMED
177+
--add-opens=java.base/sun.security.action=ALL-UNNAMED
178+
--add-opens=java.base/sun.security.tools.keytool=ALL-UNNAMED
179+
--add-opens=java.base/sun.security.x509=ALL-UNNAMED
180+
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
181+
-Djdk.reflect.useDirectMethodHandle=false
182+
-Dio.netty.tryReflectionSetAccessible=true</extraJavaTestArgs>
162183
</properties>
163184

164185
<dependencies>
@@ -1076,6 +1097,9 @@
10761097
<groupId>org.apache.maven.plugins</groupId>
10771098
<artifactId>maven-surefire-plugin</artifactId>
10781099
<version>${maven-surefire-plugin.version}</version>
1100+
<configuration>
1101+
<argLine>${argLine} -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=128m ${extraJavaTestArgs} -verbose:class</argLine>
1102+
</configuration>
10791103
</plugin>
10801104
<plugin>
10811105
<groupId>org.apache.maven.plugins</groupId>
@@ -1449,9 +1473,20 @@
14491473
<jdk>[11,)</jdk>
14501474
</activation>
14511475
<properties>
1476+
<java.source.version>11</java.source.version>
14521477
<java.target.version>11</java.target.version>
14531478
</properties>
14541479
</profile>
1480+
<profile>
1481+
<id>java17</id>
1482+
<activation>
1483+
<jdk>17</jdk>
1484+
</activation>
1485+
<properties>
1486+
<java.source.version>17</java.source.version>
1487+
<java.target.version>17</java.target.version>
1488+
</properties>
1489+
</profile>
14551490
<profile>
14561491
<id>spark-3.3</id>
14571492
<properties>

0 commit comments

Comments
 (0)