This is an automated email from the ASF dual-hosted git repository.
mbien 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 59e6394590 Use antlr runtimes from ide.libs (like go.grammar) instead
of downloading again.
new 9a07595c99 Merge pull request #5804 from pepness/antlr-4.11.1
59e6394590 is described below
commit 59e6394590cfbcf7bc59ba21447ce8cb99be71d0
Author: José Contreras <pepn...@apache.org>
AuthorDate: Sat Apr 8 15:25:28 2023 -0600
Use antlr runtimes from ide.libs (like go.grammar) instead of
downloading again.
---
ide/libs.antlr4.runtime/build.xml | 2 +-
.../netbeans/libs/antlr4/runtime/Bundle.properties | 4 +--
rust/rust.grammar/build.xml | 5 ++-
.../external/antlr-runtime-3.5.3-license.txt | 36 --------------------
.../external/antlr4-runtime-4.11.1-license.txt | 39 ----------------------
rust/rust.grammar/external/binaries-list | 23 -------------
.../org/netbeans/modules/rust/grammar/layer.xml | 3 +-
7 files changed, 6 insertions(+), 106 deletions(-)
diff --git a/ide/libs.antlr4.runtime/build.xml
b/ide/libs.antlr4.runtime/build.xml
index bc2414a21c..af33de48b2 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.7.2
runtime.</description>
+ <description>Builds, tests, and runs the lib antlr 4.11.1
runtime.</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git
a/ide/libs.antlr4.runtime/src/org/netbeans/libs/antlr4/runtime/Bundle.properties
b/ide/libs.antlr4.runtime/src/org/netbeans/libs/antlr4/runtime/Bundle.properties
index 5c0cc8b4bc..02a09674e6 100644
---
a/ide/libs.antlr4.runtime/src/org/netbeans/libs/antlr4/runtime/Bundle.properties
+++
b/ide/libs.antlr4.runtime/src/org/netbeans/libs/antlr4/runtime/Bundle.properties
@@ -18,7 +18,5 @@
OpenIDE-Module-Name=Antlr 4 Runtime
OpenIDE-Module-Short-Description=Antlr Runtime Libraries
-OpenIDE-Module-Long-Description=Contains Antlr 4.7.2 runtime libraries
+OpenIDE-Module-Long-Description=Contains Antlr 4.11.1 runtime libraries
OpenIDE-Module-Display-Category=Libraries
-
-
diff --git a/rust/rust.grammar/build.xml b/rust/rust.grammar/build.xml
index c4460006aa..1fd914dc7f 100644
--- a/rust/rust.grammar/build.xml
+++ b/rust/rust.grammar/build.xml
@@ -25,9 +25,8 @@
<!-- Antlr Tool classpath -->
<path id="antlr.path">
- <fileset dir="external">
- <include name="**/*.jar" />
- </fileset>
+ <fileset dir="../../ide/libs.antlr4.runtime/external"
includes="*.jar"/>
+ <fileset dir="../../ide/libs.antlr3.runtime/external"
includes="antlr-runtime-*.jar"/>
</path>
<!-- Prepares Antlr variables -->
diff --git a/rust/rust.grammar/external/antlr-runtime-3.5.3-license.txt
b/rust/rust.grammar/external/antlr-runtime-3.5.3-license.txt
deleted file mode 100644
index 0c40a9a38a..0000000000
--- a/rust/rust.grammar/external/antlr-runtime-3.5.3-license.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Name: Antlr 3
-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: 3.5.3
-License: BSD-antlr-runtime3
-Origin: Antlr
-URL: https://www.antlr3.org/license.html
-Files: antlr-runtime-3.5.3.jar
-
- [The "BSD license"]
- Copyright (c) 2010 Terence Parr
- Maven Plugin - Copyright (c) 2009 Jim Idle
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/rust/rust.grammar/external/antlr4-runtime-4.11.1-license.txt
b/rust/rust.grammar/external/antlr4-runtime-4.11.1-license.txt
deleted file mode 100644
index 842d642aa9..0000000000
--- a/rust/rust.grammar/external/antlr4-runtime-4.11.1-license.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-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.11.1
-License: BSD-antlr-runtime4-2
-Origin: Antlr
-URL: https://www.antlr.org
-Files: antlr4-runtime-4.11.1.jar, antlr4-4.11.1.jar, ST4-4.3.4.jar
-
-Use of Antlr version 4.11.1 is governed by the terms of the license below:
-
- [The "BSD license"]
-Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. Neither name of copyright holders nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/rust/rust.grammar/external/binaries-list
b/rust/rust.grammar/external/binaries-list
deleted file mode 100644
index 1b7c6ca080..0000000000
--- a/rust/rust.grammar/external/binaries-list
+++ /dev/null
@@ -1,23 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# The full antlr4 binary, as a build-time dependency (se use it to generate
code from the grammar)
-844C603E04AB201B769849EE9D3CCE67BA7A1337 org.antlr:antlr4:4.11.1
-069214C1DE1960040729702EB58DEAC8827135E7 org.antlr:antlr4-runtime:4.11.1
-9011FB189C5ED6D99E5F3322514848D1EC1E1416 org.antlr:antlr-runtime:3.5.3
-BF68D049DD4E6E104055A79AC3BF9E6307D29258 org.antlr:ST4:4.3.4
-
diff --git a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/layer.xml
b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/layer.xml
index 3250f441ca..0fb1e98858 100644
--- a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/layer.xml
+++ b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/layer.xml
@@ -48,7 +48,8 @@
<folder name="Defaults">
<file
name="org-netbeans-modules-rust-grammar-resources-token-colorings_2.xml"
url="resources/citylights.xml"/>
</folder>
- </folder> </folder>
+ </folder>
+ </folder>
</folder>
</folder>
</folder>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
