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

[INLONG-3431][TubeMQ] Sort out the LICENSEs of the third-party components of inlong-tubemq #3443

Merged
merged 1 commit into from
Mar 29, 2022
Merged

[INLONG-3431][TubeMQ] Sort out the LICENSEs of the third-party components of inlong-tubemq #3443

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
4 changes: 0 additions & 4 deletions DISCLAIMER-WIP
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,3 @@ If you are planning to incorporate this work into your product/project, please b
you will need to conduct a thorough licensing review to determine the overall implications of
including this work. For the current status of this project through the Apache Incubator
visit: https://incubator.apache.org/projects/inlong.html

1. berkeleydb-je:berkeleydb-je LICENSE: CATEGORY X
In inlong-tubemq, we use this component and it is a mandatory path dependency.
We will remove or make it an optional dependency in subsequent versions.
55 changes: 40 additions & 15 deletions inlong-tubemq/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</modules>

<properties>
<junit.version>4.11</junit.version>
<junit.version>4.13.2</junit.version>
<mockito.version>2.18.0</mockito.version>
<powermock.version>2.0.4</powermock.version>
<exec.maven.version>1.6.0</exec.maven.version>
Expand All @@ -81,17 +81,19 @@
<protobuf.version>3.19.4</protobuf.version>
<je.version>7.3.7</je.version>
<gson.version>2.8.5</gson.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<spring.boot.version>2.6.3</spring.boot.version>
<mysql.java.version>8.0.21</mysql.java.version>
</properties>

<repositories>
<!-- For the BDB JE dependency -->
<repository>
<id>berkeleydb-je</id>
<name>berkeleydb-je</name>
<url>https://download.oracle.com/maven/</url>
<releases>
<enabled>true</enabled>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
Expand Down Expand Up @@ -169,12 +171,6 @@
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -193,14 +189,19 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-common</artifactId>
<version>${project.version}</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Expand Down Expand Up @@ -253,6 +254,18 @@
<artifactId>zookeeper</artifactId>
<version>3.4.14</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
Expand All @@ -266,9 +279,21 @@
<artifactId>jms</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.netty</groupId>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
9 changes: 4 additions & 5 deletions inlong-tubemq/tubemq-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand All @@ -113,11 +117,6 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.protobuf-java-format</groupId>
<artifactId>protobuf-java-format</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions inlong-tubemq/tubemq-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<swagger.version>3.0.0</swagger.version>
<swagger-annotations.version>1.6.2</swagger-annotations.version>
<spring-boot.version>2.6.3</spring-boot.version>
<lombok.version>1.18.22</lombok.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -104,6 +105,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>

<dependency>
Expand Down
9 changes: 4 additions & 5 deletions inlong-tubemq/tubemq-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@
<groupId>org.apache.inlong</groupId>
<artifactId>tubemq-example</artifactId>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
Expand All @@ -140,6 +136,10 @@
<groupId>org.ini4j</groupId>
<artifactId>ini4j</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down Expand Up @@ -183,7 +183,6 @@
<dependency>
<groupId>org.apache.velocity.tools</groupId>
<artifactId>velocity-tools-generic</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand Down
Loading