This is an automated email from the ASF dual-hosted git repository. jlahoda 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 a89a4c5 [NETBEANS-2467] Using the correct jcodings dependency to avoid touch nonexisting field. a89a4c5 is described below commit a89a4c5981139089e734f4d81b614a4e7398f53c Author: Jan Lahoda <jlah...@netbeans.org> AuthorDate: Sun May 12 06:59:03 2019 +0200 [NETBEANS-2467] Using the correct jcodings dependency to avoid touch nonexisting field. --- ide/textmate.lexer/external/binaries-list | 2 +- .../{jcodings-1.0.41-license.txt => jcodings-1.0.18-license.txt} | 2 +- ide/textmate.lexer/nbproject/project.properties | 2 +- ide/textmate.lexer/nbproject/project.xml | 4 ++-- nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ide/textmate.lexer/external/binaries-list b/ide/textmate.lexer/external/binaries-list index 8e77a43..ef61b10 100644 --- a/ide/textmate.lexer/external/binaries-list +++ b/ide/textmate.lexer/external/binaries-list @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -7CDFC30451010E4D6C65AF5A3A4F357563289245 org.jruby.jcodings:jcodings:1.0.41 +E2C76A19F00128BB1806207E2989139BFB45F49D org.jruby.jcodings:jcodings:1.0.18 655CC3ABA1BC9DBDD653F28937BEC16F3E9C4CEC org.jruby.joni:joni:2.1.11 041CFB536DA85BCB9DBDF2E465BC952D40704863 org.eclipse.tm4e.core_0.2.0.201809031154.jar diff --git a/ide/textmate.lexer/external/jcodings-1.0.41-license.txt b/ide/textmate.lexer/external/jcodings-1.0.18-license.txt similarity index 98% rename from ide/textmate.lexer/external/jcodings-1.0.41-license.txt rename to ide/textmate.lexer/external/jcodings-1.0.18-license.txt index 3bec304..cd273db 100644 --- a/ide/textmate.lexer/external/jcodings-1.0.41-license.txt +++ b/ide/textmate.lexer/external/jcodings-1.0.18-license.txt @@ -1,5 +1,5 @@ Name: jcodings -Version: 1.0.41 +Version: 1.0.18 License: MIT-nocopyright Description: Needed by TextMate support for Eclipse Origin: https://github.com/jruby/jcodings diff --git a/ide/textmate.lexer/nbproject/project.properties b/ide/textmate.lexer/nbproject/project.properties index 4dec2bb..6d123cf 100644 --- a/ide/textmate.lexer/nbproject/project.properties +++ b/ide/textmate.lexer/nbproject/project.properties @@ -20,5 +20,5 @@ javac.compilerargs=-Xlint -Xlint:-serial javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml release.external/joni-2.1.11.jar=modules/ext/joni-2.1.11.jar -release.external/jcodings-1.0.41.jar=modules/ext/jcodings-1.0.41.jar +release.external/jcodings-1.0.18.jar=modules/ext/jcodings-1.0.18.jar release.external/org.eclipse.tm4e.core_0.2.0.201809031154.jar=modules/ext/org.eclipse.tm4e.core_0.2.0.201809031154.jar diff --git a/ide/textmate.lexer/nbproject/project.xml b/ide/textmate.lexer/nbproject/project.xml index 07a07fe..46e0338 100644 --- a/ide/textmate.lexer/nbproject/project.xml +++ b/ide/textmate.lexer/nbproject/project.xml @@ -197,8 +197,8 @@ <binary-origin>external/joni-2.1.11.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/jcodings-1.0.41.jar</runtime-relative-path> - <binary-origin>external/jcodings-1.0.41.jar</binary-origin> + <runtime-relative-path>ext/jcodings-1.0.18.jar</runtime-relative-path> + <binary-origin>external/jcodings-1.0.18.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/org.eclipse.tm4e.core_0.2.0.201809031154.jar</runtime-relative-path> diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 3dec21a..84508e4 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -61,3 +61,6 @@ enterprise/javaee.api/external/javax.annotation-api-1.2.jar enterprise/javaee7.a enterprise/javaee7.api/external/javax.annotation-api-1.2.jar enterprise/websvc.restlib/external/javax.annotation-api-1.2.jar enterprise/javaee7.api/external/jaxws-api-2.2.8.jar java/websvc.jaxws21api/external/jaxws-2.2.6-api.zip enterprise/javaee7.api/external/jsr181-api-1.0-MR1.jar java/websvc.jaxws21api/external/jaxws-2.2.6-api.zip + +# the jcodings is used internally in two unrelated modules: +ide/libs.bytelist/external/jcodings-1.0.18.jar ide/textmate.lexer/external/jcodings-1.0.18.jar --------------------------------------------------------------------- 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