apacheGH-40896: [Java] Remove runtime dependencies on Eclipse, logback (

apache#40904) Remove runtime dependencies on [Category B](https://apache.org/legal/resolved.html#category-b) dependencies. - logback: move to test-only - eclipse: remove dependency, vendor the Netty implementation we originally used I wanted to remove javax.annotation.Generated but gRPC doesn't yet let us do that (grpc/grpc-java#9179). That's ~okay though since effectively that's a build only dependency. No. **This PR contains a "Critical Fix".** License issues do not cause runtime issues but are important as an Apache project. * GitHub Issue: apache#40896 Authored-by: David Li <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
lriggs · Apr 2, 2024 · 0c97f7a · 0c97f7a
1 parent f65cf26
commit 0c97f7a
Show file tree

Hide file tree

Showing 10 changed files with 885 additions and 9 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -2252,3 +2252,10 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+--------------------------------------------------------------------------------
+java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java
+java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java
+
+These file are derived from code from Netty, which is made available under the
+Apache License 2.0.
diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
@@ -80,6 +80,8 @@ go/parquet/internal/gen-go/parquet/GoUnusedProtection__.go
 go/parquet/internal/gen-go/parquet/parquet-consts.go
 go/parquet/internal/gen-go/parquet/parquet.go
 go/parquet/version_string.go
+java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java
+java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java
 js/.npmignore
 js/closure-compiler-scripts/*
 js/src/fb/*.ts

diff --git a/java/dev/checkstyle/suppressions.xml b/java/dev/checkstyle/suppressions.xml
@@ -36,6 +36,9 @@
   <!-- suppress files that include additional lines in license -->
   <suppress checks="Header" files="AutoCloseables.java|Collections2.java" />
 
+  <!-- no license file in vendored dependencies -->
+  <suppress checks="Header" files="IntObjectMap.java|IntObjectHashMap.java" />
+
   <!-- Suppress certain checks requiring many code changes, that add little benefit -->
   <suppress checks="NoFinalizer|OverloadMethodsDeclarationOrder|VariableDeclarationUsageDistance" files=".*" />
 

diff --git a/java/tools/pom.xml b/java/tools/pom.xml
@@ -48,7 +48,7 @@
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-classic</artifactId>
           <version>1.3.14</version>
-          <scope>runtime</scope>
+          <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/java/vector/pom.xml b/java/vector/pom.xml
@@ -70,11 +70,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.collections</groupId>
-      <artifactId>eclipse-collections</artifactId>
-      <version>11.1.0</version>
-    </dependency>
   </dependencies>
 
   <pluginRepositories>

diff --git a/java/vector/src/main/java/module-info.java b/java/vector/src/main/java/module-info.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+module org.apache.arrow.vector {
+  exports org.apache.arrow.vector;
+  exports org.apache.arrow.vector.compare;
+  exports org.apache.arrow.vector.compare.util;
+  exports org.apache.arrow.vector.complex;
+  exports org.apache.arrow.vector.complex.impl;
+  exports org.apache.arrow.vector.complex.reader;
+  exports org.apache.arrow.vector.complex.writer;
+  exports org.apache.arrow.vector.compression;
+  exports org.apache.arrow.vector.dictionary;
+  exports org.apache.arrow.vector.holders;
+  exports org.apache.arrow.vector.ipc;
+  exports org.apache.arrow.vector.ipc.message;
+  exports org.apache.arrow.vector.table;
+  exports org.apache.arrow.vector.types;
+  exports org.apache.arrow.vector.types.pojo;
+  exports org.apache.arrow.vector.util;
+  exports org.apache.arrow.vector.validate;
+
+  opens org.apache.arrow.vector.types.pojo to com.fasterxml.jackson.databind;
+
+  requires com.fasterxml.jackson.annotation;
+  requires com.fasterxml.jackson.core;
+  requires com.fasterxml.jackson.databind;
+  requires com.fasterxml.jackson.datatype.jsr310;
+  requires flatbuffers.java;
+  requires jdk.unsupported;
+  requires org.apache.arrow.format;
+  requires org.apache.arrow.memory.core;
+  requires org.apache.commons.codec;
+  requires org.slf4j;
+}