diff --git a/oap-formats/oap-logstream/oap-logstream/pom.xml b/oap-formats/oap-logstream/oap-logstream/pom.xml
index 352d8d1d8..0c16bbe30 100644
--- a/oap-formats/oap-logstream/oap-logstream/pom.xml
+++ b/oap-formats/oap-logstream/oap-logstream/pom.xml
@@ -123,7 +123,7 @@
org.antlr
- ST4
+ stringtemplate
${oap.deps.stringtemplate.version}
diff --git a/oap-formats/oap-logstream/pom.xml b/oap-formats/oap-logstream/pom.xml
index 965d5d8fb..257b2a2b1 100644
--- a/oap-formats/oap-logstream/pom.xml
+++ b/oap-formats/oap-logstream/pom.xml
@@ -14,7 +14,7 @@
oap-logstream-parent
- 4.3.4
+ 4.0.2
1.13.1
diff --git a/oap-formats/oap-template/src/main/antlr4/TemplateGrammarExpression.g4 b/oap-formats/oap-template/src/main/antlr4/TemplateGrammarExpression.g4
index bbf7e0186..08304b901 100644
--- a/oap-formats/oap-template/src/main/antlr4/TemplateGrammarExpression.g4
+++ b/oap-formats/oap-template/src/main/antlr4/TemplateGrammarExpression.g4
@@ -86,7 +86,7 @@ exprs returns [Exprs ret = new Exprs()]
: DOT expr { $ret.exprs.add( $expr.ret ); }
math? { if( $math.ctx != null ) $ret.math = $math.ret; }
| DOT expr { $ret.exprs.add( $expr.ret ); }
- PIPE concatenation { $ret.concatenation =$concatenation.ret; }
+ DOT? concatenation { $ret.concatenation =$concatenation.ret; }
| DOT expr { $ret.exprs.add( $expr.ret ); }
(DOT expr {
$ret.exprs.add( $expr.ret );
@@ -96,7 +96,7 @@ exprs returns [Exprs ret = new Exprs()]
| DOT expr { $ret.exprs.add( $expr.ret ); }
(DOT expr { $ret.exprs.add( $expr.ret ); })*
DOT expr { $ret.exprs.add( $expr.ret ); }
- PIPE concatenation { $ret.concatenation = $concatenation.ret; }
+ DOT? concatenation { $ret.concatenation = $concatenation.ret; }
math? { if( $math.ctx != null ) $ret.math = $math.ret; }
| concatenation { $ret.concatenation = $concatenation.ret; }
;
@@ -107,7 +107,7 @@ expr returns [Expr ret]
;
concatenation returns [Concatenation ret]
- : START_CONCATENATION citems { $ret = new Concatenation( $citems.ret ); } CRBRACE
+ : LBRACE citems { $ret = new Concatenation( $citems.ret ); } RBRACE
;
citems returns [ArrayList