Repository: falcon Updated Branches: refs/heads/master f3ff8b27f -> 1b8a93307
FALCON-1940 Fix misc build issues in Falcon Author: bvellanki <[email protected]> Reviewers: "Venkat Ranganathan <[email protected]>" Closes #132 from bvellanki/FALCON-1940 Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/1b8a9330 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/1b8a9330 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/1b8a9330 Branch: refs/heads/master Commit: 1b8a933073517df19f66e60dfe1f59a35d4d9054 Parents: f3ff8b2 Author: bvellanki <[email protected]> Authored: Tue May 10 13:29:38 2016 -0700 Committer: bvellanki <[email protected]> Committed: Tue May 10 13:29:38 2016 -0700 ---------------------------------------------------------------------- cli/pom.xml | 10 +++-- .../falcon/catalog/AbstractCatalogService.java | 2 +- lifecycle/pom.xml | 1 + oozie-el-extensions/pom.xml | 11 ++++- oozie/pom.xml | 1 + pom.xml | 3 +- prism/pom.xml | 1 + test-tools/hadoop-webapp/pom.xml | 6 --- unit/pom.xml | 6 ++- webapp/pom.xml | 45 +++++++++----------- 10 files changed, 46 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/1b8a9330/cli/pom.xml ---------------------------------------------------------------------- diff --git a/cli/pom.xml b/cli/pom.xml index ff4a16b..c9fc803 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/falcon/blob/1b8a9330/common/src/main/java/org/apache/falcon/catalog/AbstractCatalogService.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/catalog/AbstractCatalogService.java b/common/src/main/java/org/apache/falcon/catalog/AbstractCatalogService.java index 30a0118..1c553ac 100644 --- a/common/src/main/java/org/apache/falcon/catalog/AbstractCatalogService.java +++ b/common/src/main/java/org/apache/falcon/catalog/AbstractCatalogService.java @@ -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 */ http://git-wip-us.apache.org/repos/asf/falcon/blob/1b8a9330/lifecycle/pom.xml ---------------------------------------------------------------------- diff --git a/lifecycle/pom.xml b/lifecycle/pom.xml index 5d7ddb1..1e3e436 100644 --- a/lifecycle/pom.xml +++ b/lifecycle/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/falcon/blob/1b8a9330/oozie-el-extensions/pom.xml ---------------------------------------------------------------------- diff --git a/oozie-el-extensions/pom.xml b/oozie-el-extensions/pom.xml index d0f753d..2df21dd 100644 --- a/oozie-el-extensions/pom.xml +++ b/oozie-el-extensions/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/falcon/blob/1b8a9330/oozie/pom.xml ---------------------------------------------------------------------- diff --git a/oozie/pom.xml b/oozie/pom.xml index c14c625..928edc4 100644 --- a/oozie/pom.xml +++ b/oozie/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/falcon/blob/1b8a9330/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fbdd2b9..da63feb 100644 --- a/pom.xml +++ b/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/falcon/blob/1b8a9330/prism/pom.xml ---------------------------------------------------------------------- diff --git a/prism/pom.xml b/prism/pom.xml index d7a9892..605b519 100644 --- a/prism/pom.xml +++ b/prism/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/falcon/blob/1b8a9330/test-tools/hadoop-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/test-tools/hadoop-webapp/pom.xml b/test-tools/hadoop-webapp/pom.xml index 33b1efd..36fba41 100644 --- a/test-tools/hadoop-webapp/pom.xml +++ b/test-tools/hadoop-webapp/pom.xml @@ -106,12 +106,6 @@ </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> <scope>compile</scope> http://git-wip-us.apache.org/repos/asf/falcon/blob/1b8a9330/unit/pom.xml ---------------------------------------------------------------------- diff --git a/unit/pom.xml b/unit/pom.xml index b233acf..436249b 100644 --- a/unit/pom.xml +++ b/unit/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/falcon/blob/1b8a9330/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index 3582be1..564a04c 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -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> @@ -451,31 +469,6 @@ </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> <version>1.5.3</version>
