This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 c3a7b1233 [INLONG-3708][Manager] Make the built package under windows
can run (#3709)
c3a7b1233 is described below
commit c3a7b123313e9ec5913b428a2bcb4c0da27b07f9
Author: dockerzhang <[email protected]>
AuthorDate: Thu Apr 14 20:11:52 2022 +0800
[INLONG-3708][Manager] Make the built package under windows can run (#3709)
---
bin/inlong-daemon | 28 +++++++++++-----------
inlong-agent/agent-release/assembly.xml | 2 ++
inlong-audit/audit-release/assembly.xml | 3 +++
.../dataproxy-dist/src/main/assembly/assembly.xml | 2 ++
inlong-distribution/distribution.xml | 4 ++++
inlong-manager/manager-web/assembly.xml | 3 +++
inlong-sort/sort-connectors/pom.xml | 1 +
inlong-sort/sort-single-tenant/pom.xml | 1 +
.../tubemq-server/src/main/assembly/assembly.xml | 11 ++++++---
9 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/bin/inlong-daemon b/bin/inlong-daemon
index b1ab18d21..95388c3d7 100644
--- a/bin/inlong-daemon
+++ b/bin/inlong-daemon
@@ -59,7 +59,7 @@ init_compo() {
if [[ "$SERVICE" != standalone ]]; then
cd $INLONG_HOME/bin
echo "init $SERVICE"
- ./init-config.sh $SERVICE
+ bash +x ./init-config.sh $SERVICE
fi
}
@@ -75,13 +75,13 @@ start_inlong_audit() {
fi
echo "start audit proxy"
if [ $mq_type == "pulsar" ]; then
- ./bin/proxy-start.sh pulsar
+ bash +x ./bin/proxy-start.sh pulsar
fi
if [ $mq_type == "tubemq" ]; then
- ./bin/proxy-start.sh tube
+ bash +x ./bin/proxy-start.sh tube
fi
echo "start audit store"
- ./bin/store-start.sh
+ bash +x ./bin/store-start.sh
# wait to start
wait_port_to_listen audit ${audit_proxys_port}
}
@@ -98,7 +98,7 @@ start_inlong_manager() {
echo "init apache_inlong_manager database"
mysql -h${spring_datasource_hostname} -P${spring_datasource_port}
-u${spring_datasource_username} -p${spring_datasource_password}
<sql/apache_inlong_manager.sql
fi
- ./bin/startup.sh
+ bash +x ./bin/startup.sh
# wait to start
wait_port_to_listen manager ${manager_server_port}
}
@@ -116,10 +116,10 @@ start_inlong_dataproxy() {
echo "start dataproxy"
cd $INLONG_HOME/inlong-dataproxy
if [ $mq_type == "pulsar" ]; then
- ./bin/dataproxy-start.sh pulsar
+ bash +x ./bin/dataproxy-start.sh pulsar
fi
if [ $mq_type == "tubemq" ]; then
- ./bin/dataproxy-start.sh tube
+ bash +x ./bin/dataproxy-start.sh tube
fi
# wait to start
wait_port_to_listen dataproxy ${dataproxy_port}
@@ -129,7 +129,7 @@ start_inlong_agent() {
init_compo
echo "start agent"
cd $INLONG_HOME/inlong-agent
- ./bin/agent.sh start
+ bash +x ./bin/agent.sh start
# wait to start
wait_port_to_listen agent ${agent_port}
}
@@ -153,7 +153,7 @@ register_service() {
start_inlong_all() {
echo "init configuration"
cd $INLONG_HOME/bin
- ./init-config.sh
+ bash +x ./init-config.sh
# start inlong manager
start_inlong_manager
# start inlong audit
@@ -170,7 +170,7 @@ start_inlong_all() {
stop_inlong_manager() {
echo "stop manager"
cd $INLONG_HOME/inlong-manager/bin
- ./shutdown.sh
+ bash +x ./shutdown.sh
}
stop_inlong_dashboard() {
@@ -181,20 +181,20 @@ stop_inlong_dashboard() {
stop_inlong_dataproxy() {
echo "stop dataproxy"
cd $INLONG_HOME/inlong-dataproxy/bin
- ./dataproxy-stop.sh
+ bash +x ./dataproxy-stop.sh
}
stop_inlong_audit() {
echo "stop audit"
cd $INLONG_HOME/inlong-audit/bin
- ./proxy-stop.sh
- ./store-stop.sh
+ bash +x ./proxy-stop.sh
+ bash +x ./store-stop.sh
}
stop_inlong_agent() {
echo "stop agent"
cd $INLONG_HOME/inlong-agent/bin
- ./agent.sh stop
+ bash +x ./agent.sh stop
}
# stop inlong
diff --git a/inlong-agent/agent-release/assembly.xml
b/inlong-agent/agent-release/assembly.xml
index 6af8a73c6..509899abd 100644
--- a/inlong-agent/agent-release/assembly.xml
+++ b/inlong-agent/agent-release/assembly.xml
@@ -36,6 +36,7 @@
</includes>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
+ <lineEnding>unix</lineEnding>
</fileSet>
<!-- for configs -->
@@ -45,6 +46,7 @@
<include>*.*</include>
</includes>
<outputDirectory>conf</outputDirectory>
+ <lineEnding>unix</lineEnding>
</fileSet>
</fileSets>
<!-- for sub-module dependencies -->
diff --git a/inlong-audit/audit-release/assembly.xml
b/inlong-audit/audit-release/assembly.xml
index f4f558f00..8d5b2d00d 100644
--- a/inlong-audit/audit-release/assembly.xml
+++ b/inlong-audit/audit-release/assembly.xml
@@ -35,16 +35,19 @@
<directory>../bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>../sql</directory>
<outputDirectory>sql</outputDirectory>
<fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>../conf</directory>
<outputDirectory>conf</outputDirectory>
<fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
</fileSet>
</fileSets>
<dependencySets>
diff --git a/inlong-dataproxy/dataproxy-dist/src/main/assembly/assembly.xml
b/inlong-dataproxy/dataproxy-dist/src/main/assembly/assembly.xml
index 7af2fe721..8f86dc320 100644
--- a/inlong-dataproxy/dataproxy-dist/src/main/assembly/assembly.xml
+++ b/inlong-dataproxy/dataproxy-dist/src/main/assembly/assembly.xml
@@ -82,12 +82,14 @@
<fileSet>
<directory>../conf</directory>
<outputDirectory>conf</outputDirectory>
+ <lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>../bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
</fileSet>
</fileSets>
diff --git a/inlong-distribution/distribution.xml
b/inlong-distribution/distribution.xml
index 0108ab2e5..d40fde71e 100644
--- a/inlong-distribution/distribution.xml
+++ b/inlong-distribution/distribution.xml
@@ -21,6 +21,7 @@
<!-- Types of packaging, if there are N, N types of packages will be
printed -->
<formats>
+ <format>dir</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
@@ -80,16 +81,19 @@
<directory>../bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
</fileSet>
<!-- package InLong Standalone conf-->
<fileSet>
<directory>../conf</directory>
<outputDirectory>conf</outputDirectory>
+ <lineEnding>unix</lineEnding>
</fileSet>
<!-- package InLong docker -->
<fileSet>
<directory>../docker</directory>
<outputDirectory>docker</outputDirectory>
+ <lineEnding>unix</lineEnding>
</fileSet>
<!-- package sql file for docker compose-->
<fileSet>
diff --git a/inlong-manager/manager-web/assembly.xml
b/inlong-manager/manager-web/assembly.xml
index 3272bd9fc..71a69a800 100755
--- a/inlong-manager/manager-web/assembly.xml
+++ b/inlong-manager/manager-web/assembly.xml
@@ -39,6 +39,7 @@
<directory>${build.outputDirectory}/bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
</fileSet>
<!-- Output all files in the sql directory to the packaged sql
directory -->
@@ -46,6 +47,7 @@
<directory>${build.outputDirectory}/sql</directory>
<outputDirectory>sql</outputDirectory>
<fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
</fileSet>
<!-- Specify to output the configuration file in target/classes to the
conf directory-->
@@ -53,6 +55,7 @@
<directory>${build.directory}/conf</directory>
<outputDirectory>conf</outputDirectory>
<fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
</fileSet>
<!-- Package third-party dependencies into the lib directory-->
diff --git a/inlong-sort/sort-connectors/pom.xml
b/inlong-sort/sort-connectors/pom.xml
index d64f76df9..153b466d4 100644
--- a/inlong-sort/sort-connectors/pom.xml
+++ b/inlong-sort/sort-connectors/pom.xml
@@ -77,6 +77,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.orc</groupId>
diff --git a/inlong-sort/sort-single-tenant/pom.xml
b/inlong-sort/sort-single-tenant/pom.xml
index 55f3224ce..f9396cd3a 100644
--- a/inlong-sort/sort-single-tenant/pom.xml
+++ b/inlong-sort/sort-single-tenant/pom.xml
@@ -98,6 +98,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.avro</groupId>
diff --git a/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml
b/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml
index b3838d9cd..1e087bf6b 100644
--- a/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml
+++ b/inlong-tubemq/tubemq-server/src/main/assembly/assembly.xml
@@ -32,9 +32,6 @@
<fileSet>
<directory>../</directory>
<includes>
- <include>./bin/*</include>
- <include>./conf/*</include>
- <include>./logs</include>
<include>./resources/**</include>
<include>LICENSE</include>
<include>NOTICE</include>
@@ -46,11 +43,19 @@
<exclude>**/.*/**</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <includes>
+ <include>./conf/*</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
<fileSet>
<includes>
<include>./bin/*</include>
</includes>
<fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
</fileSet>
</fileSets>
</assembly>
