You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ni...@apache.org on 2016/08/22 18:12:33 UTC
incubator-metron git commit: METRON-387 Build Failure - Bad Merge
with METRON-309 (nickwallen) closes apache/incubator-metron#224
Repository: incubator-metron
Updated Branches:
refs/heads/master 817548647 -> 71d644ed1
METRON-387 Build Failure - Bad Merge with METRON-309 (nickwallen) closes apache/incubator-metron#224
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/71d644ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/71d644ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/71d644ed
Branch: refs/heads/master
Commit: 71d644ed11757b5895d2c4bc143af6c011613703
Parents: 8175486
Author: nickwallen <ni...@nickallen.org>
Authored: Mon Aug 22 14:11:38 2016 -0400
Committer: Nick Allen <ni...@nickallen.org>
Committed: Mon Aug 22 14:11:38 2016 -0400
----------------------------------------------------------------------
.../metron/profiler/stellar/DefaultStellarExecutor.java | 5 +++--
metron-analytics/pom.xml | 7 +++++++
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/71d644ed/metron-analytics/metron-profiler/src/main/java/org/apache/metron/profiler/stellar/DefaultStellarExecutor.java
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/src/main/java/org/apache/metron/profiler/stellar/DefaultStellarExecutor.java b/metron-analytics/metron-profiler/src/main/java/org/apache/metron/profiler/stellar/DefaultStellarExecutor.java
index d608222..a45e4a7 100644
--- a/metron-analytics/metron-profiler/src/main/java/org/apache/metron/profiler/stellar/DefaultStellarExecutor.java
+++ b/metron-analytics/metron-profiler/src/main/java/org/apache/metron/profiler/stellar/DefaultStellarExecutor.java
@@ -20,10 +20,11 @@
package org.apache.metron.profiler.stellar;
+import org.apache.metron.common.dsl.Context;
import org.apache.metron.common.dsl.MapVariableResolver;
import org.apache.metron.common.dsl.ParseException;
+import org.apache.metron.common.dsl.StellarFunctions;
import org.apache.metron.common.dsl.VariableResolver;
-import org.apache.metron.common.stellar.StellarPredicateProcessor;
import org.apache.metron.common.stellar.StellarProcessor;
import org.apache.metron.common.utils.ConversionUtils;
import org.json.simple.JSONObject;
@@ -108,7 +109,7 @@ public class DefaultStellarExecutor implements StellarExecutor, Serializable {
try {
VariableResolver resolver = new MapVariableResolver(state, msg);
StellarProcessor processor = new StellarProcessor();
- return processor.parse(expr, resolver);
+ return processor.parse(expr, resolver, StellarFunctions.FUNCTION_RESOLVER(), Context.EMPTY_CONTEXT());
} catch (ParseException e) {
throw new ParseException(String.format("Bad expression: expr=%s, msg=%s, state=%s", expr, msg, state));
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/71d644ed/metron-analytics/pom.xml
----------------------------------------------------------------------
diff --git a/metron-analytics/pom.xml b/metron-analytics/pom.xml
index 3b4f5bd..ca20912 100644
--- a/metron-analytics/pom.xml
+++ b/metron-analytics/pom.xml
@@ -115,5 +115,12 @@
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>sonatype.org</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
</project>