You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluss.apache.org by ja...@apache.org on 2025/08/03 12:27:54 UTC
(fluss-shaded) 02/02: fix
This is an automated email from the ASF dual-hosted git repository.
jark pushed a commit to branch ci-test
in repository https://gitbox.apache.org/repos/asf/fluss-shaded.git
commit d0477bd076d8bc1be09a823edcb75b014f9d71ca
Author: Jark Wu <ja...@apache.org>
AuthorDate: Sun Aug 3 20:27:33 2025 +0800
fix
---
.../src/main/resources/META-INF/NOTICE | 68 +++++++++++-----------
.../src/main/resources/META-INF/NOTICE | 2 +-
pom.xml | 8 +--
tools/ci/fluss-shaded-ci-tools/pom.xml | 31 ++++++++++
4 files changed, 70 insertions(+), 39 deletions(-)
diff --git a/fluss-shaded-netty-4/src/main/resources/META-INF/NOTICE b/fluss-shaded-netty-4/src/main/resources/META-INF/NOTICE
index d3f7889..97a3842 100644
--- a/fluss-shaded-netty-4/src/main/resources/META-INF/NOTICE
+++ b/fluss-shaded-netty-4/src/main/resources/META-INF/NOTICE
@@ -6,37 +6,37 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- io.netty:netty-all:4.1.100.Final
-- io.netty:netty-buffer:4.1.100.Final
-- io.netty:netty-codec-dns:4.1.100.Final
-- io.netty:netty-codec-haproxy:4.1.100.Final
-- io.netty:netty-codec-http2:4.1.100.Final
-- io.netty:netty-codec-http:4.1.100.Final
-- io.netty:netty-codec-memcache:4.1.100.Final
-- io.netty:netty-codec-mqtt:4.1.100.Final
-- io.netty:netty-codec-redis:4.1.100.Final
-- io.netty:netty-codec-smtp:4.1.100.Final
-- io.netty:netty-codec-socks:4.1.100.Final
-- io.netty:netty-codec-stomp:4.1.100.Final
-- io.netty:netty-codec-xml:4.1.100.Final
-- io.netty:netty-codec:4.1.100.Final
-- io.netty:netty-common:4.1.100.Final
-- io.netty:netty-handler-proxy:4.1.100.Final
-- io.netty:netty-handler-ssl-ocsp:4.1.100.Final
-- io.netty:netty-handler:4.1.100.Final
-- io.netty:netty-resolver-dns-classes-macos:4.1.100.Final
-- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.100.Final
-- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.100.Final
-- io.netty:netty-resolver-dns:4.1.100.Final
-- io.netty:netty-resolver:4.1.100.Final
-- io.netty:netty-transport-classes-epoll:4.1.100.Final
-- io.netty:netty-transport-classes-kqueue:4.1.100.Final
-- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.100.Final
-- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.100.Final
-- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.100.Final
-- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.100.Final
-- io.netty:netty-transport-native-unix-common:4.1.100.Final
-- io.netty:netty-transport-rxtx:4.1.100.Final
-- io.netty:netty-transport-sctp:4.1.100.Final
-- io.netty:netty-transport-udt:4.1.100.Final
-- io.netty:netty-transport:4.1.100.Final
\ No newline at end of file
+- io.netty:netty-all:4.1.104.Final
+- io.netty:netty-buffer:4.1.104.Final
+- io.netty:netty-codec-dns:4.1.104.Final
+- io.netty:netty-codec-haproxy:4.1.104.Final
+- io.netty:netty-codec-http2:4.1.104.Final
+- io.netty:netty-codec-http:4.1.104.Final
+- io.netty:netty-codec-memcache:4.1.104.Final
+- io.netty:netty-codec-mqtt:4.1.104.Final
+- io.netty:netty-codec-redis:4.1.104.Final
+- io.netty:netty-codec-smtp:4.1.104.Final
+- io.netty:netty-codec-socks:4.1.104.Final
+- io.netty:netty-codec-stomp:4.1.104.Final
+- io.netty:netty-codec-xml:4.1.104.Final
+- io.netty:netty-codec:4.1.104.Final
+- io.netty:netty-common:4.1.104.Final
+- io.netty:netty-handler-proxy:4.1.104.Final
+- io.netty:netty-handler-ssl-ocsp:4.1.104.Final
+- io.netty:netty-handler:4.1.104.Final
+- io.netty:netty-resolver-dns-classes-macos:4.1.104.Final
+- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.104.Final
+- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.104.Final
+- io.netty:netty-resolver-dns:4.1.104.Final
+- io.netty:netty-resolver:4.1.104.Final
+- io.netty:netty-transport-classes-epoll:4.1.104.Final
+- io.netty:netty-transport-classes-kqueue:4.1.104.Final
+- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.104.Final
+- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.104.Final
+- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.104.Final
+- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.104.Final
+- io.netty:netty-transport-native-unix-common:4.1.104.Final
+- io.netty:netty-transport-rxtx:4.1.104.Final
+- io.netty:netty-transport-sctp:4.1.104.Final
+- io.netty:netty-transport-udt:4.1.104.Final
+- io.netty:netty-transport:4.1.104.Final
\ No newline at end of file
diff --git a/fluss-shaded-zookeeper-parent/fluss-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE b/fluss-shaded-zookeeper-parent/fluss-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE
index a8725fc..cf76658 100644
--- a/fluss-shaded-zookeeper-parent/fluss-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE
+++ b/fluss-shaded-zookeeper-parent/fluss-shaded-zookeeper-38/src/main/resources/META-INF/NOTICE
@@ -1,5 +1,5 @@
fluss-shaded-zookeeper-3
-Copyright 2014-2023 The Apache Software Foundation
+Copyright 2025 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/pom.xml b/pom.xml
index a94ae85..a829932 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,7 +326,7 @@
<goal>java</goal>
</goals>
<configuration>
- <mainClass>org.apache.flink.tools.ci.licensecheck.LicenseChecker</mainClass>
+ <mainClass>org.apache.fluss.shaded.tools.ci.licensecheck.LicenseChecker</mainClass>
</configuration>
</execution>
</executions>
@@ -336,9 +336,9 @@
</configuration>
<dependencies>
<dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-ci-tools</artifactId>
- <version>1.18.0</version>
+ <groupId>org.apache.fluss</groupId>
+ <artifactId>fluss-shaded-ci-tools</artifactId>
+ <version>1.0-incubating</version>
</dependency>
</dependencies>
</plugin>
diff --git a/tools/ci/fluss-shaded-ci-tools/pom.xml b/tools/ci/fluss-shaded-ci-tools/pom.xml
index 5b00685..123d900 100644
--- a/tools/ci/fluss-shaded-ci-tools/pom.xml
+++ b/tools/ci/fluss-shaded-ci-tools/pom.xml
@@ -33,6 +33,10 @@
<properties>
<log4j.version>2.17.1</log4j.version>
<junit5.version>5.9.1</junit5.version>
+ <assertj.version>3.23.1</assertj.version>
+ <target.java.version>1.8</target.java.version>
+ <maven.compiler.source>${target.java.version}</maven.compiler.source>
+ <maven.compiler.target>${target.java.version}</maven.compiler.target>
</properties>
<dependencies>
@@ -68,6 +72,33 @@
<version>${log4j.version}</version>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <source>${target.java.version}</source>
+ <target>${target.java.version}</target>
+ <!-- The semantics of this option are reversed, see MCOMPILER-209. -->
+ <useIncrementalCompilation>false</useIncrementalCompilation>
+ <compilerArgs>
+ <!-- Prevents recompilation due to missing package-info.class, see MCOMPILER-205 -->
+ <arg>-Xpkginfo:always</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file