You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by le...@apache.org on 2018/12/10 15:19:44 UTC
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 <ju...@gmail.com>
Authored: Mon Dec 10 10:19:30 2018 -0500
Committer: leet <le...@apache.org>
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 @@
<dependency>
<groupId>org.jboss.aesh</groupId>
<artifactId>aesh</artifactId>
- <version>0.66.8</version>
+ <version>${global_aesh_version}</version>
</dependency>
<dependency>
<groupId>com.clearspring.analytics</groupId>
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 @@
<dependency>
<groupId>org.jboss.aesh</groupId>
<artifactId>aesh</artifactId>
- <version>0.66.8</version>
+ <version>${global_aesh_version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
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('foo\\\\bar', '\\\\')"));
+ 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
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 92d0fda..370fa1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,6 +124,7 @@
<global_simple_syslog_version>0.0.9</global_simple_syslog_version>
<global_spark_version>2.3.1</global_spark_version>
<global_httpclient_version>4.3.2</global_httpclient_version>
+ <global_aesh_version>0.66.19</global_aesh_version>
</properties>
<profiles>