Repository: sqoop
Updated Branches:
refs/heads/cdh5-1.99.4 [created] 55b20c41c
CLOUDERA-BUILD. Building against CDH dependencies.
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/467993dc
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/467993dc
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/467993dc
Branch: refs/heads/cdh5-1.99.4
Commit: 467993dcb2e0f192f6cd7911ea2fc3d89cee9180
Parents: 2475a76
Author: Jarek Jarcec Cecho <jarcec@apache.org>
Authored: Thu Nov 7 17:17:19 2013 -0800
Committer: Abraham Elmahrek <abraham@elmahrek.com>
Committed: Mon Nov 17 10:25:22 2014 -0800
----------------------------------------------------------------------
client/pom.xml | 2 +-
common/pom.xml | 2 +-
connector/connector-generic-jdbc/pom.xml | 2 +-
connector/connector-hdfs/pom.xml | 4 +-
connector/connector-mysql-fastpath/pom.xml | 2 +-
connector/connector-mysql-jdbc/pom.xml | 2 +-
connector/connector-sdk/pom.xml | 4 +-
connector/pom.xml | 2 +-
core/pom.xml | 2 +-
dist/pom.xml | 2 +-
docs/pom.xml | 2 +-
execution/mapreduce/pom.xml | 2 +-
execution/pom.xml | 2 +-
pom.xml | 104 ++++++++++++++++++++++--
repository/pom.xml | 2 +-
repository/repository-derby/pom.xml | 2 +-
server/pom.xml | 2 +-
shell/pom.xml | 2 +-
spi/pom.xml | 2 +-
submission/mapreduce/pom.xml | 2 +-
submission/pom.xml | 2 +-
test/pom.xml | 2 +-
tomcat/pom.xml | 2 +-
tools/pom.xml | 2 +-
24 files changed, 122 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index e18d594..bbc436e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 88a03fd..c2214c3 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/connector/connector-generic-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/pom.xml b/connector/connector-generic-jdbc/pom.xml
index b2276d0..c9ed9ca 100644
--- a/connector/connector-generic-jdbc/pom.xml
+++ b/connector/connector-generic-jdbc/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache.sqoop</groupId>
<artifactId>connector</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop.connector</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/connector/connector-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/connector/connector-hdfs/pom.xml b/connector/connector-hdfs/pom.xml
index 9d42064..2feb773 100644
--- a/connector/connector-hdfs/pom.xml
+++ b/connector/connector-hdfs/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache.sqoop</groupId>
<artifactId>connector</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop.connector</groupId>
@@ -133,4 +133,4 @@ limitations under the License.
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/connector/connector-mysql-fastpath/pom.xml
----------------------------------------------------------------------
diff --git a/connector/connector-mysql-fastpath/pom.xml b/connector/connector-mysql-fastpath/pom.xml
index b993f74..15495ff 100644
--- a/connector/connector-mysql-fastpath/pom.xml
+++ b/connector/connector-mysql-fastpath/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache.sqoop</groupId>
<artifactId>connector</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop.connector</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/connector/connector-mysql-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/connector/connector-mysql-jdbc/pom.xml b/connector/connector-mysql-jdbc/pom.xml
index 204a71c..219bed7 100644
--- a/connector/connector-mysql-jdbc/pom.xml
+++ b/connector/connector-mysql-jdbc/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache.sqoop</groupId>
<artifactId>connector</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop.connector</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/connector/connector-sdk/pom.xml
----------------------------------------------------------------------
diff --git a/connector/connector-sdk/pom.xml b/connector/connector-sdk/pom.xml
index 42b96fb..8fc33b8 100644
--- a/connector/connector-sdk/pom.xml
+++ b/connector/connector-sdk/pom.xml
@@ -24,12 +24,12 @@ limitations under the License.
<parent>
<groupId>org.apache.sqoop</groupId>
<artifactId>connector</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
<artifactId>connector-sdk</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
<name>Sqoop Connector SDK</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/connector/pom.xml
----------------------------------------------------------------------
diff --git a/connector/pom.xml b/connector/pom.xml
index 7f085d9..b0cb437 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 96010f4..67479b7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/dist/pom.xml
----------------------------------------------------------------------
diff --git a/dist/pom.xml b/dist/pom.xml
index 5676ae2..8e10443 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index f457650..6de7587 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/execution/mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/execution/mapreduce/pom.xml b/execution/mapreduce/pom.xml
index 8cd259c..9b1027e 100644
--- a/execution/mapreduce/pom.xml
+++ b/execution/mapreduce/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.sqoop</groupId>
<artifactId>execution</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop.execution</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/execution/pom.xml
----------------------------------------------------------------------
diff --git a/execution/pom.xml b/execution/pom.xml
index 64462da..fd62ce8 100644
--- a/execution/pom.xml
+++ b/execution/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ce183e..a3e9349 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,14 +18,14 @@ 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>9</version>
+ <groupId>com.cloudera.cdh</groupId>
+ <artifactId>cdh-root</artifactId>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
<description>Apache Sqoop</description>
<name>Sqoop</name>
<packaging>pom</packaging>
@@ -85,7 +85,51 @@ limitations under the License.
<url>https://git-wip-us.apache.org/repos/asf?p=sqoop.git</url>
</scm>
+ <repositories>
+ <repository>
+ <id>cdh.releases.repo</id>
+ <url>https://repository.cloudera.com/content/groups/cdh-releases-rcs</url>
+ <name>CDH Releases Repository</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>cdh.snapshots.repo</id>
+ <url>https://repository.cloudera.com/content/repositories/snapshots</url>
+ <name>CDH Snapshots Repository</name>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>datanucleus</id>
+ <url>http://www.datanucleus.org/downloads/maven2</url>
+ <name>Datanucleus</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>java.net repository</id>
+ <url>http://download.java.net/maven/2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>cdh.thirdparty.repo</id>
+ <url>https://repository.cloudera.com/content/repositories/third-party</url>
+ <name>Cloudera Third Party Repository</name>
+ <snapshots><enabled>false</enabled></snapshots>
+ </repository>
+ </repositories>
+
<properties>
+ <javaVersion>1.7</javaVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compile.source>1.6</maven.compile.source>
<maven.compile.target>1.6</maven.compile.target>
@@ -95,7 +139,7 @@ limitations under the License.
<commons-io.version>2.4</commons-io.version>
<derby.version>10.8.2.2</derby.version>
<hadoop.1.version>1.0.3</hadoop.1.version>
- <hadoop.2.version>2.2.0</hadoop.2.version>
+ <hadoop.2.version>${cdh.hadoop.version}</hadoop.2.version>
<guava.version>11.0.2</guava.version>
<json-simple.version>1.1</json-simple.version>
<junit.version>4.11</junit.version>
@@ -103,8 +147,8 @@ limitations under the License.
<log4j.version>1.2.16</log4j.version>
<servlet.version>2.5</servlet.version>
<cargo.version>1.3.2</cargo.version>
- <tomcat.major.version>6</tomcat.major.version>
- <tomcat.minor.version>0.37</tomcat.minor.version>
+ <tomcat.major.version>${cdh.tomcat.major.version}</tomcat.major.version>
+ <tomcat.minor.version>${cdh.tomcat.minor.version}</tomcat.minor.version>
<tomcat.version>${tomcat.major.version}.${tomcat.minor.version}</tomcat.version>
<jdbc.mysql.version>5.1.23</jdbc.mysql.version>
<jdbc.postgresql.version>9.1-901.jdbc4</jdbc.postgresql.version>
@@ -486,11 +530,54 @@ limitations under the License.
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.0.0,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[${javaVersion}.0,${javaVersion}.1000}]</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ <executions>
+ <execution>
+ <id>clean</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <phase>pre-clean</phase>
+ </execution>
+ <execution>
+ <id>default</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ <execution>
+ <id>site</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <phase>pre-site</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
@@ -520,6 +607,9 @@ limitations under the License.
<exclude>**.patch</exclude>
<exclude>patch-process/*</exclude>
<exclude>.metadata/</exclude>
+ <exclude>cloudera/*</exclude>
+ <exclude>*buildinfo</exclude>
+ <exclude>**/*.patch</exclude>
</excludes>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/repository/pom.xml
----------------------------------------------------------------------
diff --git a/repository/pom.xml b/repository/pom.xml
index acc9cc8..fa10724 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/repository/repository-derby/pom.xml
----------------------------------------------------------------------
diff --git a/repository/repository-derby/pom.xml b/repository/repository-derby/pom.xml
index 09fcc43..d2e089d 100644
--- a/repository/repository-derby/pom.xml
+++ b/repository/repository-derby/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache.sqoop</groupId>
<artifactId>repository</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop.repository</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 170616c..3f2768c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/shell/pom.xml
----------------------------------------------------------------------
diff --git a/shell/pom.xml b/shell/pom.xml
index cccdec5..ba268ce 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/spi/pom.xml
----------------------------------------------------------------------
diff --git a/spi/pom.xml b/spi/pom.xml
index 8136d57..029d5ad 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/submission/mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/submission/mapreduce/pom.xml b/submission/mapreduce/pom.xml
index 62e2c72..7e3b561 100644
--- a/submission/mapreduce/pom.xml
+++ b/submission/mapreduce/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.sqoop</groupId>
<artifactId>submission</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop.submission</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/submission/pom.xml
----------------------------------------------------------------------
diff --git a/submission/pom.xml b/submission/pom.xml
index 5899a5c..143a503 100644
--- a/submission/pom.xml
+++ b/submission/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 55d174f..5897da8 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/tomcat/pom.xml b/tomcat/pom.xml
index fbbc8e5..48004b7 100644
--- a/tomcat/pom.xml
+++ b/tomcat/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/467993dc/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index a44105a..69d5bdd 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>sqoop</artifactId>
- <version>1.99.4</version>
+ <version>1.99.4-cdh5.4.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.sqoop</groupId>
|