diff --git a/docs/getting-started/gimel-modules.md b/docs/getting-started/gimel-modules.md index 384c008f..ff8dab50 100644 --- a/docs/getting-started/gimel-modules.md +++ b/docs/getting-started/gimel-modules.md @@ -14,7 +14,7 @@ com.paypal.gimel gimel-tools - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT provided ``` @@ -23,7 +23,7 @@ com.paypal.gimel gimel-sql - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT provided ``` @@ -32,7 +32,7 @@ com.paypal.gimel gimel-core - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT provided ``` diff --git a/docs/gimel-connectors/kafka2.md b/docs/gimel-connectors/kafka2.md index 7c9572b6..d2371f90 100644 --- a/docs/gimel-connectors/kafka2.md +++ b/docs/gimel-connectors/kafka2.md @@ -117,7 +117,7 @@ ```bash spark-shell --jars -gimel-tools-2.0.0-SNAPSHOT-uber.jar, +gimel-tools-2.4.7-SNAPSHOT-uber.jar, generic-deserializers-1.0-SNAPSHOT-uber.jar, generic-serializers-1.0-SNAPSHOT-uber.jar @@ -510,7 +510,7 @@ Users can implement their own logic for getting the kafka properties which will com.paypal.gimel gimel-common - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT provided ``` diff --git a/docs/gimel-logging/gimel-logging.md b/docs/gimel-logging/gimel-logging.md index 679b5091..442e1fae 100644 --- a/docs/gimel-logging/gimel-logging.md +++ b/docs/gimel-logging/gimel-logging.md @@ -75,7 +75,7 @@ object SparkWordCount { Example: ```shell script -spark-shell --jars gimel-tools-2.0.0-SNAPSHOT-uber.jar \ +spark-shell --jars gimel-tools-2.4.7-SNAPSHOT-uber.jar \ --conf spark.driver.extraJavaOptions="-Dgimel.logger.properties.filepath=gimelLoggerConfig.properties" \ --conf spark.executor.extraJavaOptions="-Dgimel.logger.properties.filepath=gimelLoggerConfig.properties" \ --conf spark.files=/path/to/gimelLoggerConfig.properties \ diff --git a/docs/gimel-serde/gimel-serde.md b/docs/gimel-serde/gimel-serde.md index 14c36bd5..5d4de174 100644 --- a/docs/gimel-serde/gimel-serde.md +++ b/docs/gimel-serde/gimel-serde.md @@ -57,7 +57,7 @@ Example: spark-shell --jars \ generic-deserializers-1.0-SNAPSHOT-uber.jar,\ generic-serializers-1.0-SNAPSHOT-uber.jar,\ -gimel-tools-2.0.0-SNAPSHOT-uber.jar +gimel-tools-2.4.7-SNAPSHOT-uber.jar ``` ## Generic Deserializers diff --git a/docs/try-gimel/0-prerequisite.md b/docs/try-gimel/0-prerequisite.md index 61a3be11..8b2401e8 100644 --- a/docs/try-gimel/0-prerequisite.md +++ b/docs/try-gimel/0-prerequisite.md @@ -89,7 +89,7 @@ quickstart/start-gimel kafka,elasticsearch,hbase-master,hbase-regionserver ``` docker exec -it spark-master bash -c \ "export USER=an;export SPARK_HOME=/spark/;export PATH=$PATH:$SPARK_HOME/bin:$SPARK_HOME/sbin; \ -/spark/bin/spark-shell --jars /root/gimel-sql-2.0.0-SNAPSHOT-uber.jar" +/spark/bin/spark-shell --jars /root/gimel-sql-2.4.7-SNAPSHOT-uber.jar" ``` **Note:** *You can view the Spark UI here* diff --git a/gimel-dataapi/gimel-common/pom.xml b/gimel-dataapi/gimel-common/pom.xml index dfb658e6..52834328 100644 --- a/gimel-dataapi/gimel-common/pom.xml +++ b/gimel-dataapi/gimel-common/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../pom.xml 4.0.0 gimel-common - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/pom.xml b/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/pom.xml index 5b781719..d0071ded 100644 --- a/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/pom.xml +++ b/gimel-dataapi/gimel-connectors/gimel-aerospike-3.14/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 gimel-aerospike-3.14 - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/pom.xml b/gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/pom.xml index 92cc4f81..6e275bd0 100644 --- a/gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/pom.xml +++ b/gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 gimel-cassandra-2.0 - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-connectors/gimel-druid-0.82/pom.xml b/gimel-dataapi/gimel-connectors/gimel-druid-0.82/pom.xml index e6e60b26..ce5d1582 100644 --- a/gimel-dataapi/gimel-connectors/gimel-druid-0.82/pom.xml +++ b/gimel-dataapi/gimel-connectors/gimel-druid-0.82/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 gimel-druid-0.82 - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/pom.xml b/gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/pom.xml index 1f03c1c3..41196140 100644 --- a/gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/pom.xml +++ b/gimel-dataapi/gimel-connectors/gimel-elasticsearch-6.2/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 gimel-elasticsearch-6.2 - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/pom.xml b/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/pom.xml index 690ad484..7bf7cada 100644 --- a/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/pom.xml +++ b/gimel-dataapi/gimel-connectors/gimel-hbase-1.2/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 gimel-hbase-1.2 - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/pom.xml b/gimel-dataapi/gimel-connectors/gimel-hive-1.2/pom.xml index 15495433..db91c22b 100644 --- a/gimel-dataapi/gimel-connectors/gimel-hive-1.2/pom.xml +++ b/gimel-dataapi/gimel-connectors/gimel-hive-1.2/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 gimel-hive-1.2 - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-connectors/gimel-jdbc/pom.xml b/gimel-dataapi/gimel-connectors/gimel-jdbc/pom.xml index 5ac357b3..26d7c30f 100644 --- a/gimel-dataapi/gimel-connectors/gimel-jdbc/pom.xml +++ b/gimel-dataapi/gimel-connectors/gimel-jdbc/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 gimel-jdbc - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/pom.xml b/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/pom.xml index f48ceae1..2dae625c 100644 --- a/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/pom.xml +++ b/gimel-dataapi/gimel-connectors/gimel-kafka-2.2/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 gimel-kafka-2.2 - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-connectors/gimel-restapi/pom.xml b/gimel-dataapi/gimel-connectors/gimel-restapi/pom.xml index f4adc094..eb6b509c 100644 --- a/gimel-dataapi/gimel-connectors/gimel-restapi/pom.xml +++ b/gimel-dataapi/gimel-connectors/gimel-restapi/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 gimel-restapi - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-connectors/gimel-s3/pom.xml b/gimel-dataapi/gimel-connectors/gimel-s3/pom.xml index 6b41acdf..2ab73f2e 100644 --- a/gimel-dataapi/gimel-connectors/gimel-s3/pom.xml +++ b/gimel-dataapi/gimel-connectors/gimel-s3/pom.xml @@ -25,14 +25,14 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 com.paypal.gimel gimel-s3 - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-connectors/gimel-sftp/pom.xml b/gimel-dataapi/gimel-connectors/gimel-sftp/pom.xml index dd3db8a9..9d07b5cf 100644 --- a/gimel-dataapi/gimel-connectors/gimel-sftp/pom.xml +++ b/gimel-dataapi/gimel-connectors/gimel-sftp/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 gimel-sftp - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-core/pom.xml b/gimel-dataapi/gimel-core/pom.xml index 94e58924..7026f5c5 100644 --- a/gimel-dataapi/gimel-core/pom.xml +++ b/gimel-dataapi/gimel-core/pom.xml @@ -23,12 +23,12 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../pom.xml 4.0.0 gimel-core - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT @@ -85,11 +85,6 @@ under the License. gimel-common ${gimel.version}-SNAPSHOT - - com.paypal.gimel - gimel-kafka-0.10 - ${gimel.version}-SNAPSHOT - com.paypal.gimel gimel-kafka-2.2 diff --git a/gimel-dataapi/gimel-examples/pom.xml b/gimel-dataapi/gimel-examples/pom.xml index 1102fc1d..498f8fcc 100644 --- a/gimel-dataapi/gimel-examples/pom.xml +++ b/gimel-dataapi/gimel-examples/pom.xml @@ -23,12 +23,12 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../pom.xml 4.0.0 gimel-examples - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-logger/pom.xml b/gimel-dataapi/gimel-logger/pom.xml index 92da4bc2..924f466c 100644 --- a/gimel-dataapi/gimel-logger/pom.xml +++ b/gimel-dataapi/gimel-logger/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../pom.xml 4.0.0 gimel-logger - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-sql/pom.xml b/gimel-dataapi/gimel-sql/pom.xml index 32d24539..9c2747a5 100644 --- a/gimel-dataapi/gimel-sql/pom.xml +++ b/gimel-dataapi/gimel-sql/pom.xml @@ -3,13 +3,13 @@ gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../pom.xml 4.0.0 gimel-sql - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/gimel-tools/pom.xml b/gimel-dataapi/gimel-tools/pom.xml index bf1b097b..c2630dbd 100644 --- a/gimel-dataapi/gimel-tools/pom.xml +++ b/gimel-dataapi/gimel-tools/pom.xml @@ -23,13 +23,13 @@ under the License. gimel-dataapi com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../pom.xml 4.0.0 gimel-tools - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-dataapi/pom.xml b/gimel-dataapi/pom.xml index 7592858d..c1f7c61d 100644 --- a/gimel-dataapi/pom.xml +++ b/gimel-dataapi/pom.xml @@ -24,7 +24,7 @@ under the License. gimel com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../pom.xml 4.0.0 @@ -34,7 +34,7 @@ under the License. Gimel Data API 2017 - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT gimel-logger gimel-common diff --git a/gimel-parser/pom.xml b/gimel-parser/pom.xml index 87df46a1..85a1b352 100644 --- a/gimel-parser/pom.xml +++ b/gimel-parser/pom.xml @@ -4,13 +4,13 @@ gimel com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../pom.xml 4.0.0 gimel-parser - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/gimel-serde/gimel-deserializers/generic-deserializers/pom.xml b/gimel-serde/gimel-deserializers/generic-deserializers/pom.xml index 96cb0fc4..a9df87a5 100644 --- a/gimel-serde/gimel-deserializers/generic-deserializers/pom.xml +++ b/gimel-serde/gimel-deserializers/generic-deserializers/pom.xml @@ -5,14 +5,14 @@ com.paypal.gimel gimel-serde - 1.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 com.paypal.gimel generic-deserializers - 1.0-SNAPSHOT + 2.4.7-SNAPSHOT @@ -57,24 +57,10 @@ org.apache.kafka kafka_${scala.binary.version} ${kafka.version} - test - - - io.confluent - kafka-schema-registry - ${confluent.version} - javax.ws.rs - javax.ws.rs-api - - - org.glassfish.jersey.containers - jersey-container-servlet - - - org.glassfish.jersey.core - jersey-server + com.fasterxml.jackson.* + * test @@ -83,8 +69,6 @@ io.confluent kafka-schema-registry ${confluent.version} - - tests javax.ws.rs @@ -94,9 +78,31 @@ org.glassfish.jersey.containers jersey-container-servlet + + org.glassfish.jersey.core + jersey-server + test + + + + + + + + + + + + + + + + + + org.apache.curator curator-test diff --git a/gimel-serde/gimel-serializers/generic-serializers/pom.xml b/gimel-serde/gimel-serializers/generic-serializers/pom.xml index a15fbeb9..b0c2c148 100644 --- a/gimel-serde/gimel-serializers/generic-serializers/pom.xml +++ b/gimel-serde/gimel-serializers/generic-serializers/pom.xml @@ -5,14 +5,14 @@ gimel-serde com.paypal.gimel - 1.0-SNAPSHOT + 2.4.7-SNAPSHOT ../../pom.xml 4.0.0 com.paypal.gimel generic-serializers - 1.0-SNAPSHOT + 2.4.7-SNAPSHOT @@ -63,6 +63,12 @@ org.apache.kafka kafka_${scala.binary.version} ${kafka.version} + + + com.fasterxml.jackson.* + * + + test diff --git a/gimel-serde/pom.xml b/gimel-serde/pom.xml index 3ddbcfe5..c775d59e 100644 --- a/gimel-serde/pom.xml +++ b/gimel-serde/pom.xml @@ -5,7 +5,7 @@ gimel com.paypal.gimel - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT ../pom.xml 4.0.0 @@ -13,7 +13,7 @@ com.paypal.gimel gimel-serde pom - 1.0-SNAPSHOT + 2.4.7-SNAPSHOT gimel-deserializers/generic-deserializers gimel-serializers/generic-serializers diff --git a/gimel-serde/serde-common/pom.xml b/gimel-serde/serde-common/pom.xml index 2bb54284..9b5d1edc 100644 --- a/gimel-serde/serde-common/pom.xml +++ b/gimel-serde/serde-common/pom.xml @@ -5,14 +5,14 @@ com.paypal.gimel gimel-serde - 1.0-SNAPSHOT + 2.4.7-SNAPSHOT ../pom.xml 4.0.0 com.paypal.gimel serde-common - 1.0-SNAPSHOT + 2.4.7-SNAPSHOT diff --git a/pom.xml b/pom.xml index 08cb471e..3635f3ea 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ under the License. Gimel Data API 2017 - 2.0.0-SNAPSHOT + 2.4.7-SNAPSHOT gimel-dataapi gimel-parser @@ -78,7 +78,7 @@ under the License. 2.11 3.0.1 4.1.0 - 2.0.0 + 2.4.7 2.11.8 2.3 2.3.0 @@ -86,99 +86,10 @@ under the License. 1.2.1 1.1.2 1.8 - 2.0.0 2.8.0 - - hwx-2.6.3.11-1 - - - hortonworks-2.6.3.11-1_spark-2.3.0 - - false - - - compile - provided - compile - provided - provided - 2.0.0 - 2.11 - 2.11.8 - 3.0.1 - 2.3 - 2.3.0.2.6.3.11-1 - 2.7.3.2.6.3.11-1 - 1.2.1000.2.6.3.11-1 - 1.1.2.2.6.3.11-1 - 3.4.6.2.6.3.12-2 - 2.8.0 - - - - - hwx-2.6.3.5-4 - - - hortonworks-2.6.3.5-4_spark-2.3.0 - - false - - - compile - provided - compile - provided - provided - 2.0.0 - 2.11 - 2.11.8 - 3.0.1 - 3.0.1 - 4.1.0 - 2.3 - 2.3.0.2.6.3.5-4 - 2.7.3.2.6.3.5-4 - 1.2.1000.2.6.3.5-4 - 1.1.2.2.6.3.5-4 - 3.4.6.2.6.3.5-4 - 2.8.0 - - - - - hwx-2.6.5.0-292 - - - hortonworks-2.6.5.0-292_spark-2.3.0 - - - - compile - provided - compile - provided - provided - 2.11.8 - 2.11 - 4.1.0 - 2.3 - 2.3 - 2.3.0.2.6.5.0-292 - 2.7.3.2.6.5.0-292 - 1.2.1000.2.6.5.0-292 - 1.1.2.2.6.5.0-292 - 3.4.13.2.6.5.0-292 - hwx-2.6.5.0-292_s-${spark.binary.version} - 2.0.0 - 3.0.1 - 2.8.0 - - - standalone @@ -278,18 +189,6 @@ under the License. [ci skip] v-@{project.version} - - - - - - - - - - - - diff --git a/quickstart/set-env b/quickstart/set-env index 35b77311..cb0af616 100644 --- a/quickstart/set-env +++ b/quickstart/set-env @@ -20,6 +20,6 @@ if [ -z $GIMEL_HOME ]; then fi export gimel_repo_home=${GIMEL_HOME} export standalone_dir=${gimel_repo_home}/gimel-dataapi/gimel-standalone -export gimel_jar_name=gimel-sql-2.0.0-SNAPSHOT-uber.jar +export gimel_jar_name=gimel-sql-2.4.7-SNAPSHOT-uber.jar export final_jar=${standalone_dir}/lib/$gimel_jar_name export FLIGHTS_DATA_PATH=$GIMEL_HOME/gimel-dataapi/gimel-quickstart/flights