This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new bf0b958 Upgrade antlr4 from 4.5.3 to 4.7.2
bf0b958 is described below
commit bf0b9584e13e678d564ceddd43140d7c0fee4984
Author: Jose Contreras <[email protected]>
AuthorDate: Thu Nov 21 19:56:10 2019 -0600
Upgrade antlr4 from 4.5.3 to 4.7.2
Closes: #1664
---
ide/libs.antlr4.runtime/build.xml | 2 +-
...untime-4.5.3-license.txt => antlr4-runtime-4.7.2-license.txt} | 6 +++---
ide/libs.antlr4.runtime/external/binaries-list | 2 +-
ide/libs.antlr4.runtime/nbproject/project.properties | 9 +++++----
ide/libs.antlr4.runtime/nbproject/project.xml | 4 ++--
...-runtime-4.7-license.txt => antlr4-runtime-4.7.2-license.txt} | 6 +++---
java/debugger.jpda.truffle/external/binaries-list | 2 +-
java/debugger.jpda.truffle/nbproject/project.properties | 2 +-
nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 3 +++
nbbuild/licenses/BSD-antlr-runtime4 | 2 +-
10 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/ide/libs.antlr4.runtime/build.xml
b/ide/libs.antlr4.runtime/build.xml
index baaab64..bc2414a 100644
--- a/ide/libs.antlr4.runtime/build.xml
+++ b/ide/libs.antlr4.runtime/build.xml
@@ -24,6 +24,6 @@
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="ide/libs.antlr4.runtime" default="build" basedir=".">
- <description>Builds, tests, and runs the lib antlr 4.5
runtime.</description>
+ <description>Builds, tests, and runs the lib antlr 4.7.2
runtime.</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/ide/libs.antlr4.runtime/external/antlr4-runtime-4.5.3-license.txt
b/ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2-license.txt
similarity index 93%
rename from ide/libs.antlr4.runtime/external/antlr4-runtime-4.5.3-license.txt
rename to ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2-license.txt
index 0d4514e..4dbaf42 100644
--- a/ide/libs.antlr4.runtime/external/antlr4-runtime-4.5.3-license.txt
+++ b/ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2-license.txt
@@ -1,11 +1,11 @@
Name: Antlr
Description: ANother Tool for Language Recognition, is a language tool that
provides a framework for constructing recognizers, interpreters, compilers, and
translators from grammatical descriptions.
-Version: 4.5.3
+Version: 4.7.2
License: BSD-antlr-runtime4
Origin: Antlr
-URL: http://www.antlr.org
+URL: https://www.antlr.org
-Use of Antlr version 4.5 is governed by the terms of the license below:
+Use of Antlr version 4.7.2 is governed by the terms of the license below:
[The "BSD license"]
Copyright (c) 2015 Terence Parr, Sam Harwell
diff --git a/ide/libs.antlr4.runtime/external/binaries-list
b/ide/libs.antlr4.runtime/external/binaries-list
index 619e640..3b4b24c 100644
--- a/ide/libs.antlr4.runtime/external/binaries-list
+++ b/ide/libs.antlr4.runtime/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-2609E36F18F7E8D593CC1CDDFB2AC776DC96B8E0 org.antlr:antlr4-runtime:4.5.3
+E27D8AB4F984F9D186F54DA984A6AB1CCCAC755E org.antlr:antlr4-runtime:4.7.2
diff --git a/ide/libs.antlr4.runtime/nbproject/project.properties
b/ide/libs.antlr4.runtime/nbproject/project.properties
index c418516..3fed821 100644
--- a/ide/libs.antlr4.runtime/nbproject/project.properties
+++ b/ide/libs.antlr4.runtime/nbproject/project.properties
@@ -17,10 +17,11 @@
is.autoload=true
-javac.source=1.6
-release.external/antlr4-runtime-4.5.3.jar=modules/ext/antlr4-runtime-4.5.3.jar
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
+release.external/antlr4-runtime-4.7.2.jar=modules/ext/antlr4-runtime-4.7.2.jar
-license.file=../external/antlr4-runtime-4.5.3-license.txt
-nbm.homepage=http://www.antlr.org/
+license.file=../external/antlr4-runtime-4.7.2-license.txt
+nbm.homepage=https://www.antlr.org/
sigtest.gen.fail.on.error=false
spec.version.base=1.8.0
diff --git a/ide/libs.antlr4.runtime/nbproject/project.xml
b/ide/libs.antlr4.runtime/nbproject/project.xml
index c349afa..64e4eb6 100644
--- a/ide/libs.antlr4.runtime/nbproject/project.xml
+++ b/ide/libs.antlr4.runtime/nbproject/project.xml
@@ -33,8 +33,8 @@
<package>org.antlr.v4.runtime.tree</package>
</public-packages>
<class-path-extension>
-
<runtime-relative-path>ext/antlr4-runtime-4.5.3.jar</runtime-relative-path>
-
<binary-origin>external/antlr4-runtime-4.5.3.jar</binary-origin>
+
<runtime-relative-path>ext/antlr4-runtime-4.7.2.jar</runtime-relative-path>
+
<binary-origin>external/antlr4-runtime-4.7.2.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/java/debugger.jpda.truffle/external/antlr4-runtime-4.7-license.txt
b/java/debugger.jpda.truffle/external/antlr4-runtime-4.7.2-license.txt
similarity index 93%
rename from java/debugger.jpda.truffle/external/antlr4-runtime-4.7-license.txt
rename to java/debugger.jpda.truffle/external/antlr4-runtime-4.7.2-license.txt
index a760321..4dbaf42 100644
--- a/java/debugger.jpda.truffle/external/antlr4-runtime-4.7-license.txt
+++ b/java/debugger.jpda.truffle/external/antlr4-runtime-4.7.2-license.txt
@@ -1,11 +1,11 @@
Name: Antlr
Description: ANother Tool for Language Recognition, is a language tool that
provides a framework for constructing recognizers, interpreters, compilers, and
translators from grammatical descriptions.
-Version: 4.7
+Version: 4.7.2
License: BSD-antlr-runtime4
Origin: Antlr
-URL: http://www.antlr.org
+URL: https://www.antlr.org
-Use of Antlr version 4.5 is governed by the terms of the license below:
+Use of Antlr version 4.7.2 is governed by the terms of the license below:
[The "BSD license"]
Copyright (c) 2015 Terence Parr, Sam Harwell
diff --git a/java/debugger.jpda.truffle/external/binaries-list
b/java/debugger.jpda.truffle/external/binaries-list
index baca4fe..d294e1b 100644
--- a/java/debugger.jpda.truffle/external/binaries-list
+++ b/java/debugger.jpda.truffle/external/binaries-list
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
93A352D21C1D95061BDFE5C86A91F946F3A3E605
com.oracle.truffle:truffle-sl:1.0.0-rc6
-30B13B7EFC55B7FEEA667691509CF59902375001 org.antlr:antlr4-runtime:4.7
+E27D8AB4F984F9D186F54DA984A6AB1CCCAC755E org.antlr:antlr4-runtime:4.7.2
diff --git a/java/debugger.jpda.truffle/nbproject/project.properties
b/java/debugger.jpda.truffle/nbproject/project.properties
index 243b1e1..369d6b4 100644
--- a/java/debugger.jpda.truffle/nbproject/project.properties
+++ b/java/debugger.jpda.truffle/nbproject/project.properties
@@ -21,7 +21,7 @@ javadoc.arch=${basedir}/arch.xml
nbm.module.author=Martin Entlicher
requires.nb.javac=true
truffle-backend.cp.extra=external/graal-sdk-1.0.0-rc6.jar:external/truffle-api-1.0.0-rc6.jar
-truffle.sl=external/antlr4-runtime-4.7.jar:external/truffle-sl-1.0.0-rc6.jar
+truffle.sl=external/antlr4-runtime-4.7.2.jar:external/truffle-sl-1.0.0-rc6.jar
cp.extra=${tools.jar}:${truffle-backend.cp.extra}:${truffle.sl}
test-unit-sys-prop.test.dir.src=${basedir}/test/unit/src/
test-unit-sys-prop.netbeans.user=${basedir}/work/nb_user_dir
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index b185428..075bd9d 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -80,6 +80,9 @@
ide/lsp.client/external/org.eclipse.xtext.xbase.lib-2.14.0.jar java/java.lsp.ser
ide/db/external/derby-10.14.2.0.jar
ide/db.metadata.model/external/derby-10.14.2.0.jar
ide/derby/external/derby-10.14.2.0.jar
ide/db.metadata.model/external/derby-10.14.2.0.jar
+# Antlr4 is used internally in two unrelated modules:
+ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2.jar
java/debugger.jpda.truffle/external/antlr4-runtime-4.7.2.jar
+
# Amazon Beanstalk SDK has frequently changing dependencies, so they are
better kept separate
enterprise/libs.amazon/external/httpclient-4.5.5.jar
groovy/gradle/external/gradle-4.10.2-bin.zip
enterprise/libs.amazon/external/ion-java-1.0.2.jar
groovy/gradle/external/gradle-4.10.2-bin.zip
diff --git a/nbbuild/licenses/BSD-antlr-runtime4
b/nbbuild/licenses/BSD-antlr-runtime4
index 43f0c6c..c980add 100644
--- a/nbbuild/licenses/BSD-antlr-runtime4
+++ b/nbbuild/licenses/BSD-antlr-runtime4
@@ -1,4 +1,4 @@
-Use of Antlr version 4.5 is governed by the terms of the license below:
+Use of Antlr version 4.7.2 is governed by the terms of the license below:
[The "BSD license"]
Copyright (c) 2015 Terence Parr, Sam Harwell
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
