OOZIE-3515 Upgrade sqoop version to 1.4.7 (asalamon74 via kmarton)
diff --git a/docs/src/site/markdown/DG_QuickStart.md b/docs/src/site/markdown/DG_QuickStart.md
index c40f51f..c3d8fe2 100644
--- a/docs/src/site/markdown/DG_QuickStart.md
+++ b/docs/src/site/markdown/DG_QuickStart.md
@@ -50,8 +50,8 @@
+as the execution engine for those applications.
-Dpig.version=<version> - default 0.16.0
-Dpig.classifier=<classifier> - default h2
- -Dsqoop.version=<version> - default 1.4.3
- -Dsqoop.classifier=<classifier> - default hadoop100
+ -Dsqoop.version=<version> - default 1.4.7
+ -Dsqoop.classifier=<classifier> - default hadoop260
-Djetty.version=<version> - default 9.3.20.v20170531
-Dopenjpa.version=<version> - default 2.2.2
-Dxerces.version=<version> - default 2.10.0
diff --git a/docs/src/site/markdown/ENG_Building.md b/docs/src/site/markdown/ENG_Building.md
index d12cdeb..7ba74c9 100644
--- a/docs/src/site/markdown/ENG_Building.md
+++ b/docs/src/site/markdown/ENG_Building.md
@@ -241,8 +241,8 @@
as the execution engine for those applications.
-Dpig.version=<version> - default 0.16.0
-Dpig.classifier=<classifier> - default h2
--Dsqoop.version=<version> - default 1.4.3
--Dsqoop.classifier=<classifier> - default hadoop100
+-Dsqoop.version=<version> - default 1.4.7
+-Dsqoop.classifier=<classifier> - default hadoop260
-jetty.version=<version> - default 9.3.20.v20170531
-Dopenjpa.version=<version> - default 2.2.2
-Dxerces.version=<version> - default 2.10.0
diff --git a/pom.xml b/pom.xml
index 3c86a0f..8f851c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,15 +96,16 @@
<pig.version>0.16.0</pig.version>
<pig.classifier>h2</pig.classifier>
<hive.classifier>core</hive.classifier>
- <sqoop.version>1.4.3</sqoop.version>
+ <sqoop.version>1.4.7</sqoop.version>
<spark.version>1.6.1</spark.version>
<spark.streaming.kafka.version>1.6.1</spark.streaming.kafka.version>
<spark.bagel.version>1.6.1</spark.bagel.version>
<spark.guava.version>14.0.1</spark.guava.version>
<spark.scala.binary.version>2.10</spark.scala.binary.version>
- <sqoop.classifier>hadoop200</sqoop.classifier>
+ <sqoop.classifier>hadoop260</sqoop.classifier>
<tez.version>0.8.4</tez.version>
<joda.time.version>2.9.9</joda.time.version>
+ <avro.version>1.8.2</avro.version>
<jetty.version>9.3.27.v20190418</jetty.version>
<apache.jsp.version>8.0.33</apache.jsp.version>
@@ -1689,6 +1690,30 @@
<artifactId>jetty-plus</artifactId>
<version>${jetty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-mapred</artifactId>
+ <version>${avro.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-mapred</artifactId>
+ <classifier>hadoop2</classifier>
+ <version>${avro.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-ipc</artifactId>
+ <version>${avro.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/release-log.txt b/release-log.txt
index c000fb1..6c614b1 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3515 Upgrade sqoop version to 1.4.7 (asalamon74 via kmarton)
OOZIE-3507 Upgrade to Dozer 6 (asalamon74 via kmarton)
OOZIE-3492 [spark-action] Missing HADOOP_CONF_DIR property (asalamon74 via kmarton)
OOZIE-3495 Upgrade hive version to 1.2.2 (nobigo via kmarton,asalamon74)