You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2021/05/10 21:39:27 UTC

[netbeans] branch release124 updated (8feac4c -> 064136c)

This is an automated email from the ASF dual-hosted git repository.

geertjan pushed a change to branch release124
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


    from 8feac4c  Merge pull request #2925 from apache/delivery
     add 7f04658  Updates discoclient library (which adds more downloadable distributions)
     add 84cbdab  Merge pull request #2941 from emilianbold/emi-discoclient-1.0.1
     add 291762e  12.4 release updates
     add c6f55fc  removed file added by mistake
     add c66f8f7  Merge branch 'delivery' into delivery
     add 5d775bf  Merge pull request #2922 from MartinBalin/delivery
     add 054a368  [NETBEANS-5587] Fix regression in gavSplit
     add 87dae1c  Merge pull request #2942 from lkishalmi/NETBEANS-5587
     new 064136c  Merge pull request #2945 from apache/delivery

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../modules/gradle/GradleModuleFileCache21.java    |  10 ++--
 .../gradle/GradleModuleFileCache21Test.java        |  66 ++++++++++++++++++---
 java/java.disco/external/binaries-list             |   2 +-
 ...0-license.txt => discoclient-1.0.1-license.txt} |   2 +-
 java/java.disco/nbproject/project.properties       |   2 +-
 java/java.disco/nbproject/project.xml              |   4 +-
 java/java.lsp.server/vscode/CHANGELOG.md           |   7 +++
 java/java.lsp.server/vscode/README.md              |  36 +++++++++--
 .../vscode/images/Test_explorer.png                | Bin 0 -> 126694 bytes
 java/java.lsp.server/vscode/package-lock.json      |   2 +-
 java/java.lsp.server/vscode/package.json           |   2 +-
 11 files changed, 107 insertions(+), 26 deletions(-)
 rename java/java.disco/external/{discoclient-1.0-license.txt => discoclient-1.0.1-license.txt} (99%)
 create mode 100644 java/java.lsp.server/vscode/images/Test_explorer.png

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists


[netbeans] 01/01: Merge pull request #2945 from apache/delivery

Posted by ge...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

geertjan pushed a commit to branch release124
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 064136c61386b371259a4275173eacb745464224
Merge: 8feac4c 87dae1c
Author: Geertjan Wielenga <ge...@apache.org>
AuthorDate: Mon May 10 23:39:08 2021 +0200

    Merge pull request #2945 from apache/delivery
    
    Sync release124 with delivery for rc3

 .../modules/gradle/GradleModuleFileCache21.java    |  10 ++--
 .../gradle/GradleModuleFileCache21Test.java        |  66 ++++++++++++++++++---
 java/java.disco/external/binaries-list             |   2 +-
 ...0-license.txt => discoclient-1.0.1-license.txt} |   2 +-
 java/java.disco/nbproject/project.properties       |   2 +-
 java/java.disco/nbproject/project.xml              |   4 +-
 java/java.lsp.server/vscode/CHANGELOG.md           |   7 +++
 java/java.lsp.server/vscode/README.md              |  36 +++++++++--
 .../vscode/images/Test_explorer.png                | Bin 0 -> 126694 bytes
 java/java.lsp.server/vscode/package-lock.json      |   2 +-
 java/java.lsp.server/vscode/package.json           |   2 +-
 11 files changed, 107 insertions(+), 26 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists