Remove conflicting dependencies

Closes #175
apache · Dec 18, 2019 · e298137 · e298137
1 parent 878eb7e
commit e298137
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 23 deletions.
diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml
@@ -41,6 +41,7 @@
  <includes>
  <include>**/*</include>
  </includes>
+ <fileMode>0777</fileMode>
  <lineEnding>unix</lineEnding>
  </fileSet>
 

diff --git a/bin/start-all.sh b/bin/start-all.sh
@@ -42,7 +42,6 @@ fi
 }
 
 sudo yum -y install dos2unix > /dev/null 2>&1
-sudo yum -y install dos2unix > /dev/null 2>&1
 
 local_host="`hostname --fqdn`"
 
@@ -97,6 +96,11 @@ then
  SERVER_IP=$local_host
 fi
 
+if executeCMD $SERVER_IP test -e $SERVER_BIN; then
+ echo "$SERVER_NAME is not installed,the startup steps will be skipped"
+ return
+fi
+
 isLocal $SERVER_IP
 flag=$?
 echo "Is local "$flag

diff --git a/bml/bml-engine-hook/pom.xml b/bml/bml-engine-hook/pom.xml
@@ -22,6 +22,54 @@
  <groupId>com.webank.wedatasphere.linkis</groupId>
  <artifactId>linkis-bmlclient</artifactId>
  <version>${linkis.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.webank.wedatasphere.linkis</groupId>
+ <artifactId>linkis-storage</artifactId>
+ <version>${linkis.version}</version>
+ <scope>provided</scope>
  </dependency>
  <dependency>
  <groupId>com.webank.wedatasphere.linkis</groupId>

diff --git a/bml/bmlclient/pom.xml b/bml/bmlclient/pom.xml
@@ -26,6 +26,7 @@
  <groupId>com.webank.wedatasphere.linkis</groupId>
  <artifactId>linkis-storage</artifactId>
  <version>${linkis.version}</version>
+ <scope>provided</scope>
  </dependency>
  <dependency>
  <groupId>com.webank.wedatasphere.linkis</groupId>

diff --git a/conf/config.sh b/conf/config.sh
@@ -25,13 +25,13 @@ RESULT_SET_ROOT_PATH=hdfs:///tmp/linkis
 #HIVE_META_PASSWORD=
 
 ###HADOOP CONF DIR
-HADOOP_CONF_DIR=/etc/hadoop/hadoop-conf
+HADOOP_CONF_DIR=/appcom/config/hadoop-config
 
 ###HIVE CONF DIR
-HIVE_CONF_DIR=/etc/hive/hive-conf
+HIVE_CONF_DIR=/appcom/config/hive-config
 
 ###SPARK CONF DIR
-SPARK_CONF_DIR=/etc/spark/spark-conf
+SPARK_CONF_DIR=/appcom/config/spark-config
 
 ################### The install Configuration of all Micro-Services #####################
 #
@@ -105,7 +105,6 @@ BML_PORT=9113
 #LDAP_BASEDN=dc=webank,dc=com
 
 ## java application default jvm memory
-
-SERVER_HEAP_SIZE="512M"
+export SERVER_HEAP_SIZE="512M"
 
 LINKIS_VERSION=0.9.2
diff --git a/metadata/pom.xml b/metadata/pom.xml
@@ -236,6 +236,10 @@
  <groupId>org.apache.httpcomponents</groupId>
  <artifactId>httpcore</artifactId>
  </exclusion>
+ <exclusion>
+ <artifactId>javax.rs.ws</artifactId>
+ <groupId>jsr311-api</groupId>
+ </exclusion>
  </exclusions>
  </dependency>
 

diff --git a/resourceManager/resourcemanagerserver/pom.xml b/resourceManager/resourcemanagerserver/pom.xml
@@ -71,10 +71,10 @@
  <groupId>org.ow2.asm</groupId>
  <artifactId>asm</artifactId>
  </exclusion>
- <!--<exclusion>-->
- <!--<groupId>org.jboss.netty</groupId>-->
- <!--<artifactId>netty</artifactId>-->
- <!--</exclusion>-->
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
  <exclusion>
  <groupId>javax.servlet</groupId>
  <artifactId>servlet-api</artifactId>

diff --git a/ujes/definedEngines/hive/engine/pom.xml b/ujes/definedEngines/hive/engine/pom.xml
@@ -79,6 +79,10 @@
  <groupId>org.slf4j</groupId>
  <artifactId>slf4j-api</artifactId>
  </exclusion>
+ <exclusion>
+ <artifactId>javax.rs.ws</artifactId>
+ <groupId>jsr311-api</groupId>
+ </exclusion>
  </exclusions>
  </dependency>
  <dependency>
@@ -138,6 +142,10 @@
  <groupId>org.slf4j</groupId>
  <artifactId>slf4j-api</artifactId>
  </exclusion>
+ <exclusion>
+ <artifactId>javax.rs.ws</artifactId>
+ <groupId>jsr311-api</groupId>
+ </exclusion>
  </exclusions>
  </dependency>
  <dependency>
@@ -157,6 +165,18 @@
  <groupId>org.slf4j</groupId>
  <artifactId>slf4j-api</artifactId>
  </exclusion>
+ <exclusion>
+ <artifactId>javax.rs.ws</artifactId>
+ <groupId>jsr311-api</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
  </exclusions>
  </dependency>
  <dependency>
@@ -172,6 +192,10 @@
  <groupId>org.slf4j</groupId>
  <artifactId>slf4j-api</artifactId>
  </exclusion>
+ <exclusion>
+ <artifactId>javax.rs.ws</artifactId>
+ <groupId>jsr311-api</groupId>
+ </exclusion>
  </exclusions>
  </dependency>
  <dependency>
@@ -187,6 +211,10 @@
  <groupId>org.slf4j</groupId>
  <artifactId>slf4j-api</artifactId>
  </exclusion>
+ <exclusion>
+ <artifactId>javax.rs.ws</artifactId>
+ <groupId>jsr311-api</groupId>
+ </exclusion>
  </exclusions>
  </dependency>
  <dependency>
@@ -206,6 +234,10 @@
  <groupId>org.eclipse.jetty.aggregate</groupId>
  <artifactId>jetty-all</artifactId>
  </exclusion>
+ <exclusion>
+ <artifactId>javax.rs.ws</artifactId>
+ <groupId>jsr311-api</groupId>
+ </exclusion>
  </exclusions>
  </dependency>
  <dependency>
@@ -225,29 +257,91 @@
  <groupId>org.apache.hadoop</groupId>
  <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
  </exclusion>
+ <exclusion>
+ <artifactId>javax.rs.ws</artifactId>
+ <groupId>jsr311-api</groupId>
+ </exclusion>
  </exclusions>
  </dependency>
  <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-jdbc</artifactId>
- <version>${hive.version}</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop.version}</version>
  <exclusions>
  <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>javax.rs.ws</artifactId>
+ <groupId>jsr311-api</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
  </exclusion>
  <exclusion>
  <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
  </exclusion>
  </exclusions>
  </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
  </dependencies>
 
 

diff --git a/ujes/definedEngines/hive/enginemanager/pom.xml b/ujes/definedEngines/hive/enginemanager/pom.xml
@@ -37,6 +37,16 @@
  <groupId>com.webank.wedatasphere.linkis</groupId>
  <artifactId>linkis-hive-engine</artifactId>
  <version>${linkis.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>com.webank.wedatasphere.linkis</groupId>

diff --git a/ujes/definedEngines/hive/enginemanager/src/main/resources/linkis.properties b/ujes/definedEngines/hive/enginemanager/src/main/resources/linkis.properties
@@ -20,4 +20,10 @@ wds.linkis.server.component.exclude.packages=com.webank.wedatasphere.linkis.engi
 wds.linkis.server.version=v1
 
 #sudo script
-wds.linkis.enginemanager.sudo.script=/appcom/Install/WillinkInstall/linkis-ujes-spark-enginemanager/bin/rootScript.sh
+wds.linkis.enginemanager.sudo.script=/appcom/Install/WillinkInstall/linkis-ujes-spark-enginemanager/bin/rootScript.sh
+
+#hadoop config dir
+#hadoop.config.dir=/appcom/config/hadoop-config
+
+#hive config dir
+#hive.config.dir=