From 2d76e13310ed63ef8469f23af688e436e3335737 Mon Sep 17 00:00:00 2001
From: wuchunfu <319355703@qq.com>
Date: Thu, 20 Feb 2025 23:37:55 +0800
Subject: [PATCH] BIGTOP-4365: Refactor the server and agent package to the
bigtop manager dist module
---
bigtop-manager-agent/pom.xml | 29 ++-
.../src/main/resources/assembly/agent.xml | 50 -----
bigtop-manager-dist/pom.xml | 175 ++++++++++++++++++
.../src/main/assembly/assembly-agent-bin.xml | 63 +++++++
.../src/main/assembly/assembly-server-bin.xml | 77 ++++++++
.../src/main/assembly/assembly-src.xml | 87 +++++++++
bigtop-manager-server/pom.xml | 17 +-
.../src/main/resources/assembly/server.xml | 64 -------
pom.xml | 155 +++++++++++++---
9 files changed, 564 insertions(+), 153 deletions(-)
delete mode 100644 bigtop-manager-agent/src/main/resources/assembly/agent.xml
create mode 100644 bigtop-manager-dist/pom.xml
create mode 100644 bigtop-manager-dist/src/main/assembly/assembly-agent-bin.xml
create mode 100644 bigtop-manager-dist/src/main/assembly/assembly-server-bin.xml
create mode 100644 bigtop-manager-dist/src/main/assembly/assembly-src.xml
delete mode 100644 bigtop-manager-server/src/main/resources/assembly/server.xml
diff --git a/bigtop-manager-agent/pom.xml b/bigtop-manager-agent/pom.xml
index a2cdec095..6698a9e50 100644
--- a/bigtop-manager-agent/pom.xml
+++ b/bigtop-manager-agent/pom.xml
@@ -139,6 +139,18 @@
spring-boot-maven-plugin
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ ${java.version}
+ ${java.version}
+ ${java.version}
+ ${java.version}
+ ${project.build.sourceEncoding}
+
+
+
org.apache.maven.plugins
maven-jar-plugin
@@ -154,20 +166,21 @@
org.apache.maven.plugins
- maven-assembly-plugin
+ maven-dependency-plugin
- bigtop-manager-agent
+ copy-dependencies
- single
+ copy-dependencies
package
- bigtop-manager-agent
-
- src/main/resources/assembly/agent.xml
-
- false
+ ${project.build.directory}/libs/
+ false
+ false
+ true
+ compile
+ runtime
diff --git a/bigtop-manager-agent/src/main/resources/assembly/agent.xml b/bigtop-manager-agent/src/main/resources/assembly/agent.xml
deleted file mode 100644
index e464a927a..000000000
--- a/bigtop-manager-agent/src/main/resources/assembly/agent.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
- agent
-
- tar.gz
-
- true
- bigtop-manager-agent
-
-
- ${basedir}/src/main/resources
-
- *.yml
- *.xml
-
- conf
-
-
- ${basedir}/src/main/resources/bin
- bin
- 0755
- 0755
-
-
-
-
- libs
-
-
-
diff --git a/bigtop-manager-dist/pom.xml b/bigtop-manager-dist/pom.xml
new file mode 100644
index 000000000..ab82e1658
--- /dev/null
+++ b/bigtop-manager-dist/pom.xml
@@ -0,0 +1,175 @@
+
+
+
+ 4.0.0
+
+ org.apache.bigtop
+ bigtop-manager
+ ${revision}
+ ../pom.xml
+
+
+ bigtop-manager-dist
+ ${project.artifactId}
+ Bigtop Manager Dist
+
+
+
+ true
+
+
+
+
+
+ org.apache.bigtop
+ bigtop-manager-bom
+ ${project.version}
+ pom
+ import
+
+
+
+
+
+
+ org.apache.bigtop
+ bigtop-manager-server
+ ${project.version}
+
+
+ org.apache.bigtop
+ bigtop-manager-agent
+ ${project.version}
+
+
+
+
+ apache-bigtop-manager-${project.version}
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+
+ server-bin
+
+ single
+
+ package
+
+
+ src/main/assembly/assembly-server-bin.xml
+
+ true
+
+
+
+ agent-bin
+
+ single
+
+ package
+
+
+ src/main/assembly/assembly-agent-bin.xml
+
+ true
+
+
+
+ src
+
+ single
+
+ package
+
+
+ src/main/assembly/assembly-src.xml
+
+ true
+
+
+
+
+
+
+
+
+
+ release
+
+
+ release
+ true
+
+
+
+ apache-bigtop-manager-${project.version}
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+
+ server-bin
+
+ single
+
+ package
+
+
+ src/main/assembly/assembly-server-bin.xml
+
+ true
+
+
+
+ agent-bin
+
+ single
+
+ package
+
+
+ src/main/assembly/assembly-agent-bin.xml
+
+ true
+
+
+
+ src
+
+ single
+
+ package
+
+
+ src/main/assembly/assembly-src.xml
+
+ true
+
+
+
+
+
+
+
+
+
diff --git a/bigtop-manager-dist/src/main/assembly/assembly-agent-bin.xml b/bigtop-manager-dist/src/main/assembly/assembly-agent-bin.xml
new file mode 100644
index 000000000..4885e3429
--- /dev/null
+++ b/bigtop-manager-dist/src/main/assembly/assembly-agent-bin.xml
@@ -0,0 +1,63 @@
+
+
+ agent-bin
+
+ tar.gz
+
+ true
+ ${project.build.finalName}-agent-bin
+
+
+
+ ${project.basedir}/../bigtop-manager-agent/src/main/resources/bin
+ bin
+ 0755
+ 0755
+
+
+ ${project.basedir}/../bigtop-manager-agent/src/main/resources
+
+ *.yml
+ *.xml
+
+ conf
+
+
+ ${project.basedir}/../bigtop-manager-agent/target
+ libs
+ 0755
+ 0755
+
+ *.jar
+
+
+
+ ${project.basedir}/../bigtop-manager-agent/target/libs
+ libs
+ 0755
+ 0755
+
+ *.jar
+
+
+
+
diff --git a/bigtop-manager-dist/src/main/assembly/assembly-server-bin.xml b/bigtop-manager-dist/src/main/assembly/assembly-server-bin.xml
new file mode 100644
index 000000000..941eac459
--- /dev/null
+++ b/bigtop-manager-dist/src/main/assembly/assembly-server-bin.xml
@@ -0,0 +1,77 @@
+
+
+ server-bin
+
+ tar.gz
+
+ true
+ ${project.build.finalName}-server-bin
+
+
+
+ ${project.basedir}/../bigtop-manager-server/src/main/resources/bin
+ bin
+ 0755
+ 0755
+
+
+ ${project.basedir}/../bigtop-manager-server/src/main/resources
+
+ *.yml
+ *.xml
+
+ conf
+
+
+ ${project.basedir}/../bigtop-manager-server/src/main/resources/stacks
+ stacks
+ 0755
+ 0755
+
+
+ ${project.basedir}/../bigtop-manager-server/src/main/resources/ddl
+ ddl
+
+
+ ${project.basedir}/../bigtop-manager-ui/dist
+ ui
+
+
+ ${project.basedir}/../bigtop-manager-server/target
+ libs
+ 0755
+ 0755
+
+ *.jar
+
+
+
+ ${project.basedir}/../bigtop-manager-server/target/libs
+ libs
+ 0755
+ 0755
+
+ *.jar
+
+
+
+
diff --git a/bigtop-manager-dist/src/main/assembly/assembly-src.xml b/bigtop-manager-dist/src/main/assembly/assembly-src.xml
new file mode 100644
index 000000000..e18eb9560
--- /dev/null
+++ b/bigtop-manager-dist/src/main/assembly/assembly-src.xml
@@ -0,0 +1,87 @@
+
+
+
+ src
+
+ tar.gz
+
+ true
+ ${project.build.finalName}-src
+
+
+
+ ../
+ true
+
+ **/*
+
+
+
+ **/.github/**
+
+
+ **/target/**
+ **/*.class
+ **/*.jar
+ **/*.war
+ **/*.zip
+ **/*.tar
+ **/*.tar.gz
+
+
+ release.properties
+ **/dependency-reduced-pom.xml
+ **/pom.xml.releaseBackup
+ **/.flattened-pom.xml
+ *.gpg
+
+ **/.github/**
+ **/.dlc.json
+
+ **/.settings/**
+ **/.project
+ **/.classpath
+
+
+ **/.idea/**
+ **/*.ipr
+ **/*.iml
+ **/*.iws
+
+
+ **/logs/**
+ **/*.log
+ **/*.doc
+ **/*.cache
+ **/*.diff
+ **/*.patch
+ **/*.tmp
+ **/all-dependencies.txt
+ **/self-modules.txt
+ **/third-party-dependencies.txt
+
+
+ **/.DS_Store
+ **/Thumbs.db
+
+
+
+
diff --git a/bigtop-manager-server/pom.xml b/bigtop-manager-server/pom.xml
index 84d9bec75..351940d34 100644
--- a/bigtop-manager-server/pom.xml
+++ b/bigtop-manager-server/pom.xml
@@ -216,20 +216,21 @@
org.apache.maven.plugins
- maven-assembly-plugin
+ maven-dependency-plugin
- bigtop-manager-server
+ copy-dependencies
- single
+ copy-dependencies
package
- bigtop-manager-server
-
- src/main/resources/assembly/server.xml
-
- false
+ ${project.build.directory}/libs/
+ false
+ false
+ true
+ compile
+ runtime
diff --git a/bigtop-manager-server/src/main/resources/assembly/server.xml b/bigtop-manager-server/src/main/resources/assembly/server.xml
deleted file mode 100644
index d83107220..000000000
--- a/bigtop-manager-server/src/main/resources/assembly/server.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
- server
-
- tar.gz
-
- true
- bigtop-manager-server
-
-
- ${basedir}/src/main/resources
-
- *.yml
- *.xml
-
- conf
-
-
- ${basedir}/src/main/resources/bin
- bin
- 0755
- 0755
-
-
- ${basedir}/src/main/resources/stacks
- stacks
- 0755
- 0755
-
-
- ${basedir}/src/main/resources/ddl
- ddl
-
-
- ${basedir}/../bigtop-manager-ui/dist
- ./ui
-
-
-
-
- libs
-
-
-
diff --git a/pom.xml b/pom.xml
index 86bbd6e91..46580128d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,13 @@
1.4.0
3.3.0
3.8.1
+ 3.8.1
+ 3.3.1
+ 3.11.2
+ false
+ 2.1.0
+ 2.5.0
+ 1.6.0
3.6.0
3.2.0
3.1.1
@@ -190,6 +197,7 @@
+ ${project.artifactId}-${project.version}
@@ -223,12 +231,100 @@
${maven-assembly-plugin.version}
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ ${maven-dependency-plugin.version}
+
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ ${maven-source-plugin.version}
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ ${maven-javadoc-plugin.version}
+
+ ${java.version}
+ false
+ true
+ ${maven.javadoc.skip}
+ -Xdoclint:none
+
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
org.codehaus.mojo
build-helper-maven-plugin
${build-helper-maven-plugin.version}
+
+ org.codehaus.mojo
+ license-maven-plugin
+ ${license-maven-plugin.version}
+
+ ${project.basedir}/bigtop-manager-dist/target/
+ THIRD-PARTY.txt
+ false
+ false
+ true
+ 30000
+ 30000
+ 30000
+ test,provided
+
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+ ${flatten-maven-plugin.version}
+
+ true
+ resolveCiFriendliesOnly
+
+
+
+ flatten
+
+ flatten
+
+ process-resources
+
+
+ flatten.clean
+
+ clean
+
+ clean
+
+
+
+
org.xolstice.maven.plugins
protobuf-maven-plugin
@@ -239,34 +335,35 @@
- org.codehaus.mojo
- flatten-maven-plugin
- ${flatten-maven-plugin.version}
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+
+ org.apache.maven.plugins
+ maven-release-plugin
- true
- resolveCiFriendliesOnly
+ true
+ @{project.version}
+ ${project.version}
-
-
- flatten
-
- flatten
-
- process-resources
-
-
- flatten.clean
-
- clean
-
- clean
-
-
+
+
+ org.apache.maven.scm
+ maven-scm-provider-jgit
+ ${maven-scm-provider-jgit.version}
+
+
- org.apache.maven.plugins
- maven-compiler-plugin
+ org.codehaus.mojo
+ license-maven-plugin
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
@@ -315,4 +412,16 @@
+
+
+
+ release
+
+ true
+
+
+ bigtop-manager-dist
+
+
+