This is an automated email from the ASF dual-hosted git repository.
weihao pushed a commit to branch splitMqtt
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/splitMqtt by this push:
new 91758793931 add file put
91758793931 is described below
commit 9175879393119ca79c33a6bda263fb79dbb0533d
Author: Weihao Li <[email protected]>
AuthorDate: Mon Jan 19 17:38:06 2026 +0800
add file put
Signed-off-by: Weihao Li <[email protected]>
---
distribution/pom.xml | 5 ----
distribution/src/assembly/all.xml | 5 +++-
distribution/src/assembly/datanode.xml | 4 +++
.../src/assembly/external-service-impl.xml | 17 +++--------
external-service-impl/mqtt/pom.xml | 11 ++++++--
.../mqtt/src/assembly/external-service-impl.xml | 33 ----------------------
6 files changed, 21 insertions(+), 54 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 8b13a815a5a..9d458cf8a07 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -53,11 +53,6 @@
<artifactId>library-udf</artifactId>
<version>2.0.7-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.iotdb</groupId>
- <artifactId>mqtt</artifactId>
- <version>2.0.7-SNAPSHOT</version>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/distribution/src/assembly/all.xml
b/distribution/src/assembly/all.xml
index e28fc04a9ee..255912d75e6 100644
--- a/distribution/src/assembly/all.xml
+++ b/distribution/src/assembly/all.xml
@@ -32,7 +32,6 @@
<include>*:iotdb-server:zip:*</include>
<include>*:iotdb-cli:zip:*</include>
<include>*:iotdb-confignode:zip:*</include>
- <include>*:external-service-impl:zip:*</include>
</includes>
<outputDirectory>${file.separator}</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
@@ -93,6 +92,10 @@
<outputDirectory>conf</outputDirectory>
<fileMode>0755</fileMode>
</file>
+ <file>
+
<source>${maven.multiModuleProjectDirectory}/external-service-impl/mqtt/target/mqtt-${project.version}-jar-with-dependencies.jar</source>
+ <outputDirectory>lib</outputDirectory>
+ </file>
</files>
<componentDescriptors>
<componentDescriptor>common-files.xml</componentDescriptor>
diff --git a/distribution/src/assembly/datanode.xml
b/distribution/src/assembly/datanode.xml
index 016059a903a..cbc2cd9617b 100644
--- a/distribution/src/assembly/datanode.xml
+++ b/distribution/src/assembly/datanode.xml
@@ -72,6 +72,10 @@
<exclude>**/*ainode.*</exclude>
</excludes>
<fileMode>0755</fileMode>
+ <file>
+
<source>${maven.multiModuleProjectDirectory}/external-service-impl/mqtt/target/mqtt-${project.version}-jar-with-dependencies.jar</source>
+ <outputDirectory>lib</outputDirectory>
+ </file>
</fileSet>
</fileSets>
<componentDescriptors>
diff --git a/distribution/src/assembly/external-service-impl.xml
b/distribution/src/assembly/external-service-impl.xml
index b5a46fbb7cc..273efe6eddf 100644
--- a/distribution/src/assembly/external-service-impl.xml
+++ b/distribution/src/assembly/external-service-impl.xml
@@ -26,19 +26,6 @@
<format>zip</format>
</formats>
<baseDirectory>apache-iotdb-${project.version}-external-service-impl-bin</baseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.apache.iotdb:mqtt</include>
- </includes>
- <outputDirectory/>
-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <useProjectArtifact>true</useProjectArtifact>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
<fileSets>
<fileSet>
<directory>${project.basedir}/../licenses</directory>
@@ -56,5 +43,9 @@
<outputDirectory>licenses</outputDirectory>
<destName>NOTICE</destName>
</file>
+ <file>
+
<source>${maven.multiModuleProjectDirectory}/external-service-impl/mqtt/target/mqtt-${project.version}-jar-with-dependencies.jar</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
</files>
</assembly>
diff --git a/external-service-impl/mqtt/pom.xml
b/external-service-impl/mqtt/pom.xml
index 510e7cf8bbf..f62f7e475c2 100644
--- a/external-service-impl/mqtt/pom.xml
+++ b/external-service-impl/mqtt/pom.xml
@@ -96,20 +96,27 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.version}</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
- <phase>package</phase>
+ <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
+ <!-- this is used for inheritance merges -->
+ <phase>package</phase>
</execution>
</executions>
</plugin>
diff --git a/external-service-impl/mqtt/src/assembly/external-service-impl.xml
b/external-service-impl/mqtt/src/assembly/external-service-impl.xml
deleted file mode 100644
index 735e6ed0d7f..00000000000
--- a/external-service-impl/mqtt/src/assembly/external-service-impl.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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
-
- 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>
- <id>jar-with-dependencies</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
