fix comments

apache · Jan 27, 2024 · ba476a5 · ba476a5
1 parent 8b18e3b
commit ba476a5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/paimon-bundle/pom.xml b/paimon-bundle/pom.xml
@@ -108,6 +108,12 @@ under the License.
             <artifactId>paimon-shade-caffeine-2</artifactId>
             <version>${paimon.shade.caffeine.version}-${paimon.shade.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.paimon</groupId>
+            <artifactId>paimon-shade-netty-4</artifactId>
+            <version>${paimon.shade.netty.version}-${paimon.shade.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -129,6 +135,7 @@ under the License.
                                     <include>org.apache.paimon:paimon-shade-jackson-2</include>
                                     <include>org.apache.paimon:paimon-shade-guava-30</include>
                                     <include>org.apache.paimon:paimon-shade-caffeine-2</include>
+                                    <include>org.apache.paimon:paimon-shade-netty-4</include>
 
                                     <!-- Paimon -->
                                     <include>org.apache.paimon:paimon-common</include>

diff --git a/paimon-service/paimon-service-client/pom.xml b/paimon-service/paimon-service-client/pom.xml
@@ -49,7 +49,7 @@ under the License.
         <dependency>
             <groupId>org.apache.paimon</groupId>
             <artifactId>paimon-shade-netty-4</artifactId>
-            <version>4.1.100.Final-${paimon.shade.version}</version>
+            <version>${paimon.shade.netty.version}-${paimon.shade.version}</version>
         </dependency>
 
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -76,6 +76,7 @@ under the License.
         <paimon.shade.jackson.version>2.14.2</paimon.shade.jackson.version>
         <paimon.shade.guava.version>30.1.1-jre</paimon.shade.guava.version>
         <paimon.shade.caffeine.version>2.9.3</paimon.shade.caffeine.version>
+        <paimon.shade.netty.version>4.1.100.Final</paimon.shade.netty.version>
         <antlr4.version>4.8</antlr4.version>
         <hadoop.version>2.8.5</hadoop.version>
         <scala.version>2.12.15</scala.version>

diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
@@ -234,6 +234,10 @@ This file is based on the checkstyle file of Apache Beam.
 			<property name="illegalPkgs" value="com.github.ben-manes.caffeine"/>
 			<message key="import.illegal" value="{0}; Use paimon-shade-caffeine instead."/>
 		</module>
+		<module name="IllegalImport">
+			<property name="illegalPkgs" value="io.netty"/>
+			<message key="import.illegal" value="{0}; Use paimon-shade-netty instead."/>
+		</module>
 
 		<module name="RedundantModifier">
 			<!-- Checks for redundant modifiers on various symbol definitions.