Skip to content

A
atlas
Commit 4dbe5820 by Suma S
Options

Merge pull request #88 from shwethags/86

changed the way to build hive hook dependencies
parents e4385af6 0cf80d27
Showing with 61 additions and 23 deletions
addons/hive-bridge/pom.xml
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<version>2.10</version> <version>2.10</version>
<executions> <executions>
<execution> <execution>
<id>copy-dependencies</id> <id>copy-bridge-dependencies</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>copy-dependencies</goal> <goal>copy-dependencies</goal>
...@@ -152,48 +152,84 @@ ...@@ -152,48 +152,84 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>copy-hook-dependencies</id> <id>copy</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>copy-dependencies</goal> <goal>copy</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/dependency/hook/hive</outputDirectory> <artifactItems>
<includeScope>runtime</includeScope> <artifactItem>
<overWriteReleases>false</overWriteReleases> <groupId>${project.groupId}</groupId>
<overWriteSnapshots>false</overWriteSnapshots> <artifactId>${project.artifactId}</artifactId>
<overWriteIfNewer>true</overWriteIfNewer> <version>${project.version}</version>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/hook/hive</outputDirectory>
</artifactItem>
</artifactItems>
</configuration> </configuration>
</execution> </execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution> <execution>
<id>copy</id> <id>copy-hook-dependencies</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>copy</goal> <goal>copy</goal>
</goals> </goals>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/dependency/hook/hive</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId> <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<overWrite>true</overWrite> </artifactItem>
<outputDirectory>${project.build.directory}/dependency/bridge/hive</outputDirectory> <artifactItem>
<groupId>org.json4s</groupId>
<artifactId>json4s-native_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
<artifactId>json4s-core_2.10</artifactId>
<version>${json.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.json4s</groupId>
<artifactId>json4s-ast_2.10</artifactId>
<version>${json.version}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId> <artifactId>metadata-client</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<overWrite>true</overWrite> </artifactItem>
<outputDirectory>${project.build.directory}/dependency/hook/hive</outputDirectory> <artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>metadata-typesystem</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
<version>${scala.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
<version>${scala.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
<version>${scala.version}</version>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>
......
addons/hive-bridge/src/bin/import-hive.sh
...@@ -85,6 +85,7 @@ else ...@@ -85,6 +85,7 @@ else
fi fi
export HIVE_CP export HIVE_CP
echo Using Hive configuration directory [$HIVE_CP] echo Using Hive configuration directory [$HIVE_CP]
echo "Logs for import are in $METADATA_LOG_DIR/import-hive.log"
${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${HIVE_CP}:${METADATACPPATH} org.apache.hadoop.metadata.hive.bridge.HiveMetaStoreBridge ${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${HIVE_CP}:${METADATACPPATH} org.apache.hadoop.metadata.hive.bridge.HiveMetaStoreBridge
......
pom.xml
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
<scala.version>2.10.4</scala.version> <scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version> <scala.binary.version>2.10</scala.binary.version>
<scala.macros.version>2.0.1</scala.macros.version> <scala.macros.version>2.0.1</scala.macros.version>
<json.version>3.2.11</json.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<akka.version>2.3.7</akka.version> <akka.version>2.3.7</akka.version>
<spray.version>1.3.1</spray.version> <spray.version>1.3.1</spray.version>
...@@ -506,7 +507,7 @@ ...@@ -506,7 +507,7 @@
<dependency> <dependency>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-native_2.10</artifactId> <artifactId>json4s-native_2.10</artifactId>
<version>3.2.11</version> <version>${json.version}</version>
</dependency> </dependency>
<dependency> <dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment