This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/bigtop-manager.git
The following commit(s) were added to refs/heads/main by this push:
new a9aa45bb BIGTOP-4365: Refactor the server and agent package to the
bigtop manager dist module (#185)
a9aa45bb is described below
commit a9aa45bbee61cf69bcdc162ef31b5eee79789444
Author: ChunFuWu <[email protected]>
AuthorDate: Fri Mar 7 19:08:12 2025 +0800
BIGTOP-4365: Refactor the server and agent package to the bigtop manager
dist module (#185)
---
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 | 96 +++++++++++
bigtop-manager-server/pom.xml | 17 +-
.../src/main/resources/assembly/server.xml | 64 --------
pom.xml | 144 ++++++++++++++---
9 files changed, 559 insertions(+), 156 deletions(-)
diff --git a/bigtop-manager-agent/pom.xml b/bigtop-manager-agent/pom.xml
index a2cdec09..6698a9e5 100644
--- a/bigtop-manager-agent/pom.xml
+++ b/bigtop-manager-agent/pom.xml
@@ -139,6 +139,18 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ <testSource>${java.version}</testSource>
+ <testTarget>${java.version}</testTarget>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -154,20 +166,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>bigtop-manager-agent</id>
+ <id>copy-dependencies</id>
<goals>
- <goal>single</goal>
+ <goal>copy-dependencies</goal>
</goals>
<phase>package</phase>
<configuration>
- <finalName>bigtop-manager-agent</finalName>
- <descriptors>
-
<descriptor>src/main/resources/assembly/agent.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
+
<outputDirectory>${project.build.directory}/libs/</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <includeScope>compile</includeScope>
+ <includeScope>runtime</includeScope>
</configuration>
</execution>
</executions>
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 e464a927..00000000
--- a/bigtop-manager-agent/src/main/resources/assembly/agent.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ https://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
--->
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0
http://maven.apache.org/xsd/assembly-2.1.0.xsd";>
- <id>agent</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>bigtop-manager-agent</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>*.yml</include>
- <include>*.xml</include>
- </includes>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${basedir}/src/main/resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>libs</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/bigtop-manager-dist/pom.xml b/bigtop-manager-dist/pom.xml
new file mode 100644
index 00000000..ab82e165
--- /dev/null
+++ b/bigtop-manager-dist/pom.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ https://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.bigtop</groupId>
+ <artifactId>bigtop-manager</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>bigtop-manager-dist</artifactId>
+ <name>${project.artifactId}</name>
+ <description>Bigtop Manager Dist</description>
+
+ <properties>
+ <!-- disable mvn deploy to central maven repo by default -->
+ <maven.deploy.skip>true</maven.deploy.skip>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.bigtop</groupId>
+ <artifactId>bigtop-manager-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.bigtop</groupId>
+ <artifactId>bigtop-manager-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bigtop</groupId>
+ <artifactId>bigtop-manager-agent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>apache-bigtop-manager-${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>server-bin</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/assembly-server-bin.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>agent-bin</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/assembly-agent-bin.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>src</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/assembly-src.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <activation>
+ <property>
+ <name>release</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <finalName>apache-bigtop-manager-${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>server-bin</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/assembly-server-bin.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>agent-bin</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/assembly-agent-bin.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>src</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/assembly-src.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
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 00000000..4885e342
--- /dev/null
+++ b/bigtop-manager-dist/src/main/assembly/assembly-agent-bin.xml
@@ -0,0 +1,63 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0
http://maven.apache.org/xsd/assembly-2.1.0.xsd";>
+ <id>agent-bin</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${project.build.finalName}-agent-bin</baseDirectory>
+
+ <fileSets>
+ <fileSet>
+
<directory>${project.basedir}/../bigtop-manager-agent/src/main/resources/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../bigtop-manager-agent/src/main/resources</directory>
+ <includes>
+ <include>*.yml</include>
+ <include>*.xml</include>
+ </includes>
+ <outputDirectory>conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../bigtop-manager-agent/target</directory>
+ <outputDirectory>libs</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../bigtop-manager-agent/target/libs</directory>
+ <outputDirectory>libs</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
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 00000000..941eac45
--- /dev/null
+++ b/bigtop-manager-dist/src/main/assembly/assembly-server-bin.xml
@@ -0,0 +1,77 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0
http://maven.apache.org/xsd/assembly-2.1.0.xsd";>
+ <id>server-bin</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${project.build.finalName}-server-bin</baseDirectory>
+
+ <fileSets>
+ <fileSet>
+
<directory>${project.basedir}/../bigtop-manager-server/src/main/resources/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../bigtop-manager-server/src/main/resources</directory>
+ <includes>
+ <include>*.yml</include>
+ <include>*.xml</include>
+ </includes>
+ <outputDirectory>conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../bigtop-manager-server/src/main/resources/stacks</directory>
+ <outputDirectory>stacks</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../bigtop-manager-server/src/main/resources/ddl</directory>
+ <outputDirectory>ddl</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../bigtop-manager-ui/dist</directory>
+ <outputDirectory>ui</outputDirectory>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../bigtop-manager-server/target</directory>
+ <outputDirectory>libs</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+
<directory>${project.basedir}/../bigtop-manager-server/target/libs</directory>
+ <outputDirectory>libs</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
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 00000000..aab25fa3
--- /dev/null
+++ b/bigtop-manager-dist/src/main/assembly/assembly-src.xml
@@ -0,0 +1,96 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<assembly
+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
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>src</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${project.build.finalName}-src</baseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>../</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <!-- maven ignore -->
+ <exclude>**/target/**</exclude>
+ <exclude>**/*.class</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.war</exclude>
+ <exclude>**/*.zip</exclude>
+ <exclude>**/*.tar</exclude>
+ <exclude>**/*.tar.gz</exclude>
+
+ <!-- maven plugin ignore -->
+ <exclude>release.properties</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>**/pom.xml.releaseBackup</exclude>
+ <exclude>**/.flattened-pom.xml</exclude>
+ <exclude>*.gpg</exclude>
+
+ <!--github ignore-->
+ <exclude>**/.git/**</exclude>
+ <exclude>**/.github/**</exclude>
+ <exclude>**/.dlc.json</exclude>
+
+ <!-- eclipse ignore -->
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+
+ <!-- idea ignore -->
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.iws</exclude>
+
+ <!-- vscode ignore -->
+ <exclude>**/.vscode/**</exclude>
+
+ <!-- frontend ignore -->
+ <exclude>**/node/**</exclude>
+ <exclude>**/node_modules/**</exclude>
+ <exclude>**/dist/**</exclude>
+
+ <!-- temp ignore -->
+ <exclude>**/logs/**</exclude>
+ <exclude>**/tasklogs/**</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.doc</exclude>
+ <exclude>**/*.cache</exclude>
+ <exclude>**/*.diff</exclude>
+ <exclude>**/*.patch</exclude>
+ <exclude>**/*.tmp</exclude>
+ <exclude>**/all-dependencies.txt</exclude>
+ <exclude>**/self-modules.txt</exclude>
+ <exclude>**/third-party-dependencies.txt</exclude>
+
+ <!-- system ignore -->
+ <exclude>**/.DS_Store</exclude>
+ <exclude>**/Thumbs.db</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/bigtop-manager-server/pom.xml b/bigtop-manager-server/pom.xml
index 84d9bec7..351940d3 100644
--- a/bigtop-manager-server/pom.xml
+++ b/bigtop-manager-server/pom.xml
@@ -216,20 +216,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>bigtop-manager-server</id>
+ <id>copy-dependencies</id>
<goals>
- <goal>single</goal>
+ <goal>copy-dependencies</goal>
</goals>
<phase>package</phase>
<configuration>
- <finalName>bigtop-manager-server</finalName>
- <descriptors>
-
<descriptor>src/main/resources/assembly/server.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
+
<outputDirectory>${project.build.directory}/libs/</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <includeScope>compile</includeScope>
+ <includeScope>runtime</includeScope>
</configuration>
</execution>
</executions>
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 d8310722..00000000
--- a/bigtop-manager-server/src/main/resources/assembly/server.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ https://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
--->
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0
http://maven.apache.org/xsd/assembly-2.1.0.xsd";>
- <id>server</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>bigtop-manager-server</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>*.yml</include>
- <include>*.xml</include>
- </includes>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${basedir}/src/main/resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${basedir}/src/main/resources/stacks</directory>
- <outputDirectory>stacks</outputDirectory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${basedir}/src/main/resources/ddl</directory>
- <outputDirectory>ddl</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../bigtop-manager-ui/dist</directory>
- <outputDirectory>./ui</outputDirectory>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>libs</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/pom.xml b/pom.xml
index 86bbd6e9..14f0fde4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,9 +49,15 @@
<revision>0.0.1-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>17</java.version>
- <flatten-maven-plugin.version>1.4.0</flatten-maven-plugin.version>
- <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
+ <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
+ <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+ <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
+ <maven.javadoc.skip>false</maven.javadoc.skip>
+ <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
+
<maven-scm-provider-jgit.version>2.1.0</maven-scm-provider-jgit.version>
+ <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<spring-boot-maven-plugin.version>3.1.1</spring-boot-maven-plugin.version>
@@ -190,6 +196,7 @@
</dependencies>
<build>
+ <finalName>${project.artifactId}-${project.version}</finalName>
<pluginManagement>
<plugins>
<plugin>
@@ -223,12 +230,101 @@
<version>${maven-assembly-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven-dependency-plugin.version}</version>
+ <configuration>
+ <appendOutput>true</appendOutput>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${maven-source-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
+ <configuration>
+ <source>${java.version}</source>
+ <failOnError>false</failOnError>
+ <aggregate>true</aggregate>
+ <skip>${maven.javadoc.skip}</skip>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>${maven-release-plugin.version}</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <tagNameFormat>@{project.version}</tagNameFormat>
+ <tagBase>${project.version}</tagBase>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-jgit</artifactId>
+
<version>${maven-scm-provider-jgit.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-maven-plugin.version}</version>
</plugin>
+ <!-- make sure that flatten runs after shaded -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>${flatten-maven-plugin.version}</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <flattenMode>resolveCiFriendliesOnly</flattenMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ <phase>process-resources</phase>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>clean</phase>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
@@ -239,34 +335,18 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- <version>${flatten-maven-plugin.version}</version>
- <configuration>
- <updatePomFile>true</updatePomFile>
- <flattenMode>resolveCiFriendliesOnly</flattenMode>
- </configuration>
- <executions>
- <execution>
- <id>flatten</id>
- <goals>
- <goal>flatten</goal>
- </goals>
- <phase>process-resources</phase>
- </execution>
- <execution>
- <id>flatten.clean</id>
- <goals>
- <goal>clean</goal>
- </goals>
- <phase>clean</phase>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-release-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
</plugin>
<plugin>
@@ -315,4 +395,16 @@
</extension>
</extensions>
</build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>bigtop-manager-dist</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
