This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 4e30175 [INLONG-1981][Bug] When compiling the project, the
InLong-audit module reported Warning errors (#1982)
4e30175 is described below
commit 4e30175ed6d59e64721301815169e82fb09e5472
Author: baomingyu <[email protected]>
AuthorDate: Tue Dec 14 18:24:57 2021 +0800
[INLONG-1981][Bug] When compiling the project, the InLong-audit module
reported Warning errors (#1982)
---
inlong-agent/agent-common/pom.xml | 1 -
inlong-agent/agent-plugins/pom.xml | 11 +++-----
inlong-agent/agent-release/assembly.xml | 1 -
inlong-agent/agent-release/pom.xml | 2 ++
inlong-agent/pom.xml | 6 ++++
inlong-audit/audit-common/pom.xml | 1 -
inlong-audit/audit-dist/assembly/assembly.xml | 2 +-
inlong-audit/audit-dist/pom.xml | 2 ++
inlong-audit/audit-docker/pom.xml | 32 ----------------------
inlong-audit/audit-source/assembly/assembly.xml | 20 --------------
inlong-audit/audit-source/pom.xml | 2 ++
inlong-audit/audit-store/assembly/assembly.xml | 1 -
inlong-audit/audit-store/pom.xml | 3 ++
inlong-audit/pom.xml | 7 -----
inlong-dataproxy/dataproxy-dist/pom.xml | 1 +
.../dataproxy-dist/src/main/assembly/assembly.xml | 20 --------------
inlong-distribution/distribution.xml | 1 -
inlong-manager/manager-web/assembly.xml | 1 -
inlong-manager/manager-web/pom.xml | 1 +
inlong-sdk/pom.xml | 2 +-
.../sort-standalone-dist/pom.xml | 1 +
.../src/main/assembly/assembly.xml | 1 -
inlong-tubemq/tubemq-client/pom.xml | 1 +
.../tubemq-client/src/main/assembly/assembly.xml | 1 -
inlong-tubemq/tubemq-example/pom.xml | 1 +
.../tubemq-example/src/main/assembly/assembly.xml | 1 -
inlong-tubemq/tubemq-manager/pom.xml | 1 +
.../tubemq-manager/src/main/assembly/assembly.xml | 1 -
inlong-tubemq/tubemq-server/pom.xml | 1 +
.../tubemq-server/src/main/assembly/assembly.xml | 1 -
30 files changed, 28 insertions(+), 99 deletions(-)
diff --git a/inlong-agent/agent-common/pom.xml
b/inlong-agent/agent-common/pom.xml
index 2c5224d..0e962b0 100755
--- a/inlong-agent/agent-common/pom.xml
+++ b/inlong-agent/agent-common/pom.xml
@@ -100,7 +100,6 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>RELEASE</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/inlong-agent/agent-plugins/pom.xml
b/inlong-agent/agent-plugins/pom.xml
index 0eac523..2b242c2 100644
--- a/inlong-agent/agent-plugins/pom.xml
+++ b/inlong-agent/agent-plugins/pom.xml
@@ -69,12 +69,7 @@
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-dataproxy-sdk</artifactId>
@@ -84,11 +79,13 @@
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
</dependency>
+
<dependency>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
<scope>test</scope>
</dependency>
+
<dependency>
<artifactId>mockito-core</artifactId>
<groupId>org.mockito</groupId>
@@ -115,9 +112,9 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>RELEASE</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>agent-common</artifactId>
diff --git a/inlong-agent/agent-release/assembly.xml
b/inlong-agent/agent-release/assembly.xml
index 80b6135..22d2f4a 100644
--- a/inlong-agent/agent-release/assembly.xml
+++ b/inlong-agent/agent-release/assembly.xml
@@ -22,7 +22,6 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
<id>bin</id>
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
diff --git a/inlong-agent/agent-release/pom.xml
b/inlong-agent/agent-release/pom.xml
index 95dd083..1377553 100644
--- a/inlong-agent/agent-release/pom.xml
+++ b/inlong-agent/agent-release/pom.xml
@@ -61,6 +61,8 @@
<goal>single</goal>
</goals>
<configuration>
+ <outputDirectory>target</outputDirectory>
+ <appendAssemblyId>false</appendAssemblyId>
<finalName>apache-inlong-agent-${project.version}</finalName>
<descriptors>
<descriptor>assembly.xml</descriptor>
diff --git a/inlong-agent/pom.xml b/inlong-agent/pom.xml
index d4493c2..0d20b98 100644
--- a/inlong-agent/pom.xml
+++ b/inlong-agent/pom.xml
@@ -71,6 +71,7 @@
<jetty.version>9.4.34.v20201102</jetty.version>
<rocksdb.version>6.14.6</rocksdb.version>
<codec.version>1.15</codec.version>
+ <lombok.version>1.18.12</lombok.version>
<prometheus.simpleclient.version>0.9.0</prometheus.simpleclient.version>
</properties>
@@ -91,6 +92,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
diff --git a/inlong-audit/audit-common/pom.xml
b/inlong-audit/audit-common/pom.xml
index 7a00175..654b0f8 100644
--- a/inlong-audit/audit-common/pom.xml
+++ b/inlong-audit/audit-common/pom.xml
@@ -27,7 +27,6 @@
<version>0.12.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <version>${parent.version}</version>
<name>Apache InLong - Audit common</name>
<groupId>org.apache.inlong</groupId>
<artifactId>audit-common</artifactId>
diff --git a/inlong-audit/audit-dist/assembly/assembly.xml
b/inlong-audit/audit-dist/assembly/assembly.xml
index ed19cc6..93cf6dd 100644
--- a/inlong-audit/audit-dist/assembly/assembly.xml
+++ b/inlong-audit/audit-dist/assembly/assembly.xml
@@ -25,7 +25,7 @@
<id>bin</id>
<formats>
- <format>dir</format>
+ <format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
diff --git a/inlong-audit/audit-dist/pom.xml b/inlong-audit/audit-dist/pom.xml
index b74f542..8dbc8d8 100644
--- a/inlong-audit/audit-dist/pom.xml
+++ b/inlong-audit/audit-dist/pom.xml
@@ -59,6 +59,8 @@
<goal>single</goal>
</goals>
<configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <outputDirectory>target</outputDirectory>
<descriptors>
<descriptor>assembly/assembly.xml</descriptor>
</descriptors>
diff --git a/inlong-audit/audit-docker/pom.xml
b/inlong-audit/audit-docker/pom.xml
index 32aabfc..142a6f4 100644
--- a/inlong-audit/audit-docker/pom.xml
+++ b/inlong-audit/audit-docker/pom.xml
@@ -84,38 +84,6 @@
</buildArgs>
</configuration>
</plugin>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
- <executions>
- <execution>
- <id>default</id>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>tag-and-push-latest</id>
- <goals>
- <goal>tag</goal>
- <goal>push</goal>
- </goals>
- <configuration>
- <repository>${docker.organization}/audit-store</repository>
- <tag>latest</tag>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <repository>${docker.organization}/audit</repository>
- <pullNewerImage>false</pullNewerImage>
- <tag>apache-inlong-audit-store-${project.version}</tag>
- <buildArgs>
-
<AUDIT_TARBALL>target/apache-inlong-audit-store-${project.version}-bin.tar.gz</AUDIT_TARBALL>
- </buildArgs>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/inlong-audit/audit-source/assembly/assembly.xml
b/inlong-audit/audit-source/assembly/assembly.xml
index 85166bd..39a2406 100644
--- a/inlong-audit/audit-source/assembly/assembly.xml
+++ b/inlong-audit/audit-source/assembly/assembly.xml
@@ -25,29 +25,9 @@
<id>bin</id>
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>true</useProjectArtifact>
- <excludes>
-
<exclude>org.apache.flume.flume-ng-clients:flume-ng-log4jappender:jar:jar-with-dependencies</exclude>
- </excludes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>tools</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>true</useProjectArtifact>
- <includes>
-
<include>org.apache.flume.flume-ng-clients:flume-ng-log4jappender:jar:jar-with-dependencies</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
<fileSets>
diff --git a/inlong-audit/audit-source/pom.xml
b/inlong-audit/audit-source/pom.xml
index 8782099..c0e13aa 100644
--- a/inlong-audit/audit-source/pom.xml
+++ b/inlong-audit/audit-source/pom.xml
@@ -94,6 +94,8 @@
</goals>
<configuration>
<finalName>apache-inlong-audit-source-${project.version}</finalName>
+ <outputDirectory>target</outputDirectory>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>assembly/assembly.xml</descriptor>
</descriptors>
diff --git a/inlong-audit/audit-store/assembly/assembly.xml
b/inlong-audit/audit-store/assembly/assembly.xml
index fe9642c..2503fa2 100644
--- a/inlong-audit/audit-store/assembly/assembly.xml
+++ b/inlong-audit/audit-store/assembly/assembly.xml
@@ -20,7 +20,6 @@
<assembly>
<id>bin</id>
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/inlong-audit/audit-store/pom.xml b/inlong-audit/audit-store/pom.xml
index 4ce1db1..a18fa94 100644
--- a/inlong-audit/audit-store/pom.xml
+++ b/inlong-audit/audit-store/pom.xml
@@ -92,6 +92,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.6.1</version>
<configuration>
<layout>ZIP</layout>
<includes>
@@ -107,6 +108,8 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>apache-inlong-audit-store-${project.version}</finalName>
+ <outputDirectory>target</outputDirectory>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>assembly/assembly.xml</descriptor>
</descriptors>
diff --git a/inlong-audit/pom.xml b/inlong-audit/pom.xml
index b5b9e9b..9972d5b 100644
--- a/inlong-audit/pom.xml
+++ b/inlong-audit/pom.xml
@@ -59,7 +59,6 @@
<spring.version>5.2.8.RELEASE</spring.version>
<lombok.verison>1.18.12</lombok.verison>
<druid.version>1.1.17</druid.version>
- <pulsar.version>2.8.1</pulsar.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -111,13 +110,7 @@
<version>${lombok.verison}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client</artifactId>
- <version>${pulsar.version}</version>
- </dependency>
</dependencies>
-
</dependencyManagement>
<dependencies>
<dependency>
diff --git a/inlong-dataproxy/dataproxy-dist/pom.xml
b/inlong-dataproxy/dataproxy-dist/pom.xml
index 96db136..1b6431c 100644
--- a/inlong-dataproxy/dataproxy-dist/pom.xml
+++ b/inlong-dataproxy/dataproxy-dist/pom.xml
@@ -60,6 +60,7 @@
</goals>
<configuration>
<finalName>apache-inlong-dataproxy-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
diff --git a/inlong-dataproxy/dataproxy-dist/src/main/assembly/assembly.xml
b/inlong-dataproxy/dataproxy-dist/src/main/assembly/assembly.xml
index 7aa9551..20387a3 100644
--- a/inlong-dataproxy/dataproxy-dist/src/main/assembly/assembly.xml
+++ b/inlong-dataproxy/dataproxy-dist/src/main/assembly/assembly.xml
@@ -25,29 +25,9 @@
<id>bin</id>
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>true</useProjectArtifact>
- <excludes>
-
<exclude>org.apache.flume.flume-ng-clients:flume-ng-log4jappender:jar:jar-with-dependencies</exclude>
- </excludes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>tools</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>true</useProjectArtifact>
- <includes>
-
<include>org.apache.flume.flume-ng-clients:flume-ng-log4jappender:jar:jar-with-dependencies</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
<fileSets>
<fileSet>
diff --git a/inlong-distribution/distribution.xml
b/inlong-distribution/distribution.xml
index d4df772..1c16e59 100644
--- a/inlong-distribution/distribution.xml
+++ b/inlong-distribution/distribution.xml
@@ -22,7 +22,6 @@
<!-- Types of packaging, if there are N, N types of packages will be
printed -->
<formats>
<format>tar.gz</format>
- <format>dir</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
diff --git a/inlong-manager/manager-web/assembly.xml
b/inlong-manager/manager-web/assembly.xml
index 23c9f7e..6144598 100755
--- a/inlong-manager/manager-web/assembly.xml
+++ b/inlong-manager/manager-web/assembly.xml
@@ -23,7 +23,6 @@
<!-- Types of packaging, if there are N, N types of packages will be
printed -->
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
diff --git a/inlong-manager/manager-web/pom.xml
b/inlong-manager/manager-web/pom.xml
index b0a8534..77aa0fa 100644
--- a/inlong-manager/manager-web/pom.xml
+++ b/inlong-manager/manager-web/pom.xml
@@ -219,6 +219,7 @@
</goals>
<configuration>
<finalName>apache-inlong-${project.artifactId}-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
diff --git a/inlong-sdk/pom.xml b/inlong-sdk/pom.xml
index 127013a..34cd0d8 100644
--- a/inlong-sdk/pom.xml
+++ b/inlong-sdk/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>inlong-sdk</artifactId>
- <name>inlong-sdk</name>
+ <name>Apache InLong - SDK</name>
<modules>
<module>sort-sdk</module>
diff --git a/inlong-sort-standalone/sort-standalone-dist/pom.xml
b/inlong-sort-standalone/sort-standalone-dist/pom.xml
index f668782..9b8b24b 100644
--- a/inlong-sort-standalone/sort-standalone-dist/pom.xml
+++ b/inlong-sort-standalone/sort-standalone-dist/pom.xml
@@ -60,6 +60,7 @@
</goals>
<configuration>
<finalName>apache-inlong-sort-standalone-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
diff --git
a/inlong-sort-standalone/sort-standalone-dist/src/main/assembly/assembly.xml
b/inlong-sort-standalone/sort-standalone-dist/src/main/assembly/assembly.xml
index 74aa955..37b2fc3 100644
--- a/inlong-sort-standalone/sort-standalone-dist/src/main/assembly/assembly.xml
+++ b/inlong-sort-standalone/sort-standalone-dist/src/main/assembly/assembly.xml
@@ -25,7 +25,6 @@
<id>bin</id>
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
diff --git a/inlong-tubemq/tubemq-client/pom.xml
b/inlong-tubemq/tubemq-client/pom.xml
index 51edd14..7e4e3e9 100644
--- a/inlong-tubemq/tubemq-client/pom.xml
+++ b/inlong-tubemq/tubemq-client/pom.xml
@@ -38,6 +38,7 @@
<version>${plugin.assembly.version}</version>
<configuration>
<finalName>apache-inlong-tubemq-client-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
diff --git a/inlong-tubemq/tubemq-client/src/main/assembly/assembly.xml
b/inlong-tubemq/tubemq-client/src/main/assembly/assembly.xml
index ee48ac7..b5e139f 100644
--- a/inlong-tubemq/tubemq-client/src/main/assembly/assembly.xml
+++ b/inlong-tubemq/tubemq-client/src/main/assembly/assembly.xml
@@ -18,7 +18,6 @@
<assembly>
<id>bin</id>
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
<dependencySets>
diff --git a/inlong-tubemq/tubemq-example/pom.xml
b/inlong-tubemq/tubemq-example/pom.xml
index e3c086a..14c1002 100644
--- a/inlong-tubemq/tubemq-example/pom.xml
+++ b/inlong-tubemq/tubemq-example/pom.xml
@@ -38,6 +38,7 @@
<version>${plugin.assembly.version}</version>
<configuration>
<finalName>apache-inlong-tubemq-example-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
diff --git a/inlong-tubemq/tubemq-example/src/main/assembly/assembly.xml
b/inlong-tubemq/tubemq-example/src/main/assembly/assembly.xml
index 34e53e3..a98d92c 100644
--- a/inlong-tubemq/tubemq-example/src/main/assembly/assembly.xml
+++ b/inlong-tubemq/tubemq-example/src/main/assembly/assembly.xml
@@ -18,7 +18,6 @@
<assembly>
<id>demo</id>
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
<dependencySets>
diff --git a/inlong-tubemq/tubemq-manager/pom.xml
b/inlong-tubemq/tubemq-manager/pom.xml
index 86aeba6..35d89e0 100644
--- a/inlong-tubemq/tubemq-manager/pom.xml
+++ b/inlong-tubemq/tubemq-manager/pom.xml
@@ -185,6 +185,7 @@
</goals>
<configuration>
<finalName>apache-inlong-tubemq-manager-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
diff --git a/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml
b/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml
index e260d80..8d4e7c6 100644
--- a/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml
+++ b/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml
@@ -21,7 +21,6 @@
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0
http://maven.apache.org/xsd/assembly-2.1.0.xsd";>
<id>bin</id>
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
diff --git a/inlong-tubemq/tubemq-server/pom.xml
b/inlong-tubemq/tubemq-server/pom.xml
index dfa48cd..8f89ecb 100644
--- a/inlong-tubemq/tubemq-server/pom.xml
+++ b/inlong-tubemq/tubemq-server/pom.xml
@@ -56,6 +56,7 @@
<version>${plugin.assembly.version}</version>
<configuration>
<finalName>apache-inlong-tubemq-server-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
diff --git a/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml
b/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml
index b3838d9..2a9b7ea 100644
--- a/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml
+++ b/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml
@@ -18,7 +18,6 @@
<assembly>
<id>bin</id>
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
