You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2016/10/15 21:42:52 UTC
asterixdb git commit: reduce xerces dependency
Repository: asterixdb
Updated Branches:
refs/heads/master fb7d05bb8 -> e9b2adf94
reduce xerces dependency
Change-Id: If7401abf4d7c460fd53174198d7ba9147ed83f67
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1293
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Michael Blow <mb...@apache.org>
Tested-by: Michael Blow <mb...@apache.org>
Reviewed-by: Yingyi Bu <bu...@gmail.com>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/e9b2adf9
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/e9b2adf9
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/e9b2adf9
Branch: refs/heads/master
Commit: e9b2adf94904378c11dbe3dd864ba724a8399ab7
Parents: fb7d05b
Author: Till Westmann <ti...@apache.org>
Authored: Sat Oct 15 12:39:01 2016 -0700
Committer: Michael Blow <mb...@apache.org>
Committed: Sat Oct 15 14:42:26 2016 -0700
----------------------------------------------------------------------
asterixdb/asterix-lang-aql/pom.xml | 4 ----
asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj | 4 ++--
asterixdb/asterix-lang-sqlpp/pom.xml | 4 ----
asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 4 ++--
asterixdb/asterix-yarn/pom.xml | 5 +++++
5 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e9b2adf9/asterixdb/asterix-lang-aql/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-aql/pom.xml b/asterixdb/asterix-lang-aql/pom.xml
index 188436e..b80c232 100644
--- a/asterixdb/asterix-lang-aql/pom.xml
+++ b/asterixdb/asterix-lang-aql/pom.xml
@@ -128,10 +128,6 @@
<artifactId>asterix-lang-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e9b2adf9/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj b/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
index 0a9079d..d17861e 100644
--- a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
+++ b/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
@@ -11,7 +11,7 @@ PARSER_BEGIN(AQLParser)
package org.apache.asterix.lang.aql.parser;
// For AQLParserTokenManager
-import org.apache.xerces.util.IntStack;
+import java.util.ArrayDeque;
import java.io.BufferedReader;
import java.io.File;
@@ -2563,7 +2563,7 @@ QuantifiedExpression QuantifiedExpression()throws ParseException:
TOKEN_MGR_DECLS:
{
public int commentDepth = 0;
- public IntStack lexerStateStack = new IntStack();
+ public ArrayDeque<Integer> lexerStateStack = new ArrayDeque<Integer>();
public void pushState() {
lexerStateStack.push( curLexState );
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e9b2adf9/asterixdb/asterix-lang-sqlpp/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/pom.xml b/asterixdb/asterix-lang-sqlpp/pom.xml
index a821c1c..bce61d5 100644
--- a/asterixdb/asterix-lang-sqlpp/pom.xml
+++ b/asterixdb/asterix-lang-sqlpp/pom.xml
@@ -125,10 +125,6 @@
<artifactId>asterix-lang-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e9b2adf9/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
index f113894..bcbdd26 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
+++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
@@ -11,7 +11,7 @@ PARSER_BEGIN(SQLPPParser)
package org.apache.asterix.lang.sqlpp.parser;
// For SQL++ ParserTokenManager
-import org.apache.xerces.util.IntStack;
+import java.util.ArrayDeque;
import java.io.BufferedReader;
import java.io.File;
@@ -3024,7 +3024,7 @@ LetClause WithElement() throws ParseException:
TOKEN_MGR_DECLS:
{
public int commentDepth = 0;
- public IntStack lexerStateStack = new IntStack();
+ public ArrayDeque<Integer> lexerStateStack = new ArrayDeque<Integer>();
public void pushState() {
lexerStateStack.push( curLexState );
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e9b2adf9/asterixdb/asterix-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml
index 79b9822..720353d 100644
--- a/asterixdb/asterix-yarn/pom.xml
+++ b/asterixdb/asterix-yarn/pom.xml
@@ -233,6 +233,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop.version}</version>