Index: xwiki-platform-core/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- xwiki-platform-core/pom.xml	(revision 74f9d7fb32db8d453932030814e06daed40fdbcf)
+++ xwiki-platform-core/pom.xml	(date 1526310123000)
@@ -263,6 +263,12 @@
                     "elementKind": "method",
                     "justification": "revapi bug"
                   },
+                  {
+                    "regex": true,
+                    "code": "java\.class\.removed",
+                    "package": "org\.xwiki\.query\.jpql\..*",
+                    "justification": "Classes moved to the internal package as they were not supposed to be public"
+                  },
 
                   // Add more ignores below...
                   {
Index: xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/src/main/java/org/xwiki/query/jpql/internal/JPQLParser.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/src/main/java/org/xwiki/query/jpql/internal/JPQLParser.java	(revision 74f9d7fb32db8d453932030814e06daed40fdbcf)
+++ xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/src/main/java/org/xwiki/query/jpql/internal/JPQLParser.java	(date 1526308890000)
@@ -22,14 +22,14 @@
 import java.io.PushbackReader;
 import java.io.StringReader;
 
-import org.xwiki.query.jpql.lexer.Lexer;
-import org.xwiki.query.jpql.node.Start;
-import org.xwiki.query.jpql.parser.Parser;
+import org.xwiki.query.internal.jpql.lexer.Lexer;
+import org.xwiki.query.internal.jpql.node.Start;
+import org.xwiki.query.internal.jpql.parser.Parser;
 
 /**
  * JPQL Parser.
  *
- * @version $Id$
+ * @version $Id: c25329ef2d547248b7408642a35cfdeb95566307 $
  */
 public class JPQLParser
 {
Index: xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/src/main/sablecc/JPQL.grammar
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/src/main/sablecc/JPQL.grammar	(revision 74f9d7fb32db8d453932030814e06daed40fdbcf)
+++ xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/src/main/sablecc/JPQL.grammar	(date 1526308796000)
@@ -3,7 +3,7 @@
  * Select statement.
  * @version $Id$
  */
-Package org.xwiki.query.jpql;
+Package org.xwiki.query.internal.jpql;
 
 Helpers
     white = ' ' | '\t' | '\n' | '\r';
Index: xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/pom.xml	(revision 74f9d7fb32db8d453932030814e06daed40fdbcf)
+++ xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/pom.xml	(date 1526309096000)
@@ -66,10 +66,10 @@
             <id>default</id>
             <configuration>
               <excludes>
-                org/xwiki/query/jpql/analysis/*.java,
-                org/xwiki/query/jpql/lexer/*.java,
-                org/xwiki/query/jpql/node/*.java,
-                org/xwiki/query/jpql/parser/*.java
+                org/xwiki/query/internal/jpql/analysis/*.java,
+                org/xwiki/query/internal/jpql/lexer/*.java,
+                org/xwiki/query/internal/jpql/node/*.java,
+                org/xwiki/query/internal/jpql/parser/*.java
               </excludes>
             </configuration>
           </execution>
Index: xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/hql/PropertyPrinter.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/hql/PropertyPrinter.java	(revision 74f9d7fb32db8d453932030814e06daed40fdbcf)
+++ xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/hql/PropertyPrinter.java	(date 1526309422000)
@@ -19,10 +19,10 @@
  */
 package org.xwiki.query.xwql.internal.hql;
 
-import org.xwiki.query.jpql.node.APath;
-import org.xwiki.query.jpql.node.PPath;
-import org.xwiki.query.jpql.node.PSelectExpression;
-import org.xwiki.query.jpql.node.TId;
+import org.xwiki.query.internal.jpql.node.APath;
+import org.xwiki.query.internal.jpql.node.PPath;
+import org.xwiki.query.internal.jpql.node.PSelectExpression;
+import org.xwiki.query.internal.jpql.node.TId;
 import org.xwiki.query.xwql.internal.QueryContext.PropertyInfo;
 
 public class PropertyPrinter
Index: xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/hql/TreePrinter.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/hql/TreePrinter.java	(revision 74f9d7fb32db8d453932030814e06daed40fdbcf)
+++ xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/hql/TreePrinter.java	(date 1526309379000)
@@ -19,8 +19,20 @@
  */
 package org.xwiki.query.xwql.internal.hql;
 
-import org.xwiki.query.jpql.analysis.DepthFirstAdapter;
-import org.xwiki.query.jpql.node.*;
+import org.xwiki.query.internal.jpql.analysis.DepthFirstAdapter;
+import org.xwiki.query.internal.jpql.node.ABrConditionalPrimary;
+import org.xwiki.query.internal.jpql.node.ACollectionMemberExpression;
+import org.xwiki.query.internal.jpql.node.AConditionalFactor;
+import org.xwiki.query.internal.jpql.node.AFromClause;
+import org.xwiki.query.internal.jpql.node.ARangeVariableDeclaration;
+import org.xwiki.query.internal.jpql.node.ASelectStatement;
+import org.xwiki.query.internal.jpql.node.ASingleConditionalExpression;
+import org.xwiki.query.internal.jpql.node.ASingleConditionalTerm;
+import org.xwiki.query.internal.jpql.node.AWhereClause;
+import org.xwiki.query.internal.jpql.node.Node;
+import org.xwiki.query.internal.jpql.node.TLbr;
+import org.xwiki.query.internal.jpql.node.TRbr;
+import org.xwiki.query.internal.jpql.node.Token;
 import org.xwiki.query.xwql.internal.QueryContext;
 
 public class TreePrinter extends DepthFirstAdapter
Index: xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/hql/XWQLtoHQLTranslator.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/hql/XWQLtoHQLTranslator.java	(revision 74f9d7fb32db8d453932030814e06daed40fdbcf)
+++ xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/hql/XWQLtoHQLTranslator.java	(date 1526309379000)
@@ -23,8 +23,8 @@
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import org.xwiki.query.internal.jpql.node.Start;
 import org.xwiki.query.jpql.internal.JPQLParser;
-import org.xwiki.query.jpql.node.Start;
 import org.xwiki.query.xwql.internal.QueryAnalyzer;
 import org.xwiki.query.xwql.internal.QueryContext;
 import org.xwiki.query.xwql.internal.QueryTranslator;
Index: xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/QueryAnalyzer.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/QueryAnalyzer.java	(revision 74f9d7fb32db8d453932030814e06daed40fdbcf)
+++ xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/QueryAnalyzer.java	(date 1526309422000)
@@ -20,16 +20,16 @@
 package org.xwiki.query.xwql.internal;
 
 import org.apache.commons.lang3.StringUtils;
-import org.xwiki.query.jpql.analysis.DepthFirstAdapter;
-import org.xwiki.query.jpql.node.AAbstractSchemaName;
-import org.xwiki.query.jpql.node.APath;
-import org.xwiki.query.jpql.node.ARangeVariableDeclaration;
-import org.xwiki.query.jpql.node.ASelectStatement;
-import org.xwiki.query.jpql.node.AXObjectDecl;
-import org.xwiki.query.jpql.node.AXPath;
+import org.xwiki.query.internal.jpql.analysis.DepthFirstAdapter;
+import org.xwiki.query.internal.jpql.node.AAbstractSchemaName;
+import org.xwiki.query.internal.jpql.node.APath;
+import org.xwiki.query.internal.jpql.node.ARangeVariableDeclaration;
+import org.xwiki.query.internal.jpql.node.ASelectStatement;
+import org.xwiki.query.internal.jpql.node.AXObjectDecl;
+import org.xwiki.query.internal.jpql.node.AXPath;
 
 /**
- * @version $Id$
+ * @version $Id: 9a36ab404c01c3c177fbbac562996da7c165b429 $
  * @since 2.4M2
  */
 public class QueryAnalyzer extends DepthFirstAdapter
Index: xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/QueryContext.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/QueryContext.java	(revision 74f9d7fb32db8d453932030814e06daed40fdbcf)
+++ xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/QueryContext.java	(date 1526309379000)
@@ -28,9 +28,9 @@
 import java.util.Set;
 
 import org.xwiki.bridge.DocumentAccessBridge;
-import org.xwiki.query.jpql.node.PPath;
-import org.xwiki.query.jpql.node.PXObjectDecl;
-import org.xwiki.query.jpql.node.Start;
+import org.xwiki.query.internal.jpql.node.PPath;
+import org.xwiki.query.internal.jpql.node.PXObjectDecl;
+import org.xwiki.query.internal.jpql.node.Start;
 
 /**
  * Contains information retrieved from query.