Skip to content

Commit

Permalink
apacheGH-40896: [Java] Remove runtime dependencies on Eclipse, logback (
Browse files Browse the repository at this point in the history
apache#40904)

### Rationale for this change

Remove runtime dependencies on [Category B](https://apache.org/legal/resolved.html#category-b) dependencies.

### What changes are included in this PR?

- 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.

### Are these changes tested?

apache#40901

### Are there any user-facing changes?

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]>
  • Loading branch information
lidavidm authored and tolleybot committed May 2, 2024
1 parent a0ec0eb commit 134cea4
Show file tree
Hide file tree
Showing 10 changed files with 836 additions and 11 deletions.
7 changes: 7 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 2 additions & 0 deletions dev/release/rat_exclude_files.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions java/dev/checkstyle/suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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=".*" />

Expand Down
2 changes: 1 addition & 1 deletion java/tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,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>
Expand Down
5 changes: 0 additions & 5 deletions java/vector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,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>
Expand Down
1 change: 0 additions & 1 deletion java/vector/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,5 @@
requires org.apache.arrow.format;
requires org.apache.arrow.memory.core;
requires org.apache.commons.codec;
requires org.eclipse.collections.impl;
requires org.slf4j;
}
Loading

0 comments on commit 134cea4

Please sign in to comment.