[metron] branch master updated: METRON-1931 Update dev utilities to support new repo location (rlenferink via justinleet) closes apache/metron#1295
This is an automated email from the ASF dual-hosted git repository. leet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/metron.git The following commit(s) were added to refs/heads/master by this push: new f8776f5 METRON-1931 Update dev utilities to support new repo location (rlenferink via justinleet) closes apache/metron#1295 f8776f5 is described below commit f8776f559c7fa9dcbf857ce29636a45b3a38791b Author: rlenferink AuthorDate: Mon Dec 10 16:57:13 2018 -0500 METRON-1931 Update dev utilities to support new repo location (rlenferink via justinleet) closes apache/metron#1295 --- dev-utilities/committer-utils/README.md | 2 +- dev-utilities/committer-utils/metron-committer-common | 4 ++-- dev-utilities/release-utils/README.md | 2 +- dev-utilities/release-utils/prepare-release-candidate | 6 +++--- dev-utilities/release-utils/validate-jira-for-release | 4 ++-- metron-analytics/pom.xml | 6 +++--- metron-contrib/pom.xml| 6 +++--- metron-interface/pom.xml | 6 +++--- metron-platform/pom.xml | 6 +++--- metron-stellar/pom.xml| 6 +++--- site-book/pom.xml | 6 +++--- site/BUILD.md | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dev-utilities/committer-utils/README.md b/dev-utilities/committer-utils/README.md index ac428cc..0a91759 100644 --- a/dev-utilities/committer-utils/README.md +++ b/dev-utilities/committer-utils/README.md @@ -54,7 +54,7 @@ In the following example, I enter the pull request number when prompted. Using remote: Total 37861 (delta 27), reused 47 (delta 4), pack-reused 37757 Receiving objects: 100% (37861/37861), 58.18 MiB | 4.38 MiB/s, done. Resolving deltas: 100% (14439/14439), done. -From https://git-wip-us.apache.org/repos/asf/metron +From https://gitbox.apache.org/repos/asf/metron.git * branch master -> FETCH_HEAD * [new branch]master -> upstream/master Already on 'master' diff --git a/dev-utilities/committer-utils/metron-committer-common b/dev-utilities/committer-utils/metron-committer-common index 0f6c06a..23ec4e9 100644 --- a/dev-utilities/committer-utils/metron-committer-common +++ b/dev-utilities/committer-utils/metron-committer-common @@ -21,9 +21,9 @@ # # the upstream apache git repo for apache metron -METRON_UPSTREAM="https://git-wip-us.apache.org/repos/asf/metron.git; +METRON_UPSTREAM="https://gitbox.apache.org/repos/asf/metron.git; # the upstream apache git repo for apache metron bro plugin kafka -BRO_PLUGIN_UPSTREAM="https://git-wip-us.apache.org/repos/asf/metron-bro-plugin-kafka.git; +BRO_PLUGIN_UPSTREAM="https://gitbox.apache.org/repos/asf/metron-bro-plugin-kafka.git; # the common configuration file with the committer info CONFIG_FILE=~/.metron-prepare-commit diff --git a/dev-utilities/release-utils/README.md b/dev-utilities/release-utils/README.md index d1fd816..b7b5cb0 100644 --- a/dev-utilities/release-utils/README.md +++ b/dev-utilities/release-utils/README.md @@ -89,7 +89,7 @@ In the following example, enter the appropriate information Checking out repo: dev Checking out repo: https://dist.apache.org/repos/dist/release/metron Checking out repo: release - Checking out git repo: https://git-wip-us.apache.org/repos/asf/metron.git + Checking out git repo: https://gitbox.apache.org/repos/asf/metron.git Cloning into '/Users/justinleet/tmp/metron-0.6.1/metron'... remote: Counting objects: 46146, done. remote: Compressing objects: 100% (15568/15568), done. diff --git a/dev-utilities/release-utils/prepare-release-candidate b/dev-utilities/release-utils/prepare-release-candidate index 35f5013..cb0585d 100755 --- a/dev-utilities/release-utils/prepare-release-candidate +++ b/dev-utilities/release-utils/prepare-release-candidate @@ -28,12 +28,12 @@ set -eo pipefail # if versioning of the submodule isn't x.y.z format, retrieval of the git tag must also be adjusted. METRON_REPO_NAME="metron" BRO_PLUGIN_REPO_NAME="metron-bro-plugin-kafka" -METRON_UPSTREAM="https://git-wip-us.apache.org/repos/asf/${METRON_REPO_NAME}.git; -BRO_PLUGIN_UPSTREAM="https://git-wip-us.apache.org/repos/asf/${BRO_PLUGIN_REPO_NAME}.git; +METRON_UPSTREAM="https://gitbox.apache.org/repos/asf/${METRON_REPO_NAME}.git; +BRO_PLUGIN_UPSTREAM="https://gitbox.apache.org/repos/asf/${BRO_PLUGIN_REPO_NAME}.git; DEV_REPO="https://dist.apache.org/repos/dist/dev/metron; RELEASE_REPO=" https://dist.apache.org/repos/dist/release/metron; -PLUGIN_GIT_REPO="https://git-wip-us.apache.org/repos/asf/${BRO_PLUGIN_REPO_NAME}.git; +PLUGIN_GIT_REPO="https://gitbox.apache.org/repos/asf/${BRO_PLUGIN_REPO_NAME}.git; RC_PREFIX=rc UPPER_RC_PREFIX="$(tr
metron git commit: METRON-1922 Escaping incorrectly handled in current aesh version (justinleet) closes apache/metron#1291
Repository: metron Updated Branches: refs/heads/master 285ba5eb6 -> 30fafe5df METRON-1922 Escaping incorrectly handled in current aesh version (justinleet) closes apache/metron#1291 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/30fafe5d Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/30fafe5d Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/30fafe5d Branch: refs/heads/master Commit: 30fafe5df16386a99274b871a291a708963eaae9 Parents: 285ba5e Author: justinleet Authored: Mon Dec 10 10:19:30 2018 -0500 Committer: leet Committed: Mon Dec 10 10:19:30 2018 -0500 -- dependencies_with_url.csv | 3 ++- metron-platform/metron-common/pom.xml | 2 +- metron-stellar/stellar-common/pom.xml | 2 +- .../metron/stellar/common/shell/cli/StellarShellTest.java | 6 ++ pom.xml| 1 + 5 files changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/metron/blob/30fafe5d/dependencies_with_url.csv -- diff --git a/dependencies_with_url.csv b/dependencies_with_url.csv index bdc2508..0a63922 100644 --- a/dependencies_with_url.csv +++ b/dependencies_with_url.csv @@ -1,5 +1,5 @@ com.jakewharton.fliptables:fliptables:jar:1.0.2:compile,Apache v2,https://github.com/JakeWharton/flip-tables -org.jboss.aesh:aesh:jar:0.66.8:compile,Apache v2,https://github.com/aeshell/aesh +org.jboss.aesh:aesh:jar:0.66.19:compile,Apache v2,https://github.com/aeshell/aesh org.objenesis:objenesis:jar:1.2:compile,Apache v2,http://objenesis.org/ org.objenesis:objenesis:jar:2.1:compile,Apache v2,http://objenesis.org/ org.ow2.asm:asm:jar:4.1:compile,BSD,http://asm.ow2.org/ @@ -489,3 +489,4 @@ org.hibernate.validator:hibernate-validator:jar:6.0.9.Final:compile,ASLv2,https: com.github.palindromicity:simple-syslog-5424:jar:0.0.9:compile,ASLv2,https://github.com/palindromicity/simple-syslog-5424 org.elasticsearch.client:elasticsearch-rest-high-level-client:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt org.elasticsearch.plugin:aggs-matrix-stats-client:jar:5.6.2:compile,ASLv2,https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt +org.fusesource.jansi:jansi:jar:1.16:compile,ASLv2,https://github.com/fusesource/jansi/blob/master/license.txt http://git-wip-us.apache.org/repos/asf/metron/blob/30fafe5d/metron-platform/metron-common/pom.xml -- diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml index 1ca8601..afa4e64 100644 --- a/metron-platform/metron-common/pom.xml +++ b/metron-platform/metron-common/pom.xml @@ -353,7 +353,7 @@ org.jboss.aesh aesh -0.66.8 +${global_aesh_version} com.clearspring.analytics http://git-wip-us.apache.org/repos/asf/metron/blob/30fafe5d/metron-stellar/stellar-common/pom.xml -- diff --git a/metron-stellar/stellar-common/pom.xml b/metron-stellar/stellar-common/pom.xml index b8be521..b3a1fac 100644 --- a/metron-stellar/stellar-common/pom.xml +++ b/metron-stellar/stellar-common/pom.xml @@ -146,7 +146,7 @@ org.jboss.aesh aesh -0.66.8 +${global_aesh_version} com.googlecode.json-simple http://git-wip-us.apache.org/repos/asf/metron/blob/30fafe5d/metron-stellar/stellar-common/src/test/java/org/apache/metron/stellar/common/shell/cli/StellarShellTest.java -- diff --git a/metron-stellar/stellar-common/src/test/java/org/apache/metron/stellar/common/shell/cli/StellarShellTest.java b/metron-stellar/stellar-common/src/test/java/org/apache/metron/stellar/common/shell/cli/StellarShellTest.java index ef2475b..b8f0997 100644 --- a/metron-stellar/stellar-common/src/test/java/org/apache/metron/stellar/common/shell/cli/StellarShellTest.java +++ b/metron-stellar/stellar-common/src/test/java/org/apache/metron/stellar/common/shell/cli/StellarShellTest.java @@ -100,6 +100,12 @@ public class StellarShellTest { assertEquals("4", stdout()); } + @Test + public void testBackslashInStrings() throws Exception { +stellarShell.execute(createOp("SPLIT('foobar', '')")); +assertEquals("[foo, bar]", stdout()); + } + /** * Ensure that Stellar lists are displayed correctly in the REPL. */ http://git-wip-us.apache.org/repos/asf/metron/blob/30fafe5d/pom.xml