Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-40896: [Java] Remove runtime dependencies on Eclipse, logback #40904

Merged
merged 1 commit into from
Apr 2, 2024
Merged

GH-40896: [Java] Remove runtime dependencies on Eclipse, logback #40904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions LICENSE.txt
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe worth to mention in NOTICE file too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If Netty doesn't have NOTICE contents for this file, we don't need to change our NOTICE file.
See also: https://infra.apache.org/licensing-howto.html#alv2-dep

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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading