Explorar o código

HUE-7803 [core] Remove old maven references to the Hadoop plugins

Except DB proxy there is actually no more Java.
Romain Rigaux %!s(int64=8) %!d(string=hai) anos
pai
achega
2bd88b5
Modificáronse 3 ficheiros con 1 adicións e 99 borrados
  1. 1 0
      desktop/Makefile
  2. 0 35
      desktop/libs/hadoop/Makefile
  3. 0 64
      maven/pom.xml

+ 1 - 0
desktop/Makefile

@@ -42,6 +42,7 @@ include $(ROOT)/Makefile.vars.priv
 APPS := core \
 	libs/aws \
 	libs/azure \
+	libs/hadoop \
 	libs/indexer \
 	libs/liboauth \
 	libs/liboozie \

+ 0 - 35
desktop/libs/hadoop/Makefile

@@ -34,38 +34,3 @@ default::
 env-install: compile ext-env-install
 	@echo '--- Installing $(APP_NAME) into virtual-env'
 	@$(ENV_PYTHON) setup.py develop -N -q
-
-
-###################################
-# Build Hadoop plugins
-###################################
-
-PLUGIN_DIR := $(realpath .)
-PLUGIN_JAVA_LIB := $(PLUGIN_DIR)/java-lib
-PLUGIN_JAVA_DIR := $(PLUGIN_DIR)/java
-BLD_DIR_PLUGINS := $(PLUGIN_DIR)/java/target
-
-compile: $(DESKTOP_PLUGIN_JAR)
-
-# Build the plugin jar iff the source is present
-ifneq (,$(wildcard $(PLUGIN_JAVA_DIR)))
-$(DESKTOP_PLUGIN_JAR): $(shell find $(PLUGIN_JAVA_DIR) -type f)
-	mkdir -p $(PLUGIN_JAVA_LIB)
-	@echo "--- Building Hadoop plugins"
-	cd $(PLUGIN_JAVA_DIR) && mvn clean install -DskipTests $(MAVEN_OPTIONS)
-	cp $(BLD_DIR_PLUGINS)/hue-plugins-$(MAVEN_VERSION).jar $(DESKTOP_PLUGIN_JAR)
-
-clean::
-	rm -rf $(PLUGIN_JAVA_LIB)
-	cd $(PLUGIN_JAVA_DIR) && mvn clean $(MAVEN_OPTIONS) ||:
-else
-$(DESKTOP_PLUGIN_JAR):
-	$(error Cannot build hadoop plugin without source)
-endif
-
-#
-# Tell the `bdist' target to exclude our java source.
-#
-BDIST_EXCLUDES += \
-	--exclude=java \
-	--exclude=regenerate-thrift.sh

+ 0 - 64
maven/pom.xml

@@ -37,10 +37,6 @@
   </licenses>
 
   <properties>
-    <hadoop.version>${cdh.hadoop.version}</hadoop.version>
-    <slf4j.version>1.6.1</slf4j.version>
-    <commons-logging.version>1.0.4</commons-logging.version>
-    <thrift.version>0.9.0</thrift.version>
     <minJavaVersion>1.7</minJavaVersion>
     <maxJavaVersion>10.0</maxJavaVersion>
     <sourceJavaVersion>1.7</sourceJavaVersion>
@@ -118,66 +114,6 @@
     </plugins>
   </build>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-client</artifactId>
-        <version>${hadoop.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.8.1</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${commons-logging.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>avalon-framework</groupId>
-            <artifactId>avalon-framework</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>logkit</groupId>
-            <artifactId>logkit</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging-api</artifactId>
-        <version>${commons-logging.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.thrift</groupId>
-        <artifactId>libthrift</artifactId>
-        <version>${thrift.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.thrift</groupId>
-        <artifactId>libfb303</artifactId>
-        <version>${thrift.version}</version>
-      </dependency>
-
-    </dependencies>
-  </dependencyManagement>
-
   <repositories>
     <repository>
       <id>cdh.releases.repo</id>