Skip to content

Commit

Permalink
Update ANTLR implementation to 3.5.3 (#2003)
Browse files Browse the repository at this point in the history 
Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
  • Loading branch information
@rfelcman
rfelcman committed Nov 21, 2023
1 parent f07abc2 commit b4e15e3
Show file tree
Hide file tree
Showing 106 changed files with 9,856 additions and 9,856 deletions.
4 changes: 2 additions & 2 deletions about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,14 @@ <h4><a name="ASM" id="ASM"></a>ASM v9.0.0</h4>
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.</p>
</blockquote>
<h4><a name="ANTLR" id="ANTLR"></a>ANTLR v3.5.2</h4>
<h4><a name="ANTLR" id="ANTLR"></a>ANTLR v3.5.3</h4>
<blockquote>
<p>The <a href="https://www.antlr3.org/">ANTLR library</a> (<a href="https://www.antlr3.org/license.html">license</a>)
is included within EclipseLink Project to enable parsing of the Java Persistence
Query language (JP QL). The ANTLR library is re-packaged within the project
in the org.eclipse.persistence.internal.libraries.antlr.* packages. </p>
<p>The source is available with the project's git repository. The binaries
are distributed within the eclipselink.jar and in the org.eclipse.persistence.antlr_3.5.2.v*.jar
are distributed within the eclipselink.jar and in the org.eclipse.persistence.antlr_3.5.3.v*.jar
bundle.</p>
</blockquote>
<h4><a name="JAXB" id="JAXB"></a>Java Architecture for XML Binding (JAXB) v2.3.2</h4>
Expand Down
4 changes: 2 additions & 2 deletions buildsystem/org.eclipse.persistence.parent/resource/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@ <h4><a name="ASM" id="ASM"></a>ASM v7.0.0</h4>
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.</p>
</blockquote>
<h4><a name="ANTLR" id="ANTLR"></a>ANTLR v3.5.2</h4>
<h4><a name="ANTLR" id="ANTLR"></a>ANTLR v3.5.3</h4>
<blockquote>
<p>The <a href="https://www.antlr3.org/">ANTLR library</a> (<a href="https://www.antlr3.org/license.html">license</a>)
is included within EclipseLink Project to enable parsing of the Java Persistence
Query language (JP QL). The ANTLR library is re-packaged within the project
in the org.eclipse.persistence.internal.libraries.antlr.* packages. </p>
<p>The source is available with the project's git repository. The binaries
are distributed within the eclipselink.jar and in the org.eclipse.persistence.antlr_3.5.2.v*.jar
are distributed within the eclipselink.jar and in the org.eclipse.persistence.antlr_3.5.3.v*.jar
bundle.</p>
</blockquote>
<h4><a name="JSON" id="JSON"></a>JSON Processing v1.1.5</h4>
Expand Down
2 changes: 1 addition & 1 deletion dbws/eclipselink.dbws.test.oracle/antbuild.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ javac.version=1.8
#
# Do not edit the properties below.
plugins.dir=../../plugins
eclipselink.depend=jakarta.ejb-api.jar, com.sun.mail.jakarta.mail.jar, javax.persistence_unsigned_for_testing_1.0.0.jar, org.eclipse.persistence.antlr_3.5.2.v201711011707.jar, org.eclipse.persistence.asm.jar, org.eclipse.persistence.core_2.0.0.qualifier.jar, org.eclipse.persistence.dbws_2.0.0.qualifier.jar, org.eclipse.persistence.jpa_2.0.0.qualifier.jar, org.eclipse.persistence.moxy_2.0.0.qualifier.jar, org.eclipse.persistence.oracle_2.0.0.qualifier.jar
eclipselink.depend=jakarta.ejb-api.jar, com.sun.mail.jakarta.mail.jar, javax.persistence_unsigned_for_testing_1.0.0.jar, org.eclipse.persistence.antlr_3.5.3.v202311210849.jar, org.eclipse.persistence.asm.jar, org.eclipse.persistence.core_2.0.0.qualifier.jar, org.eclipse.persistence.dbws_2.0.0.qualifier.jar, org.eclipse.persistence.jpa_2.0.0.qualifier.jar, org.eclipse.persistence.moxy_2.0.0.qualifier.jar, org.eclipse.persistence.oracle_2.0.0.qualifier.jar
eclipselink.dbws.oracle.test.jar=eclipselink-dbws-oracle-tests.jar
#
classes.dir=classes
Expand Down
2 changes: 1 addition & 1 deletion foundation/eclipselink.core.test/antbuild.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ transaction.jar=jakarta.transaction-api.jar
coretest.framework.jar=eclipselink-coretest-framework.jar
core.test.jar=eclipselink-core-tests.jar
asm.jar=org.eclipse.persistence.asm.jar
antlr.jar=org.eclipse.persistence.antlr_3.5.2.v201711011707.jar
antlr.jar=org.eclipse.persistence.antlr_3.5.3.v202311210849.jar

#JaCoCo
jacocoagent.jar=jacocoagent.jar
Expand Down
2 changes: 1 addition & 1 deletion foundation/org.eclipse.persistence.core/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ Export-Package: org.eclipse.persistence;version="2.7.14",
Bundle-ClassPath: .
HK2-Bundle-Name: org.eclipse.persistence:org.eclipse.persistence.core
Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version>=1.8))"
Require-Bundle: org.eclipse.persistence.antlr;bundle-version="3.5.2";resolution:=optional,
Require-Bundle: org.eclipse.persistence.antlr;bundle-version="3.5.3";resolution:=optional,
org.eclipse.persistence.asm;bundle-version="9.6.0";resolution:=optional
Bundle-SymbolicName: org.eclipse.persistence.core
Eclipse-ExtensibleAPI: true
Expand Down
2 changes: 1 addition & 1 deletion ...se.persistence.core/src/org/eclipse/persistence/internal/jpa/parsing/jpql/JPQLParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public JPQLParser(TokenStream input, RecognizerSharedState state) {
* Returns the ANTLR version currently used.
*/
public static String ANTLRVersion() throws Exception {
return "3.5.2";
return "3.5.3";
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...e.core/src/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLParserBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@

/*****************************************************************
* EJBQLParserBuilder constructs the parser for EJBQL.
* This is specific to ANTLR version 3.5.2
* This is specific to ANTLR version 3.5.3
*****************************************************************
*/
public class JPQLParserBuilder {

/**
* INTERNAL
* Build a parser for the passed ejbql string, for ANTLR version 3.5.2
* Build a parser for the passed ejbql string, for ANTLR version 3.5.3
*/
public static JPQLParser buildParser(String queryText) {

Expand Down
2 changes: 1 addition & 1 deletion jpa/eclipselink.jpa.test.jse/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence_2.2.3.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence-source_2.2.3.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.validation-api.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.transaction-api.jar" />
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr_3.5.2.v201711011707.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr.source_3.5.2.v201711011707.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr_3.5.3.v202311210849.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr.source_3.5.3.v202311210849.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm_9.0.0.v202010211629.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm.source_9.0.0.v202010211629.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.jpa.modelgen"/>
<classpathentry kind="output" path="classes"/>
Expand Down
2 changes: 1 addition & 1 deletion jpa/eclipselink.jpa.test/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.validation-api.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.ejb-api.jar" sourcepath="/ECLIPSELINK_HOME/plugins/javax.ejb/src"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.transaction-api.jar" />
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr_3.5.2.v201711011707.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr.source_3.5.2.v201711011707.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr_3.5.3.v202311210849.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr.source_3.5.3.v202311210849.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.inject.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
2 changes: 1 addition & 1 deletion jpa/eclipselink.jpa.wdf.test/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence_2.2.3.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/jakarta.persistence-source_2.2.3.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.ejb-api.jar" sourcepath="/ECLIPSELINK_HOME/plugins/javax.ejb/src"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.transaction-api.jar" />
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr_3.5.2.v201711011707.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr.source_3.5.2.v201711011707.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr_3.5.3.v202311210849.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr.source_3.5.3.v202311210849.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
2 changes: 1 addition & 1 deletion jpa/eclipselink.jpars.test/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.ws.rs-api.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jakarta.ejb-api.jar" sourcepath="/ECLIPSELINK_HOME/plugins/javax.ejb/src"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm_9.0.0.v202010211629.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm.source_9.0.0.v202010211629.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr_3.5.2.v201711011707.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr.source_3.5.2.v201711011707.jar"/>
<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr_3.5.3.v202311210849.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr.source_3.5.3.v202311210849.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="owner.project.facets" value="java"/>
Expand Down
Binary file removed plugins/org.eclipse.persistence.antlr.source_3.5.2.v201711011707.jar
View file
Binary file not shown.
Binary file added plugins/org.eclipse.persistence.antlr.source_3.5.3.v202311210849.jar
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions plugins/org.eclipse.persistence.antlr/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Manifest-Version: 1.0
Automatic-Module-Name: eclipselink.antlr
Export-Package: org.eclipse.persistence.internal.libraries.antlr.runtime;version="3.5.2",
org.eclipse.persistence.internal.libraries.antlr.runtime.debug;version="3.5.2",
org.eclipse.persistence.internal.libraries.antlr.runtime.misc;version="3.5.2",
org.eclipse.persistence.internal.libraries.antlr.runtime.tree;version="3.5.2"
Implementation-Version: 3.5.2.qualifier
Export-Package: org.eclipse.persistence.internal.libraries.antlr.runtime;version="3.5.3",
org.eclipse.persistence.internal.libraries.antlr.runtime.debug;version="3.5.3",
org.eclipse.persistence.internal.libraries.antlr.runtime.misc;version="3.5.3",
org.eclipse.persistence.internal.libraries.antlr.runtime.tree;version="3.5.3"
Implementation-Version: 3.5.3.v202311210849
Bundle-Name: EclipseLink ANTLR
Created-By: 1.6.0_21 (Sun Microsystems Inc.)
Created-By: 21 (Oracle Corporation)
HK2-Bundle-Name: org.eclipse.persistence:org.eclipse.persistence.antlr
Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version>=1.7))"
Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version>=1.8))"
Implementation-Vendor: Eclipse.org - EclipseLink Project
Bundle-Vendor: Eclipse.org - EclipseLink Project
Bundle-Version: 3.5.2.qualifier
Bundle-Version: 3.5.3.v202311210849
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.persistence.antlr

8 changes: 4 additions & 4 deletions plugins/org.eclipse.persistence.antlr/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About ANTLR 3.5.2</title>
<title>About ANTLR 3.5.3</title>
</head>
<body lang="EN-US">
<h1>ANTLR 3.5.2</h1>
<h1>ANTLR 3.5.3</h1>

<h2>License </h2>
<p>
Expand Down Expand Up @@ -35,14 +35,14 @@ <h2>Third Party Content</h2>
from the Eclipse Foundation, the following is provided for
informational purposes only, and you should look to the
Redistributor&#8217;s license for terms and conditions of use.</p>
<h3><a name="ANTLR" id="ANTLR"></a>ANTLR v3.5.2</h3>
<h3><a name="ANTLR" id="ANTLR"></a>ANTLR v3.5.3</h3>
<blockquote>
<p>The <a href="https://www.antlr3.org/">ANTLR library</a> (<a href="https://www.antlr3.org/license.html">license</a>)
is included within EclipseLink Project to enable parsing of the Java Persistence
Query language (JP QL). The ANTLR library is re-packaged within the project
in the org.eclipse.persistence.internal.libraries.antlr.* packages. </p>
<p>The source is available with the project's git repository. The binaries
are distributed within the eclipselink.jar and in the org.eclipse.persistence.antlr_3.5.2.v*.jar
are distributed within the eclipselink.jar and in the org.eclipse.persistence.antlr_3.5.3.v*.jar
bundle.</p>
</blockquote>
<p></p>
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.eclipse.persistence.antlr/antbuild.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

<!-- Properties usually defined in build.properties, set here to avoid easy redefinition. -->
<!-- Version properties -->
<property name="release.version" value="3.5.2"/>
<property name="release.version" value="3.5.3"/>
<!-- Project infrastructure properties -->
<property name="src.dir" value="src"/>
<property name="classes.dir" value="bin"/>
Expand Down Expand Up @@ -122,7 +122,7 @@
<!-- remove stored classes for recompile -->
<delete dir="${antlr.classes.dir}/org" includeEmptyDirs="true" failonerror="false" quiet="true"/>
<mkdir dir="${antlr.classes.dir}/org"/>
<property name="javac.version" value="1.7"/>
<property name="javac.version" value="1.8"/>
<javac srcdir="${src.dir}"
destdir="${antlr.classes.dir}"
includes="org/eclipse/persistence/**/*.java"
Expand Down
Binary file modified plugins/org.eclipse.persistence.antlr/extra-src.zip
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions plugins/org.eclipse.persistence.antlr/readme.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<HTML xmlns="http://www.w3.org/1999/xhtml">
<HEAD>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<TITLE>Antlr 3.5.2 Readme</TITLE>
<TITLE>Antlr 3.5.3 Readme</TITLE>
</HEAD>
<BODY>
<DIV class=Section0>

<P style="TEXT-ALIGN: center" align=center><B>ANTLR 3.5.2 Read Me</B> </P>
<P style="TEXT-ALIGN: center" align=center><B>ANTLR 3.5.3 Read Me</B> </P>
<p>The <a href="https://www.antlr3.org/">ANTLR library</a> (<a href="https://www.antlr3.org/license.html">license</a>)
is included within <A href="http://www.eclipse.org/eclipselink">EclipseLink Project</A> to enable parsing of the Java Persistence
Query language (JP QL). The ANTLR library is re-packaged within the project
in the org.eclipse.persistence.internal.libraries.antlr.* packages. </p>
<p>The source code is available within the project's git repository.
The binaries are distributed within the eclipselink.jar and in the
org.eclipse.persistence.antlr_3.5.2.v*.jar bundle. </p>
org.eclipse.persistence.antlr_3.5.3.v*.jar bundle. </p>
</BODY></HTML>
74 changes: 37 additions & 37 deletions ...e.antlr/src/org/eclipse/persistence/internal/libraries/antlr/runtime/ANTLRFileStream.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,47 +33,47 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* all at once when you construct the object. This looks very
* much like an ANTLReader or ANTLRInputStream, but it's a special case
* since we know the exact size of the object to load. We can avoid lots
* of data copying.
* of data copying.
*/
public class ANTLRFileStream extends ANTLRStringStream {
protected String fileName;
protected String fileName;

public ANTLRFileStream(String fileName) throws IOException {
this(fileName, null);
}
public ANTLRFileStream(String fileName) throws IOException {
this(fileName, null);
}

public ANTLRFileStream(String fileName, String encoding) throws IOException {
this.fileName = fileName;
load(fileName, encoding);
}
public ANTLRFileStream(String fileName, String encoding) throws IOException {
this.fileName = fileName;
load(fileName, encoding);
}

public void load(String fileName, String encoding)
throws IOException
{
if ( fileName==null ) {
return;
}
File f = new File(fileName);
int size = (int)f.length();
InputStreamReader isr;
FileInputStream fis = new FileInputStream(fileName);
if ( encoding!=null ) {
isr = new InputStreamReader(fis, encoding);
}
else {
isr = new InputStreamReader(fis);
}
try {
data = new char[size];
super.n = isr.read(data);
}
finally {
isr.close();
}
}
public void load(String fileName, String encoding)
throws IOException
{
if ( fileName==null ) {
return;
}
File f = new File(fileName);
int size = (int)f.length();
InputStreamReader isr;
FileInputStream fis = new FileInputStream(fileName);
if ( encoding!=null ) {
isr = new InputStreamReader(fis, encoding);
}
else {
isr = new InputStreamReader(fis);
}
try {
data = new char[size];
super.n = isr.read(data);
}
finally {
isr.close();
}
}

@Override
public String getSourceName() {
return fileName;
}
@Override
public String getSourceName() {
return fileName;
}
}
58 changes: 29 additions & 29 deletions ....antlr/src/org/eclipse/persistence/internal/libraries/antlr/runtime/ANTLRInputStream.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,38 +33,38 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* Useful for reading from stdin and specifying file encodings etc...
*/
public class ANTLRInputStream extends ANTLRReaderStream {
public ANTLRInputStream() {
}
public ANTLRInputStream() {
}

public ANTLRInputStream(InputStream input) throws IOException {
this(input, null);
}
public ANTLRInputStream(InputStream input) throws IOException {
this(input, null);
}

public ANTLRInputStream(InputStream input, int size) throws IOException {
this(input, size, null);
}
public ANTLRInputStream(InputStream input, int size) throws IOException {
this(input, size, null);
}

public ANTLRInputStream(InputStream input, String encoding) throws IOException {
this(input, INITIAL_BUFFER_SIZE, encoding);
}
public ANTLRInputStream(InputStream input, String encoding) throws IOException {
this(input, INITIAL_BUFFER_SIZE, encoding);
}

public ANTLRInputStream(InputStream input, int size, String encoding) throws IOException {
this(input, size, READ_BUFFER_SIZE, encoding);
}
public ANTLRInputStream(InputStream input, int size, String encoding) throws IOException {
this(input, size, READ_BUFFER_SIZE, encoding);
}

public ANTLRInputStream(InputStream input,
int size,
int readBufferSize,
String encoding)
throws IOException
{
InputStreamReader isr;
if ( encoding!=null ) {
isr = new InputStreamReader(input, encoding);
}
else {
isr = new InputStreamReader(input);
}
load(isr, size, readBufferSize);
}
public ANTLRInputStream(InputStream input,
int size,
int readBufferSize,
String encoding)
throws IOException
{
InputStreamReader isr;
if ( encoding!=null ) {
isr = new InputStreamReader(input, encoding);
}
else {
isr = new InputStreamReader(input);
}
load(isr, size, readBufferSize);
}
}

0 comments on commit b4e15e3

Please sign in to comment.