Skip to content

Commit

Permalink
HIVE-5711 - Fix eclipse:eclipse maven goal (Carl Steinbach via Brock …
Browse files Browse the repository at this point in the history
…Noland)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1539698 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Brock Noland committed Nov 7, 2013
1 parent b2905bc commit 36c6fde
Show file tree
Hide file tree
Showing 16 changed files with 156 additions and 118 deletions.
1 change: 0 additions & 1 deletion beeline/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
<classifier>uberjar</classifier>
<scope>runtime</scope>
</dependency>
<!-- inter-project -->
Expand Down
1 change: 0 additions & 1 deletion cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
<classifier>uberjar</classifier>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
Expand Down
1 change: 0 additions & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
<classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
Expand Down
1 change: 0 additions & 1 deletion contrib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
<classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
Expand Down
1 change: 0 additions & 1 deletion hbase-handler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
<classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion hcatalog/webhcat/svr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<version>${maven.javadoc.plugin.version}</version>
<executions>
<execution>
<id>resourcesdoc.xml</id>
Expand Down
1 change: 0 additions & 1 deletion hwi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
<classifier>uberjar</classifier>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
Expand Down
2 changes: 1 addition & 1 deletion itests/qtest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<version>${build.helper.maven.plugin.version}</version>
<executions>
<execution>
<id>add-test-sources</id>
Expand Down
1 change: 0 additions & 1 deletion metastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
<classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
Expand Down
47 changes: 32 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,33 @@
<properties>
<hive.version.shortname>0.13.0</hive.version.shortname>

<!-- Build Properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
<maven.repo.local>${user.home}/.m2/repository</maven.repo.local>
<hive.path.to.root>.</hive.path.to.root>

<!-- Test Properties -->
<test.tmp.dir>${project.build.directory}/tmp</test.tmp.dir>
<test.warehouse.dir>${project.build.directory}/warehouse</test.warehouse.dir>
<test.warehouse.scheme>pfile://</test.warehouse.scheme>

<!-- the versions of libraries that we use -->
<!-- Plugin and Plugin Dependency Versions -->
<ant.contrib.version>1.0b3</ant.contrib.version>
<build.helper.maven.plugin.version>1.8</build.helper.maven.plugin.version>
<datanucleus.maven.plugin.version>3.3.0-release</datanucleus.maven.plugin.version>
<maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
<maven.assembly.plugin.version>2.3</maven.assembly.plugin.version>
<maven.compiler.plugin.version>3.1</maven.compiler.plugin.version>
<maven.enforcer.plugin.version>1.3.1</maven.enforcer.plugin.version>
<maven.install.plugin.version>2.4</maven.install.plugin.version>
<maven.jar.plugin.version>2.2</maven.jar.plugin.version>
<maven.javadoc.plugin.version>2.4</maven.javadoc.plugin.version>
<maven.shade.plugin.version>2.1</maven.shade.plugin.version>
<maven.surefire.plugin.version>2.16</maven.surefire.plugin.version>
<maven.war.plugin.version>2.4</maven.war.plugin.version>

<!-- Library Dependency Versions -->
<activemq.version>5.5.0</activemq.version>
<ant.version>1.9.1</ant.version>
<antlr.version>3.4</antlr.version>
Expand Down Expand Up @@ -102,7 +121,6 @@
<libfb303.version>0.9.0</libfb303.version>
<libthrift.version>0.9.0</libthrift.version>
<log4j.version>1.2.16</log4j.version>
<maven-javadoc-plugin.version>2.4</maven-javadoc-plugin.version>
<mockito-all.version>1.8.2</mockito-all.version>
<mina.version>2.0.0-M5</mina.version>
<pig.version>0.10.1</pig.version>
Expand All @@ -117,7 +135,6 @@
<velocity.version>1.5</velocity.version>
<xerces.version>2.9.1</xerces.version>
<zookeeper.version>3.4.3</zookeeper.version>
<maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
</properties>

<repositories>
Expand Down Expand Up @@ -191,7 +208,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>${maven.compiler.plugin.version}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
Expand All @@ -200,12 +217,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<version>${maven.antrun.plugin.version}</version>
<dependencies>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
<version>${ant.contrib.version}</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
Expand All @@ -218,47 +235,47 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<version>${maven.assembly.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<version>${maven.enforcer.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.4</version>
<version>${maven.install.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.1</version>
<version>${maven.shade.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.16</version>
<version>${maven.surefire.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<version>${maven.jar.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<version>${maven.war.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<version>${build.helper.maven.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
<version>3.3.0-release</version>
<version>${datanucleus.maven.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.datanucleus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
<include>commons-lang:commons-lang</include>
<include>org.json:json</include>
<include>org.apache.avro:arvro-mapred</include>
<include>org.apache.hive:hive-shims:*:uberjar</include>
<include>org.apache.hive:hive-shims</include>
<include>com.googlecode.javaewah:JavaEWAH</include>
<include>javolution:javolution</include>
<include>com.google.protobuf:protobuf-java</include>
Expand Down
1 change: 0 additions & 1 deletion serde/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${project.version}</version>
<classifier>uberjar</classifier>
</dependency>
<!-- inter-project -->
<dependency>
Expand Down
85 changes: 85 additions & 0 deletions shims/assembly/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hive</groupId>
<artifactId>hive</artifactId>
<version>0.13.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>hive-shims</artifactId>
<packaging>jar</packaging>
<name>Hive Shims</name>

<properties>
<hive.path.to.root>../..</hive.path.to.root>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.hive.shims</groupId>
<artifactId>hive-shims-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive.shims</groupId>
<artifactId>hive-shims-0.20</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive.shims</groupId>
<artifactId>hive-shims-common-secure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive.shims</groupId>
<artifactId>hive-shims-0.20S</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive.shims</groupId>
<artifactId>hive-shims-0.23</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assemble/uberjar.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>uberjar</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
33 changes: 33 additions & 0 deletions shims/assembly/src/assemble/uberjar.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<assembly>
<id>uberjar</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<unpack>true</unpack>
<scope>runtime</scope>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>false</useTransitiveDependencies>
<excludes>
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
</excludes>
</dependencySet>
</dependencySets>
</assembly>
Loading

0 comments on commit 36c6fde

Please sign in to comment.