Unverified Commit 178b1f30 authored by 乔占卫's avatar 乔占卫 Committed by GitHub
Browse files

Merge pull request #541 from qiaozhanwei/dev-1.1.0 

install.sh and log4j-to-slf4j-2.11.2.jar conflict solve
parents 16efb11c 5a168d81

escheduler-api/pom.xml

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ 
          <groupId>org.springframework.boot</groupId>

          <artifactId>spring-boot-starter-tomcat</artifactId>

        </exclusion>

        <exclusion>

          <artifactId>log4j-to-slf4j</artifactId>

          <groupId>org.apache.logging.log4j</groupId>

        </exclusion>

      </exclusions>

    </dependency>

escheduler-dao/pom.xml

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ 
					<groupId>org.apache.tomcat</groupId>

					<artifactId>tomcat-jdbc</artifactId>

				</exclusion>

				<exclusion>

					<artifactId>log4j-to-slf4j</artifactId>

					<groupId>org.apache.logging.log4j</groupId>

				</exclusion>

			</exclusions>

		</dependency>

		<dependency>

install.sh

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ singleYarnIp="ark1" 
hdfsPath="/escheduler"



# 拥有在hdfs根路径/下创建目录权限的用户

# 注意：如果开启了kerberos，则直接hdfsRootUser=，就可以

hdfsRootUser="hdfs"



# common 配置