diff --git a/LICENSE-3RD-PARTY b/LICENSE-3RD-PARTY index 12fb08cde..883c31fdd 100644 --- a/LICENSE-3RD-PARTY +++ b/LICENSE-3RD-PARTY @@ -83,13 +83,13 @@ List of third-party dependencies grouped by their license type. * Apache Commons Logging (commons-logging:commons-logging:1.2 - http://commons.apache.org/proper/commons-logging/) * Commons Net (commons-net:commons-net:2.2 - http://commons.apache.org/net/) * Commons Net (commons-net:commons-net:3.1 - http://commons.apache.org/net/) - * wormhole-dbpool (edp.wormhole:wormhole-dbpool:0.5.2-beta - no url defined) - * wormhole-es-hadoop (edp.wormhole:wormhole-es-hadoop:0.5.2-beta - no url defined) - * wormhole-hadoop (edp.wormhole:wormhole-hadoop:0.5.2-beta - no url defined) - * wormhole-kafka-010 (edp.wormhole:wormhole-kafka-010:0.5.2-beta - no url defined) - * wormhole-ums_1.3 (edp.wormhole:wormhole-ums_1.3:0.5.2-beta - no url defined) - * wormhole-util (edp.wormhole:wormhole-util:0.5.2-beta - no url defined) - * wormhole-zookeeper (edp.wormhole:wormhole-zookeeper:0.5.2-beta - no url defined) + * wormhole-dbpool (edp.wormhole:wormhole-dbpool:0.5.3-beta - no url defined) + * wormhole-es-hadoop (edp.wormhole:wormhole-es-hadoop:0.5.3-beta - no url defined) + * wormhole-hadoop (edp.wormhole:wormhole-hadoop:0.5.3-beta - no url defined) + * wormhole-kafka-010 (edp.wormhole:wormhole-kafka-010:0.5.3-beta - no url defined) + * wormhole-ums_1.3 (edp.wormhole:wormhole-ums_1.3:0.5.3-beta - no url defined) + * wormhole-util (edp.wormhole:wormhole-util:0.5.3-beta - no url defined) + * wormhole-zookeeper (edp.wormhole:wormhole-zookeeper:0.5.3-beta - no url defined) * Metrics Core (io.dropwizard.metrics:metrics-core:3.1.2 - http://metrics.codahale.com/metrics-core/) * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:3.1.2 - http://metrics.codahale.com/metrics-graphite/) * Jackson Integration for Metrics (io.dropwizard.metrics:metrics-json:3.1.2 - http://metrics.codahale.com/metrics-json/) @@ -286,7 +286,7 @@ List of third-party dependencies grouped by their license type. * scalaj-http (org.scalaj:scalaj-http_2.11:2.3.0 - http://github.com/scalaj/scalaj-http) * scalatest (org.scalatest:scalatest_2.11:2.2.5 - http://www.scalatest.org) * empty (org.spark-project.spark:unused:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/unused) - * Snappy for Java (org.xerial.snappy:snappy-java:1.0.5.2-beta - http://code.google.com/p/snappy-java/) + * Snappy for Java (org.xerial.snappy:snappy-java:1.0.5.3-beta - http://code.google.com/p/snappy-java/) * snappy-java (org.xerial.snappy:snappy-java:1.1.1.7 - https://github.comm/xerial/snappy-java) * snappy-java (org.xerial.snappy:snappy-java:1.1.2.4 - https://github.com/xerial/snappy-java) * snappy-java (org.xerial.snappy:snappy-java:1.1.2.6 - https://github.com/xerial/snappy-java) diff --git a/README.md b/README.md index b83d8585f..cc97a98be 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Please refer to [Wormhole用户手册](https://edp963.github.io/wormhole). ## Latest Release -Please download the latest RELEASE(链接：https://pan.baidu.com/s/1DNJPwDXaZrmEdoAXOeZ05A 密码：y0f4). +Please download the latest RELEASE(链接：https://pan.baidu.com/s/1-mpCBC5EgJ0ptAARJiq6Jg 密码：kk4s). ## Get Help diff --git a/common/pom.xml b/common/pom.xml index 1b524a983..fd35060ce 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../pom.xml diff --git a/dbdriver/dbpool/LICENSE-3RD-PARTY b/dbdriver/dbpool/LICENSE-3RD-PARTY index a22744078..5cde440de 100644 --- a/dbdriver/dbpool/LICENSE-3RD-PARTY +++ b/dbdriver/dbpool/LICENSE-3RD-PARTY @@ -35,7 +35,7 @@ List of third-party dependencies grouped by their license type. * Lang (commons-lang:commons-lang:2.3 - http://jakarta.apache.org/commons/lang/) * Apache Commons Logging (commons-logging:commons-logging:1.2 - http://commons.apache.org/proper/commons-logging/) * Commons Net (commons-net:commons-net:3.1 - http://commons.apache.org/net/) - * wormhole-util (edp.wormhole:wormhole-util:0.5.2-beta - no url defined) + * wormhole-util (edp.wormhole:wormhole-util:0.5.3-beta - no url defined) * Metrics Core (io.dropwizard.metrics:metrics-core:3.1.2 - http://metrics.codahale.com/metrics-core/) * The Netty Project (io.netty:netty:3.6.2.Final - http://netty.io/) * Netty/All-in-One (io.netty:netty-all:4.0.23.Final - http://netty.io/netty-all/) diff --git a/dbdriver/dbpool/pom.xml b/dbdriver/dbpool/pom.xml index a3bc61c61..69fd5aefc 100644 --- a/dbdriver/dbpool/pom.xml +++ b/dbdriver/dbpool/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/dbdriver/hbaseconnection/pom.xml b/dbdriver/hbaseconnection/pom.xml index 00df515ba..356e7c0fd 100644 --- a/dbdriver/hbaseconnection/pom.xml +++ b/dbdriver/hbaseconnection/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/dbdriver/kuduconnection/pom.xml b/dbdriver/kuduconnection/pom.xml index 40826517e..5fb54548f 100644 --- a/dbdriver/kuduconnection/pom.xml +++ b/dbdriver/kuduconnection/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/dbdriver/phoenix-jdbc/pom.xml b/dbdriver/phoenix-jdbc/pom.xml index 103af4a82..348838945 100644 --- a/dbdriver/phoenix-jdbc/pom.xml +++ b/dbdriver/phoenix-jdbc/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/dbdriver/redispool/pom.xml b/dbdriver/redispool/pom.xml index bd498faec..5a0b0115a 100644 --- a/dbdriver/redispool/pom.xml +++ b/dbdriver/redispool/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/dbdriver/sql4es2/pom.xml b/dbdriver/sql4es2/pom.xml index 69852cfe3..aa960decd 100644 --- a/dbdriver/sql4es2/pom.xml +++ b/dbdriver/sql4es2/pom.xml @@ -4,7 +4,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/dbdriver/sql4es5/pom.xml b/dbdriver/sql4es5/pom.xml index f12a6e5d8..e98b2c58d 100644 --- a/dbdriver/sql4es5/pom.xml +++ b/dbdriver/sql4es5/pom.xml @@ -4,7 +4,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/dev/lic/licenses.xml b/dev/lic/licenses.xml index e6971e9c2..c61db6075 100644 --- a/dev/lic/licenses.xml +++ b/dev/lic/licenses.xml @@ -923,7 +923,7 @@ edp.wormhole wormhole-es-hadoop - 0.5.2-beta + 0.5.3-beta Apache License, Version 2.0 @@ -1032,7 +1032,7 @@ edp.wormhole wormhole-util - 0.5.2-beta + 0.5.3-beta Apache License, Version 2.0 @@ -1080,7 +1080,7 @@ edp.wormhole wormhole-kafka-010 - 0.5.2-beta + 0.5.3-beta Apache License, Version 2.0 @@ -2487,7 +2487,7 @@ edp.wormhole wormhole-zookeeper - 0.5.2-beta + 0.5.3-beta Apache License, Version 2.0 @@ -2815,7 +2815,7 @@ edp.wormhole wormhole-dbpool - 0.5.2-beta + 0.5.3-beta Apache License, Version 2.0 @@ -2855,7 +2855,7 @@ edp.wormhole wormhole-rider-server_1.2 - 0.5.2-beta + 0.5.3-beta Apache License, Version 2.0 @@ -3706,7 +3706,7 @@ edp.wormhole wormhole-hadoop - 0.5.2-beta + 0.5.3-beta Apache License, Version 2.0 @@ -4418,7 +4418,7 @@ edp.wormhole wormhole-ums_1.3 - 0.5.2-beta + 0.5.3-beta Apache License, Version 2.0 diff --git a/docs/_config.yml b/docs/_config.yml index 30900a785..15e114537 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -12,6 +12,6 @@ include: - _static - _modules -WH_VERSION_SHORT: 0.5.2-beta +WH_VERSION_SHORT: 0.5.3-beta SCALA_BINARY_VERSION: "${scala.binary.version}" SCALA_VERSION: "${scala.binary.version}.8" diff --git a/docs/deployment.md b/docs/deployment.md index a4d0937bc..5c09ac95b 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -29,22 +29,22 @@ description: Wormhole Deployment page mysql-connector-java-{your-db-version}.jar -**注意：升级至0.5.2-beta版本，须将Kafka版本由0.10.0.0升级至0.10.2.2，0.10.2.2以上版本须自行测试** +**注意：升级至0.5.3-beta版本，须将Kafka版本由0.10.0.0升级至0.10.2.2，0.10.2.2以上版本须自行测试** ## 部署配置 -**下载 wormhole-0.5.2-beta.tar.gz 包 (链接：https://pan.baidu.com/s/1DNJPwDXaZrmEdoAXOeZ05A 密码：y0f4)，或者自编译** +**下载 wormhole-0.5.3-beta.tar.gz 包 (链接：https://pan.baidu.com/s/1-mpCBC5EgJ0ptAARJiq6Jg 密码：kk4s)，或者自编译** ``` -下载wormhole-0.5.2-beta.tar.gz安装包 -tar -xvf wormhole-0.5.2-beta.tar.gz +下载wormhole-0.5.3-beta.tar.gz安装包 +tar -xvf wormhole-0.5.3-beta.tar.gz 或者自编译，生成的tar包在 wormhole/target git clone -b 0.5 https://github.com/edp963/wormhole.git cd wormhole mvn install package -Pwormhole ``` -**注意：0.4.2版本升级至0.5.2-beta版前须手动执行以下操作** +**注意：0.4.2版本升级至0.5.3-beta版前须手动执行以下操作** ``` 1. stream表中增加function_type字段，原stream_type值赋值给function_type，stream_type值改为"spark" diff --git a/docs/index.md b/docs/index.md index f12ff3d34..e765f11c3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -87,7 +87,7 @@ Please refer to [Wormhole用户手册](https://edp963.github.io/wormhole). ## Latest Release -Please download the latest RELEASE(链接：https://pan.baidu.com/s/1DNJPwDXaZrmEdoAXOeZ05A 密码：y0f4). +Please download the latest RELEASE(链接：https://pan.baidu.com/s/1-mpCBC5EgJ0ptAARJiq6Jg 密码：kk4s). ## Get Help diff --git a/docs/user-guide.md b/docs/user-guide.md index e35d84eb5..84d5d7150 100644 --- a/docs/user-guide.md +++ b/docs/user-guide.md @@ -162,7 +162,7 @@ Sink Namespace 对应的物理表需要提前创建，表的 Schema 中是否需 edp.wormhole wormhole-sparkxinterface - 0.5.2-beta + 0.5.3-beta ``` diff --git a/externalclient/hadoop/LICENSE-3RD-PARTY b/externalclient/hadoop/LICENSE-3RD-PARTY index d30ced6ed..9797a462f 100644 --- a/externalclient/hadoop/LICENSE-3RD-PARTY +++ b/externalclient/hadoop/LICENSE-3RD-PARTY @@ -69,7 +69,7 @@ List of third-party dependencies grouped by their license type. * Jetty Server (org.mortbay.jetty:jetty:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty) * Jetty Utilities (org.mortbay.jetty:jetty-util:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-util) * scalatest (org.scalatest:scalatest_2.11:2.2.5 - http://www.scalatest.org) - * Snappy for Java (org.xerial.snappy:snappy-java:1.0.5.2-beta - http://code.google.com/p/snappy-java/) + * Snappy for Java (org.xerial.snappy:snappy-java:1.0.5.3-beta - http://code.google.com/p/snappy-java/) * Xerces2 Java Parser (xerces:xercesImpl:2.9.1 - http://xerces.apache.org/xerces2-j) * XML Commons External Components XML APIs (xml-apis:xml-apis:1.3.04 - http://xml.apache.org/commons/components/external/) diff --git a/externalclient/hadoop/pom.xml b/externalclient/hadoop/pom.xml index 539b0ef87..c93a40063 100644 --- a/externalclient/hadoop/pom.xml +++ b/externalclient/hadoop/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/externalclient/zookeeper/pom.xml b/externalclient/zookeeper/pom.xml index 690573abf..6850a0834 100644 --- a/externalclient/zookeeper/pom.xml +++ b/externalclient/zookeeper/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/flinkx/LICENSE-3RD-PARTY b/flinkx/LICENSE-3RD-PARTY index d4bc5af9b..175858126 100644 --- a/flinkx/LICENSE-3RD-PARTY +++ b/flinkx/LICENSE-3RD-PARTY @@ -18,13 +18,13 @@ List of third-party dependencies grouped by their license type. * Metrics Core Library (com.yammer.metrics:metrics-core:2.2.0 - http://metrics.codahale.com/metrics-core/) * Apache Commons CLI (commons-cli:commons-cli:1.3.1 - http://commons.apache.org/proper/commons-cli/) * Apache Commons Collections (commons-collections:commons-collections:3.2.2 - http://commons.apache.org/collections/) - * wormhole-dbpool (edp.wormhole:wormhole-dbpool:0.5.2-beta - no url defined) - * wormhole-flinkxinterface (edp.wormhole:wormhole-flinkxinterface:0.5.2-beta - no url defined) - * wormhole-interface (edp.wormhole:wormhole-interface:0.5.2-beta - no url defined) - * wormhole-kafka-010 (edp.wormhole:wormhole-kafka-010:0.5.2-beta - no url defined) - * wormhole-ums_1.3 (edp.wormhole:wormhole-ums_1.3:0.5.2-beta - no url defined) - * wormhole-util (edp.wormhole:wormhole-util:0.5.2-beta - no url defined) - * wormhole-zookeeper (edp.wormhole:wormhole-zookeeper:0.5.2-beta - no url defined) + * wormhole-dbpool (edp.wormhole:wormhole-dbpool:0.5.3-beta - no url defined) + * wormhole-flinkxinterface (edp.wormhole:wormhole-flinkxinterface:0.5.3-beta - no url defined) + * wormhole-interface (edp.wormhole:wormhole-interface:0.5.3-beta - no url defined) + * wormhole-kafka-010 (edp.wormhole:wormhole-kafka-010:0.5.3-beta - no url defined) + * wormhole-ums_1.3 (edp.wormhole:wormhole-ums_1.3:0.5.3-beta - no url defined) + * wormhole-util (edp.wormhole:wormhole-util:0.5.3-beta - no url defined) + * wormhole-zookeeper (edp.wormhole:wormhole-zookeeper:0.5.3-beta - no url defined) * The Netty Project (io.netty:netty:3.7.0.Final - http://netty.io/) * force-shading (org.apache.flink:force-shading:1.5.1 - https://www.apache.org/force-shading/) * Javassist (org.javassist:javassist:3.18.2-GA - http://www.javassist.org/) diff --git a/flinkx/pom.xml b/flinkx/pom.xml index 2a44afb50..477f06e2b 100644 --- a/flinkx/pom.xml +++ b/flinkx/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../pom.xml diff --git a/interface/flinkxinterface/pom.xml b/interface/flinkxinterface/pom.xml index 9653960d1..af34a1254 100644 --- a/interface/flinkxinterface/pom.xml +++ b/interface/flinkxinterface/pom.xml @@ -6,7 +6,7 @@ wormhole-parent edp.wormhole - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/interface/publicinterface/pom.xml b/interface/publicinterface/pom.xml index ac5fa3634..3ad3ba534 100644 --- a/interface/publicinterface/pom.xml +++ b/interface/publicinterface/pom.xml @@ -6,7 +6,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/interface/sparkxinterface/pom.xml b/interface/sparkxinterface/pom.xml index 23d34f833..d75dc5e88 100644 --- a/interface/sparkxinterface/pom.xml +++ b/interface/sparkxinterface/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/kafkatool/kafka010-2/pom.xml b/kafkatool/kafka010-2/pom.xml index ed2f23cff..d2a7fd2cd 100644 --- a/kafkatool/kafka010-2/pom.xml +++ b/kafkatool/kafka010-2/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/kafkatool/kafka010/LICENSE-3RD-PARTY b/kafkatool/kafka010/LICENSE-3RD-PARTY index 834d3a78f..96cef8fe9 100644 --- a/kafkatool/kafka010/LICENSE-3RD-PARTY +++ b/kafkatool/kafka010/LICENSE-3RD-PARTY @@ -9,7 +9,7 @@ List of third-party dependencies grouped by their license type. * Jackson-core (com.fasterxml.jackson.core:jackson-core:2.3.1 - http://wiki.fasterxml.com/JacksonHome) * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.3.1 - http://wiki.fasterxml.com/JacksonHome) * Metrics Core Library (com.yammer.metrics:metrics-core:2.2.0 - http://metrics.codahale.com/metrics-core/) - * wormhole-util (edp.wormhole:wormhole-util:0.5.2-beta - no url defined) + * wormhole-util (edp.wormhole:wormhole-util:0.5.3-beta - no url defined) * The Netty Project (io.netty:netty:3.7.0.Final - http://netty.io/) * Joda-Time (joda-time:joda-time:2.9.8 - http://www.joda.org/joda-time/) * Apache Log4j (log4j:log4j:1.2.17 - http://logging.apache.org/log4j/1.2/) diff --git a/kafkatool/kafka010/pom.xml b/kafkatool/kafka010/pom.xml index 9e75b8b34..a959325b4 100644 --- a/kafkatool/kafka010/pom.xml +++ b/kafkatool/kafka010/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/kafkatool/kafka08/LICENSE-3RD-PARTY b/kafkatool/kafka08/LICENSE-3RD-PARTY index af007631a..2eb0999d2 100644 --- a/kafkatool/kafka08/LICENSE-3RD-PARTY +++ b/kafkatool/kafka08/LICENSE-3RD-PARTY @@ -9,7 +9,7 @@ List of third-party dependencies grouped by their license type. * Jackson-core (com.fasterxml.jackson.core:jackson-core:2.3.1 - http://wiki.fasterxml.com/JacksonHome) * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.3.1 - http://wiki.fasterxml.com/JacksonHome) * Metrics Core Library (com.yammer.metrics:metrics-core:2.2.0 - http://metrics.codahale.com/metrics-core/) - * wormhole-util (edp.wormhole:wormhole-util:0.5.2-beta - no url defined) + * wormhole-util (edp.wormhole:wormhole-util:0.5.3-beta - no url defined) * The Netty Project (io.netty:netty:3.7.0.Final - http://netty.io/) * Joda-Time (joda-time:joda-time:2.9.8 - http://www.joda.org/joda-time/) * Apache Log4j (log4j:log4j:1.2.17 - http://logging.apache.org/log4j/1.2/) diff --git a/kafkatool/kafka08/pom.xml b/kafkatool/kafka08/pom.xml index 4a6d560e4..f049cfa2e 100644 --- a/kafkatool/kafka08/pom.xml +++ b/kafkatool/kafka08/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/pom.xml b/pom.xml index 181371653..720f4ea7a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta pom @@ -51,7 +51,7 @@ ${project.basedir} 1.3 - 0.5.2-beta + 0.5.3-beta UTF-8 UTF-8 1.8 @@ -219,7 +219,7 @@ - + diff --git a/rider/bin/start.sh b/rider/bin/start.sh index 5d8b46787..0b93c2fdb 100644 --- a/rider/bin/start.sh +++ b/rider/bin/start.sh @@ -37,4 +37,4 @@ echo "wormholeServer final request address for UI: $finalAddress" # sed -i "s#http://.*/api-docs/swagger.json#http://$finalAddress/api-docs/swagger.json#g" $WORMHOLE_HOME/swagger-ui/index.html echo "[WormholeServer] is starting..." -java -DWORMHOLE_HOME=$WORMHOLE_HOME -cp $WORMHOLE_HOME/lib/wormhole-rider-server_1.3-0.5.2-beta.jar:$WORMHOLE_HOME/lib/* edp.rider.RiderStarter & +java -DWORMHOLE_HOME=$WORMHOLE_HOME -cp $WORMHOLE_HOME/lib/wormhole-rider-server_1.3-0.5.3-beta.jar:$WORMHOLE_HOME/lib/* edp.rider.RiderStarter & diff --git a/rider/rider-assembly/pom.xml b/rider/rider-assembly/pom.xml index 67ca3e175..73adca939 100644 --- a/rider/rider-assembly/pom.xml +++ b/rider/rider-assembly/pom.xml @@ -7,12 +7,12 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml wormhole - 0.5.2-beta + 0.5.3-beta pom @@ -26,12 +26,12 @@ edp.wormhole wormhole-rider-server_${ums.version} - 0.5.2-beta + 0.5.3-beta - + diff --git a/rider/rider-assembly/src/main/assembly/assembly.xml b/rider/rider-assembly/src/main/assembly/assembly.xml index e926c2a04..535551a11 100644 --- a/rider/rider-assembly/src/main/assembly/assembly.xml +++ b/rider/rider-assembly/src/main/assembly/assembly.xml @@ -81,13 +81,13 @@ - ${project.parent.basedir}/sparkx/target/wormhole-ums_1.3-sparkx_2.2.0-0.5.2-beta-jar-with-dependencies.jar + ${project.parent.basedir}/sparkx/target/wormhole-ums_1.3-sparkx_2.2.0-0.5.3-beta-jar-with-dependencies.jar lib - ${project.parent.basedir}/flinkx/target/wormhole-ums_${ums.version}-flinkx_${flink.version}-0.5.2-beta-jar-with-dependencies.jar + ${project.parent.basedir}/flinkx/target/wormhole-ums_${ums.version}-flinkx_${flink.version}-0.5.3-beta-jar-with-dependencies.jar lib diff --git a/rider/rider-server/LICENSE-3RD-PARTY b/rider/rider-server/LICENSE-3RD-PARTY index 66f436fb1..154cad56b 100644 --- a/rider/rider-server/LICENSE-3RD-PARTY +++ b/rider/rider-server/LICENSE-3RD-PARTY @@ -28,10 +28,10 @@ List of third-party dependencies grouped by their license type. * HikariCP (com.zaxxer:HikariCP:2.5.1 - https://github.com/brettwooldridge/HikariCP) * Apache Commons Codec (commons-codec:commons-codec:1.10 - http://commons.apache.org/proper/commons-codec/) * Commons Logging (commons-logging:commons-logging:1.1.3 - http://commons.apache.org/proper/commons-logging/) - * wormhole-kafka-010 (edp.wormhole:wormhole-kafka-010:0.5.2-beta - no url defined) - * wormhole-ums_1.3 (edp.wormhole:wormhole-ums_1.3:0.5.2-beta - no url defined) - * wormhole-util (edp.wormhole:wormhole-util:0.5.2-beta - no url defined) - * wormhole-zookeeper (edp.wormhole:wormhole-zookeeper:0.5.2-beta - no url defined) + * wormhole-kafka-010 (edp.wormhole:wormhole-kafka-010:0.5.3-beta - no url defined) + * wormhole-ums_1.3 (edp.wormhole:wormhole-ums_1.3:0.5.3-beta - no url defined) + * wormhole-util (edp.wormhole:wormhole-util:0.5.3-beta - no url defined) + * wormhole-zookeeper (edp.wormhole:wormhole-zookeeper:0.5.3-beta - no url defined) * The Netty Project (io.netty:netty:3.7.0.Final - http://netty.io/) * spray-json (io.spray:spray-json_2.11:1.3.3 - https://github.com/spray/spray-json) * swagger-annotations (io.swagger:swagger-annotations:1.5.12 - https://github.com/swagger-api/swagger-core/modules/swagger-annotations) diff --git a/rider/rider-server/pom.xml b/rider/rider-server/pom.xml index 950359f43..f2126f259 100644 --- a/rider/rider-server/pom.xml +++ b/rider/rider-server/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../../pom.xml diff --git a/rider/rider-server/src/main/scala/edp/rider/common/RiderConfig.scala b/rider/rider-server/src/main/scala/edp/rider/common/RiderConfig.scala index 651184beb..8cd3ee298 100644 --- a/rider/rider-server/src/main/scala/edp/rider/common/RiderConfig.scala +++ b/rider/rider-server/src/main/scala/edp/rider/common/RiderConfig.scala @@ -214,10 +214,10 @@ object RiderConfig { lazy val appTags = getStringConfig("spark.app.tags", "wormhole") lazy val wormholeClientLogPath = getStringConfig("spark.wormhole.client.log.path", s"${RiderConfig.riderRootPath}/logs/streams") - lazy val wormholeJarPath = getStringConfig("spark.wormhole.jar.path", s"${RiderConfig.riderRootPath}/lib/wormhole-ums_1.3-sparkx_2.2.0-0.5.2-beta-jar-with-dependencies.jar") - lazy val wormholeKafka08JarPath = getStringConfig("spark.wormhole.kafka08.jar.path", s"${RiderConfig.riderRootPath}/lib/wormhole-ums_1.3-sparkx_2.2.0-0.5.2-beta-jar-with-dependencies-kafka08.jar") + lazy val wormholeJarPath = getStringConfig("spark.wormhole.jar.path", s"${RiderConfig.riderRootPath}/lib/wormhole-ums_1.3-sparkx_2.2.0-0.5.3-beta-jar-with-dependencies.jar") + lazy val wormholeKafka08JarPath = getStringConfig("spark.wormhole.kafka08.jar.path", s"${RiderConfig.riderRootPath}/lib/wormhole-ums_1.3-sparkx_2.2.0-0.5.3-beta-jar-with-dependencies-kafka08.jar") lazy val kafka08StreamNames = getStringConfig("spark.wormhole.kafka08.streams", "") - lazy val sparkxInterfaceJarPath = getStringConfig("spark.wormhole.sparkxinterface.jar.path", s"${RiderConfig.riderRootPath}/lib/wormhole-sparkxinterface-0.5.2-beta.jar") + lazy val sparkxInterfaceJarPath = getStringConfig("spark.wormhole.sparkxinterface.jar.path", s"${RiderConfig.riderRootPath}/lib/wormhole-sparkxinterface-0.5.3-beta.jar") lazy val kafka11StreamNames = getStringConfig("spark.wormhole.kafka11.streams", "") lazy val wormholeUser = config.getString("spark.wormholeServer.user") lazy val sshPort = config.getInt("spark.wormholeServer.ssh.port") @@ -318,7 +318,7 @@ object RiderConfig { lazy val defaultFlinkConfig = FlinkDefaultConfig("", FlinkResourceConfig(2, 6, 1, 2), "") lazy val flink = RiderFlink(config.getString("flink.home"), config.getString("flink.yarn.queue.name"), 1, 1, - getStringConfig("flink.wormhole.jar.path", s"${RiderConfig.riderRootPath}/lib/wormhole-ums_1.3-flinkx_1.5.1-0.5.2-beta-jar-with-dependencies.jar"), + getStringConfig("flink.wormhole.jar.path", s"${RiderConfig.riderRootPath}/lib/wormhole-ums_1.3-flinkx_1.5.1-0.5.3-beta-jar-with-dependencies.jar"), getStringConfig("flink.wormhole.client.log.path", s"$riderRootPath/logs/flows"), getIntConfig("spark.kafka.session.timeout", 30000), getIntConfig("spark.kafka.group.max.session.timeout.ms", 60000) diff --git a/rider/rider-webapp/package-lock.json b/rider/rider-webapp/package-lock.json index 48dc5ebd4..6ce84f17d 100644 --- a/rider/rider-webapp/package-lock.json +++ b/rider/rider-webapp/package-lock.json @@ -1511,7 +1511,7 @@ "home-or-tmp": "2.0.0", "lodash": "4.17.10", "mkdirp": "0.5.1", - "source-map-support": "0.5.2-beta8" + "source-map-support": "0.5.3-beta8" }, "dependencies": { "babel-core": { @@ -2041,7 +2041,7 @@ "debug": "2.6.9", "depd": "1.1.2", "http-errors": "1.6.3", - "iconv-lite": "0.5.2-beta3", + "iconv-lite": "0.5.3-beta3", "on-finished": "2.3.0", "qs": "6.5.2", "raw-body": "2.3.3", @@ -3379,8 +3379,8 @@ } }, "currently-unhandled": { - "version": "0.5.2-beta", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.5.2-beta.tgz", + "version": "0.5.3-beta", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.5.3-beta.tgz", "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { @@ -4143,7 +4143,7 @@ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "requires": { - "iconv-lite": "0.5.2-beta3" + "iconv-lite": "0.5.3-beta3" } }, "end-of-stream": { @@ -5998,7 +5998,7 @@ "optional": true }, "iconv-lite": { - "version": "0.5.2-beta1", + "version": "0.5.3-beta1", "bundled": true, "dev": true, "optional": true, @@ -6102,7 +6102,7 @@ "optional": true, "requires": { "debug": "2.6.9", - "iconv-lite": "0.5.2-beta1", + "iconv-lite": "0.5.3-beta1", "sax": "1.2.4" } }, @@ -7422,8 +7422,8 @@ } }, "iconv-lite": { - "version": "0.5.2-beta3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2-beta3.tgz", + "version": "0.5.3-beta3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.3-beta3.tgz", "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "requires": { "safer-buffer": ">= 2.1.2 < 3" @@ -9520,7 +9520,7 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.5.2-beta", + "currently-unhandled": "0.5.3-beta", "signal-exit": "3.0.2" } }, @@ -10490,7 +10490,7 @@ "integrity": "sha1-6Xpr4xGLTcNg4G7UvEc/EPLec7Y=", "dev": true, "requires": { - "deep-extend": "0.5.2-beta", + "deep-extend": "0.5.3-beta", "ejs": "2.6.1", "loader-utils": "0.2.17", "minimatch": "3.0.4", @@ -10498,8 +10498,8 @@ }, "dependencies": { "deep-extend": { - "version": "0.5.2-beta", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.2-beta.tgz", + "version": "0.5.3-beta", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.3-beta.tgz", "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", "dev": true } @@ -12496,7 +12496,7 @@ "requires": { "bytes": "3.0.0", "http-errors": "1.6.3", - "iconv-lite": "0.5.2-beta3", + "iconv-lite": "0.5.3-beta3", "unpipe": "1.0.0" }, "dependencies": { @@ -13357,14 +13357,14 @@ "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", "dev": true, "requires": { - "balanced-match": "0.5.2-beta", + "balanced-match": "0.5.3-beta", "math-expression-evaluator": "1.2.17", "reduce-function-call": "1.0.2" }, "dependencies": { "balanced-match": { - "version": "0.5.2-beta", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.5.2-beta.tgz", + "version": "0.5.3-beta", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.5.3-beta.tgz", "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", "dev": true } @@ -13376,12 +13376,12 @@ "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", "dev": true, "requires": { - "balanced-match": "0.5.2-beta" + "balanced-match": "0.5.3-beta" }, "dependencies": { "balanced-match": { - "version": "0.5.2-beta", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.5.2-beta.tgz", + "version": "0.5.3-beta", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.5.3-beta.tgz", "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", "dev": true } @@ -14532,8 +14532,8 @@ } }, "source-map-support": { - "version": "0.5.2-beta8", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.2-beta8.tgz", + "version": "0.5.3-beta8", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3-beta8.tgz", "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { @@ -16364,14 +16364,14 @@ "dev": true, "requires": { "graceful-fs": "4.1.11", - "memory-fs": "0.5.2-beta", + "memory-fs": "0.5.3-beta", "object-assign": "4.1.1", "tapable": "0.2.8" }, "dependencies": { "memory-fs": { - "version": "0.5.2-beta", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.2-beta.tgz", + "version": "0.5.3-beta", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.3-beta.tgz", "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { diff --git a/rider/rider-webapp/yarn.lock b/rider/rider-webapp/yarn.lock index 8739fdac3..9c4d83b85 100644 --- a/rider/rider-webapp/yarn.lock +++ b/rider/rider-webapp/yarn.lock @@ -1012,7 +1012,7 @@ babel-register@^6.18.0: home-or-tmp "^2.0.0" lodash "^4.2.0" mkdirp "^0.5.1" - source-map-support "^0.5.2-beta" + source-map-support "^0.5.3-beta" babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.2.0, babel-runtime@^6.9.0, babel-runtime@^6.9.1: version "6.11.6" @@ -1093,9 +1093,9 @@ balanced-match@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.2.1.tgz#7bc658b4bed61eee424ad74f75f5c3e2c4df3cc7" -balanced-match@^0.4.0, balanced-match@^0.5.2-beta, balanced-match@^0.5.2-beta: - version "0.5.2-beta" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.5.2-beta.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" +balanced-match@^0.4.0, balanced-match@^0.5.3-beta, balanced-match@^0.5.3-beta: + version "0.5.3-beta" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.5.3-beta.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" balanced-match@~0.1.0, balanced-match@0.1.0: version "0.1.0" @@ -1254,7 +1254,7 @@ body-parser@^1.12.4: debug "~2.2.0" depd "~1.1.0" http-errors "~1.5.0" - iconv-lite "0.5.2-beta3" + iconv-lite "0.5.3-beta3" on-finished "~2.3.0" qs "6.2.0" raw-body "~2.1.7" @@ -1285,7 +1285,7 @@ brace-expansion@^1.0.0: version "1.1.6" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9" dependencies: - balanced-match "^0.5.2-beta" + balanced-match "^0.5.3-beta" concat-map "0.0.1" braces@^0.1.2: @@ -2248,9 +2248,9 @@ ctype@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f" -currently-unhandled@^0.5.2-beta: - version "0.5.2-beta" - resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.5.2-beta.tgz#988df33feab191ef799a61369dd76c17adf957ea" +currently-unhandled@^0.5.3-beta: + version "0.5.3-beta" + resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.5.3-beta.tgz#988df33feab191ef799a61369dd76c17adf957ea" dependencies: array-find-index "^1.0.1" @@ -2390,8 +2390,8 @@ deep-equal@^1.0.0, deep-equal@1.0.1: resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" deep-extend@^0.4.0, deep-extend@~0.4.0: - version "0.5.2-beta" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.2-beta.tgz#efe4113d08085f4e6f9687759810f807469e2253" + version "0.5.3-beta" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.3-beta.tgz#efe4113d08085f4e6f9687759810f807469e2253" deep-is@~0.1.3: version "0.1.3" @@ -2502,7 +2502,7 @@ doiuse@^2.4.1: lodash "^4.0.0" multimatch "^2.0.0" postcss "^5.0.8" - source-map "^0.5.2-beta" + source-map "^0.5.3-beta" through2 "^0.6.3" yargs "^3.5.4" @@ -2698,7 +2698,7 @@ encoding@^0.1.11: version "0.1.12" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" dependencies: - iconv-lite "~0.5.2-beta3" + iconv-lite "~0.5.3-beta3" end-of-stream@^1.0.0: version "1.1.0" @@ -3401,9 +3401,9 @@ find-versions@^1.0.0: meow "^3.5.0" semver-regex "^1.0.0" -findup-sync@^0.5.2-beta: - version "0.5.2-beta" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.5.2-beta.tgz#a8117d0f73124f5a4546839579fe52d7129fb5e5" +findup-sync@^0.5.3-beta: + version "0.5.3-beta" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.5.3-beta.tgz#a8117d0f73124f5a4546839579fe52d7129fb5e5" dependencies: detect-file "^0.1.0" is-glob "^2.0.1" @@ -4133,9 +4133,9 @@ humanize-url@^1.0.1: normalize-url "^1.0.0" strip-url-auth "^1.0.0" -iconv-lite@~0.5.2-beta3, iconv-lite@0.5.2-beta3: - version "0.5.2-beta3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2-beta3.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2" +iconv-lite@~0.5.3-beta3, iconv-lite@0.5.3-beta3: + version "0.5.3-beta3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.3-beta3.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2" icss-replace-symbols@^1.0.2: version "1.0.2" @@ -5064,7 +5064,7 @@ liftoff@^2.2.0: resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385" dependencies: extend "^3.0.0" - findup-sync "^0.5.2-beta" + findup-sync "^0.5.3-beta" fined "^1.0.1" flagged-respawn "^0.3.2" lodash.isplainobject "^4.0.4" @@ -5476,7 +5476,7 @@ loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" dependencies: - currently-unhandled "^0.5.2-beta" + currently-unhandled "^0.5.3-beta" signal-exit "^3.0.0" lower-case-first@^1.0.0: @@ -5604,7 +5604,7 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7: normalize-path "^2.0.1" object.omit "^2.0.0" parse-glob "^3.0.4" - regex-cache "^0.5.2-beta" + regex-cache "^0.5.3-beta" miller-rabin@^4.0.0: version "4.0.0" @@ -6372,7 +6372,7 @@ postcss-apply@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/postcss-apply/-/postcss-apply-0.3.0.tgz#a2f37c5bdfa881e4c15f4f245ec0cd96dd2e70d5" dependencies: - balanced-match "^0.5.2-beta" + balanced-match "^0.5.3-beta" postcss "^5.0.21" postcss-attribute-case-insensitive@^1.0.1: @@ -6788,7 +6788,7 @@ postcss-selector-matches@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-2.0.5.tgz#fa0f43be57b68e77aa4cd11807023492a131027f" dependencies: - balanced-match "^0.5.2-beta" + balanced-match "^0.5.3-beta" postcss "^5.0.0" postcss-selector-not@^2.0.0: @@ -7043,7 +7043,7 @@ raw-body@~2.1.7: resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.1.7.tgz#adfeace2e4fb3098058014d08c072dcc59758774" dependencies: bytes "2.4.0" - iconv-lite "0.5.2-beta3" + iconv-lite "0.5.3-beta3" unpipe "1.0.0" rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@~1.1.0: @@ -7281,7 +7281,7 @@ reduce-css-calc@^1.2.6, reduce-css-calc@^1.2.7: version "1.3.0" resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716" dependencies: - balanced-match "^0.5.2-beta" + balanced-match "^0.5.3-beta" math-expression-evaluator "^1.2.14" reduce-function-call "^1.0.1" @@ -7318,7 +7318,7 @@ regenerator-runtime@^0.9.5: version "0.9.5" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz#403d6d40a4bdff9c330dd9392dcbb2d9a8bba1fc" -regex-cache@^0.5.2-beta: +regex-cache@^0.5.3-beta: version "0.4.3" resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" dependencies: @@ -7433,7 +7433,7 @@ request@^2.54.0, request@^2.55.0, request@^2.72.0, request@2.75.0, request@2.x: qs "~6.2.0" stringstream "~0.0.4" tough-cookie "~2.3.0" - tunnel-agent "~0.5.2-beta" + tunnel-agent "~0.5.3-beta" request@~2.60.0: version "2.60.0" @@ -7483,7 +7483,7 @@ request@~2.72.0: qs "~6.1.0" stringstream "~0.0.4" tough-cookie "~2.2.0" - tunnel-agent "~0.5.2-beta" + tunnel-agent "~0.5.3-beta" require-directory@^2.1.1: version "2.1.1" @@ -7845,7 +7845,7 @@ source-map-resolve@^0.3.0: source-map-url "~0.3.0" urix "~0.1.0" -source-map-support@^0.5.2-beta: +source-map-support@^0.5.3-beta: version "0.4.3" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.3.tgz#693c8383d4389a4569486987c219744dfc601685" dependencies: @@ -7861,7 +7861,7 @@ source-map@^0.1.38, source-map@^0.1.41, source-map@~0.1.7, source-map@0.1.x: dependencies: amdefine ">=0.0.4" -source-map@^0.5.2-beta, source-map@^0.4.4, source-map@0.4.x: +source-map@^0.5.3-beta, source-map@^0.4.4, source-map@0.4.x: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: @@ -8403,7 +8403,7 @@ tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" -tunnel-agent@^0.4.0, tunnel-agent@~0.4.0, tunnel-agent@~0.5.2-beta: +tunnel-agent@^0.4.0, tunnel-agent@~0.4.0, tunnel-agent@~0.5.3-beta: version "0.4.3" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" diff --git a/sinks/pom.xml b/sinks/pom.xml index 738e0ccf6..f280d46a5 100644 --- a/sinks/pom.xml +++ b/sinks/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../pom.xml diff --git a/sparkx/LICENSE-3RD-PARTY b/sparkx/LICENSE-3RD-PARTY index 75ea70a1e..9203b6a0c 100644 --- a/sparkx/LICENSE-3RD-PARTY +++ b/sparkx/LICENSE-3RD-PARTY @@ -43,13 +43,13 @@ List of third-party dependencies grouped by their license type. * Commons Lang (commons-lang:commons-lang:2.6 - http://commons.apache.org/lang/) * Apache Commons Logging (commons-logging:commons-logging:1.2 - http://commons.apache.org/proper/commons-logging/) * Commons Net (commons-net:commons-net:2.2 - http://commons.apache.org/net/) - * wormhole-dbpool (edp.wormhole:wormhole-dbpool:0.5.2-beta - no url defined) - * wormhole-es-hadoop (edp.wormhole:wormhole-es-hadoop:0.5.2-beta - no url defined) - * wormhole-hadoop (edp.wormhole:wormhole-hadoop:0.5.2-beta - no url defined) - * wormhole-kafka-010 (edp.wormhole:wormhole-kafka-010:0.5.2-beta - no url defined) - * wormhole-ums_1.3 (edp.wormhole:wormhole-ums_1.3:0.5.2-beta - no url defined) - * wormhole-util (edp.wormhole:wormhole-util:0.5.2-beta - no url defined) - * wormhole-zookeeper (edp.wormhole:wormhole-zookeeper:0.5.2-beta - no url defined) + * wormhole-dbpool (edp.wormhole:wormhole-dbpool:0.5.3-beta - no url defined) + * wormhole-es-hadoop (edp.wormhole:wormhole-es-hadoop:0.5.3-beta - no url defined) + * wormhole-hadoop (edp.wormhole:wormhole-hadoop:0.5.3-beta - no url defined) + * wormhole-kafka-010 (edp.wormhole:wormhole-kafka-010:0.5.3-beta - no url defined) + * wormhole-ums_1.3 (edp.wormhole:wormhole-ums_1.3:0.5.3-beta - no url defined) + * wormhole-util (edp.wormhole:wormhole-util:0.5.3-beta - no url defined) + * wormhole-zookeeper (edp.wormhole:wormhole-zookeeper:0.5.3-beta - no url defined) * Metrics Core (io.dropwizard.metrics:metrics-core:3.1.2 - http://metrics.codahale.com/metrics-core/) * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:3.1.2 - http://metrics.codahale.com/metrics-graphite/) * Jackson Integration for Metrics (io.dropwizard.metrics:metrics-json:3.1.2 - http://metrics.codahale.com/metrics-json/) diff --git a/sparkx/pom.xml b/sparkx/pom.xml index b1beedefd..43a046881 100644 --- a/sparkx/pom.xml +++ b/sparkx/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../pom.xml diff --git a/swifts/pom.xml b/swifts/pom.xml index 98444d0b9..a39c6b5e1 100644 --- a/swifts/pom.xml +++ b/swifts/pom.xml @@ -5,7 +5,7 @@ wormhole-parent edp.wormhole - 0.5.2-beta + 0.5.3-beta ../pom.xml 4.0.0 diff --git a/ums/LICENSE-3RD-PARTY b/ums/LICENSE-3RD-PARTY index 92eecb936..55b37df39 100644 --- a/ums/LICENSE-3RD-PARTY +++ b/ums/LICENSE-3RD-PARTY @@ -7,7 +7,7 @@ List of third-party dependencies grouped by their license type. * Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.3.0 - http://wiki.fasterxml.com/JacksonHome) * Jackson-core (com.fasterxml.jackson.core:jackson-core:2.3.1 - http://wiki.fasterxml.com/JacksonHome) * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.3.1 - http://wiki.fasterxml.com/JacksonHome) - * wormhole-util (edp.wormhole:wormhole-util:0.5.2-beta - no url defined) + * wormhole-util (edp.wormhole:wormhole-util:0.5.3-beta - no url defined) * Joda-Time (joda-time:joda-time:2.9.8 - http://www.joda.org/joda-time/) * Apache Log4j (log4j:log4j:1.2.17 - http://logging.apache.org/log4j/1.2/) * Joda-Convert (org.joda:joda-convert:1.7 - http://www.joda.org/joda-convert/) diff --git a/ums/pom.xml b/ums/pom.xml index 4738b2cbb..7833c58d8 100644 --- a/ums/pom.xml +++ b/ums/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../pom.xml diff --git a/util/pom.xml b/util/pom.xml index 1473a1d86..f28f24868 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -7,7 +7,7 @@ edp.wormhole wormhole-parent - 0.5.2-beta + 0.5.3-beta ../pom.xml