You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/10/10 10:03:40 UTC
[incubator-linkis] branch dev-1.3.0 updated: fix: fix the metadataQuery service lib not in distribution (#3586)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new ea5dba898 fix: fix the metadataQuery service lib not in distribution (#3586)
ea5dba898 is described below
commit ea5dba898b80537a0946cf61073d82c3003f91a2
Author: Jack Xu <xu...@126.com>
AuthorDate: Mon Oct 10 18:03:34 2022 +0800
fix: fix the metadataQuery service lib not in distribution (#3586)
* fix: fix the metadataQuery service lib not in distribution
* fix: fix the distribution.xml's location in linkis-dist
---
linkis-dist/pom.xml | 2 +-
linkis-dist/src/main/assembly/distribution.xml | 2 +-
linkis-engineconn-plugins/hive/src/main/resources/log4j2.xml | 6 +++---
linkis-public-enhancements/distribution.xml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/linkis-dist/pom.xml b/linkis-dist/pom.xml
index cf9e86996..835b73f50 100644
--- a/linkis-dist/pom.xml
+++ b/linkis-dist/pom.xml
@@ -189,7 +189,7 @@
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
<descriptors>
- <descriptor>distribution.xml</descriptor>
+ <descriptor>src/main/assembly/distribution.xml</descriptor>
</descriptors>
</configuration>
</execution>
diff --git a/linkis-dist/src/main/assembly/distribution.xml b/linkis-dist/src/main/assembly/distribution.xml
index da8157874..e4238d022 100644
--- a/linkis-dist/src/main/assembly/distribution.xml
+++ b/linkis-dist/src/main/assembly/distribution.xml
@@ -270,7 +270,7 @@
linkis-package/lib/linkis-public-enhancements/linkis-ps-publicservice
</outputDirectory>
<includes>
- <include>*.jar</include>
+ <include>**/*</include>
</includes>
</fileSet>
diff --git a/linkis-engineconn-plugins/hive/src/main/resources/log4j2.xml b/linkis-engineconn-plugins/hive/src/main/resources/log4j2.xml
index 910e15b97..d490defe9 100644
--- a/linkis-engineconn-plugins/hive/src/main/resources/log4j2.xml
+++ b/linkis-engineconn-plugins/hive/src/main/resources/log4j2.xml
@@ -18,8 +18,8 @@
<configuration status="error" monitorInterval="30">
<appenders>
- <RollingFile name="RollingFile" append="true" fileName="${env:LOG_DIRS}/stdout"
- filePattern="${env:LOG_DIRS}/$${date:yyyy-MM}/linkis-log-%d{yyyy-MM-dd-hh}-%i.log">
+ <RollingFile name="RollingFile" append="true" fileName="${env:LOG_DIRS:-logs}/stdout"
+ filePattern="${env:LOG_DIRS:-logs}/$${date:yyyy-MM}/linkis-log-%d{yyyy-MM-dd-hh}-%i.log">
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
<Policies>
<SizeBasedTriggeringPolicy size="100MB"/>
@@ -27,7 +27,7 @@
<DefaultRolloverStrategy max="10"/>
</RollingFile>
- <File name="YarnAppIdOutputFile" append="true" fileName="${env:LOG_DIRS}/yarnApp.log">
+ <File name="YarnAppIdOutputFile" append="true" fileName="${env:LOG_DIRS:-logs}/yarnApp.log">
<RegexFilter regex=".* application .*" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
</File>
diff --git a/linkis-public-enhancements/distribution.xml b/linkis-public-enhancements/distribution.xml
index 728179147..0f753b3d8 100644
--- a/linkis-public-enhancements/distribution.xml
+++ b/linkis-public-enhancements/distribution.xml
@@ -311,7 +311,7 @@
<fileSets>
<fileSet>
<directory>
- ../linkis-datasource/linkis-metadata-query/server/target/out/lib/service
+ ./linkis-datasource/linkis-metadata-query/server/target/out/lib/service
</directory>
<outputDirectory>
lib/metadataquery-service
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org