Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
FALCON-1940 Fix misc build issues in Falcon
Author: bvellanki <bvellanki@hortonworks.com>

Reviewers: "Venkat Ranganathan <venkat@hortonworks.com>"

Closes #132 from bvellanki/FALCON-1940
  • Loading branch information
bvellanki committed May 10, 2016
1 parent f3ff8b2 commit 1b8a933073517df19f66e60dfe1f59a35d4d9054
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 40 deletions.
@@ -53,7 +53,11 @@
</profiles>

<dependencies>

<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>commons-net</groupId>
@@ -142,12 +146,12 @@
<dependency>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-client</artifactId>
<version>0.10-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-common</artifactId>
<version>0.10-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

</dependencies>
@@ -44,7 +44,7 @@ public abstract class AbstractCatalogService {
*
* @param conf conf
* @param catalogUrl url for the catalog service
* @param database database the table belongs to
* @param databaseName database the table belongs to
* @return if the db exists
* @throws FalconException exception
*/
@@ -100,6 +100,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.13.1</version>
<executions>
<execution>
<id>coord-gen</id>
@@ -51,7 +51,10 @@
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-core</artifactId>
</dependency>

<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-client</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -87,6 +90,12 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</dependency>

<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
<build>
<plugins>
@@ -140,6 +140,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.13.1</version>
<executions>
<execution>
<id>coord-gen</id>
@@ -107,7 +107,7 @@
<mockito.version>1.9.5</mockito.version>
<openjpa.version>2.4.0</openjpa.version>
<javax-validation.version>1.0.0.GA</javax-validation.version>
<derby.version>10.10.1.1</derby.version>
<derby.version>10.11.1.1</derby.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<mysql.version>5.1.36</mysql.version>
<postgres.version>9.1-901-1.jdbc4</postgres.version>
@@ -276,6 +276,7 @@
<excludes>
<exclude>*.txt</exclude>
<exclude>**/*.txt</exclude>
<exclude>**/*.svg</exclude>
<exclude>*.md</exclude>
<exclude>**/*.md</exclude>
<exclude>.git/**</exclude>
@@ -182,6 +182,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>keytool-maven-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -105,12 +105,6 @@
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
@@ -26,9 +26,11 @@
<version>0.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>falcon-unit</artifactId>

<description>Apache Falcon Unit Module</description>
<name>Apache Falcon Unit</name>
<packaging>jar</packaging>

<profiles>
<profile>
<id>hadoop-2</id>
@@ -287,7 +287,7 @@
<dependency>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-cli</artifactId>
<version>0.10-SNAPSHOT</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -425,6 +425,24 @@
</artifactItems>
</configuration>
</execution>
<execution>
<id>unpack</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-client</artifactId>
<outputDirectory>${project.build.directory}/webapps/oozie/conf/action-conf</outputDirectory>
<includes>**/*.xsd</includes>
<excludes>**/*.class</excludes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

@@ -450,31 +468,6 @@
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-client</artifactId>
<outputDirectory>${project.build.directory}/webapps/oozie/conf/action-conf</outputDirectory>
<includes>**/*.xsd</includes>
<excludes>**/*.class</excludes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>

0 comments on commit 1b8a933

Please sign in to comment.