[netbeans-tools] branch master updated: Implement apache oauth login

2021-02-27 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 1e49bb6  Implement apache oauth login
 new 6a3a7ba  Merge pull request #42 from matthiasblaesing/pp3-login-apache
1e49bb6 is described below

commit 1e49bb68f2335579e70d8ac5a189c65bf3ef9631
Author: Matthias Bläsing 
AuthorDate: Wed Feb 3 21:39:46 2021 +0100

Implement apache oauth login

The ASF provides an oauth based login option via:

https://oauth.apache.org

see

https://oauth.apache.org/api.html

for documentation. This change integrates the oauth system and allows
every ASF committer to login using his/her ASF credentials.
---
 .../Application/config/module.config.php.dist  |   8 +
 .../src/Application/Controller/LoginController.php |  88 +++--
 pp3/public/img/login/apache.svg| 404 +
 3 files changed, 467 insertions(+), 33 deletions(-)

diff --git a/pp3/module/Application/config/module.config.php.dist 
b/pp3/module/Application/config/module.config.php.dist
index 5dafbfb..32f514b 100755
--- a/pp3/module/Application/config/module.config.php.dist
+++ b/pp3/module/Application/config/module.config.php.dist
@@ -60,6 +60,14 @@ return array(
 'clientId' => 'DO_NOT_COMMIT',
 'clientSecret' => 'DO_NOT_COMMIT',
 'type' => 'amazon'
+),
+array(
+'id' => 'apache',
+'name' => 'Apache',
+'icon' => '/img/login/apache.svg',
+'clientId' => 'IGNORED',
+'clientSecret' => 'IGNORED',
+'type' => 'apache'
 )
 ),
 'router' => array(
diff --git 
a/pp3/module/Application/src/Application/Controller/LoginController.php 
b/pp3/module/Application/src/Application/Controller/LoginController.php
index 3fbdfeb..493897d 100644
--- a/pp3/module/Application/src/Application/Controller/LoginController.php
+++ b/pp3/module/Application/src/Application/Controller/LoginController.php
@@ -82,6 +82,9 @@ class LoginController extends BaseController {
 
 $stateBytes = random_bytes(64);
 $state = bin2hex($stateBytes);
+if($loginConfig['type'] == 'apache') {
+$state = substr($state, 0, 64);
+}
 $_SESSION['oauthState'] = $state;
 $_SESSION['oauthConfig'] = $loginConfig['id'];
 $scopeData = self::scopesFromType($loginConfig['type']);
@@ -89,7 +92,7 @@ class LoginController extends BaseController {
 'client_id' => $loginConfig['clientId'],
 'state' => $state,
 'response_type' => 'code',
-'redirect_uri' => $this->redirectUrl()
+'redirect_uri' => $this->redirectUrl($loginConfig['type'], $state)
 );
 if($scopeData) {
 $queryData['scope'] = $scopeData;
@@ -124,39 +127,48 @@ class LoginController extends BaseController {
 return $response;
 }
 
-$tokenRequest = self::tokenRequest($code, $loginConfig);
-$queryTokenResult = 
file_get_contents(self::tokenUrlFromType($loginConfig['type']), false, 
stream_context_create([
-'http' => [
-'method' => 'POST',
-'header' => ["Content-type: application/json", "Accept: 
application/json"],
-'content' => json_encode($tokenRequest)
-]
-]));
-
-if(!$queryTokenResult) {
-error_log("Empty response");
-$response->setStatusCode(500);
-$response->setContent(json_encode(array('success' => false, 
'reason' => 'INVALID_TOKEN')));
-return $response;
-}
+if($loginConfig['type'] == 'apache') {
+$queryProfileResult = 
file_get_contents("https://oauth.apache.org/token?code=; . $_GET['code'], 
false, stream_context_create([
+'http' => [
+'header' => ['Accept: application/json', 'User-Agent: 
Netbeans Plugin Portal'],
+"ignore_errors" => true,
+]
+]));
+} else {
+$tokenRequest = self::tokenRequest($code, $loginConfig);
+$queryTokenResult = 
file_get_contents(self::tokenUrlFromType($loginConfig['type']), false, 
stream_context_create([
+'http' => [
+'method' => 'POST',
+'header' => ["Content-type: application/json", "Accept: 
application/json"],
+'content' => json_encode($tokenRequest)
+]
+]));
+
+if(!$queryTokenResult) {
+error_log("Empty response");
+$re

[netbeans] branch master updated: Restore original format of m2:/ URLs modified by aa256463dcefb3b95bec6b7ac74e04a960015bc9.

2021-02-24 Thread matthiasblaesing
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 e5a40e4  Restore original format of m2:/ URLs modified by 
aa256463dcefb3b95bec6b7ac74e04a960015bc9.
 new f82594d  Merge pull request #2778 from matthiasblaesing/fix_m2_url
e5a40e4 is described below

commit e5a40e45c894862b0566e34bec4055a317314b1c
Author: Matthias Bläsing 
AuthorDate: Tue Feb 23 20:57:04 2021 +0100

Restore original format of m2:/ URLs modified by 
aa256463dcefb3b95bec6b7ac74e04a960015bc9.

m2:/ became a defacto API for the autoupdate mechanism. Both OpenJFX and
nb-javac rely on being able to be downloaded via the ".external" files
mechanism and third party modules could also rely on the exact syntax
of the URLs.

Instead of modifying the URL format, a new ad-hoc parser is introduced
to convert the m2 URL into maven coordinates.
---
 .../modules/ext/nb-javac-15.0.0.2-api.jar.external |  2 +-
 .../ext/nb-javac-15.0.0.2-impl.jar.external|  2 +-
 .../antsrc/org/netbeans/nbbuild/AutoUpdate.java|  2 +-
 .../netbeans/nbbuild/extlibs/DownloadBinaries.java | 47 ++
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git 
a/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-15.0.0.2-api.jar.external
 
b/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-15.0.0.2-api.jar.external
index 72d3d41..0abbc18 100644
--- 
a/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-15.0.0.2-api.jar.external
+++ 
b/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-15.0.0.2-api.jar.external
@@ -1,5 +1,5 @@
 CRC:3736270701
 SIZE:210532
-URL:m2:/com.dukescript.nbjavac:nb-javac:15.0.0.2:api
+URL:m2:/com.dukescript.nbjavac:nb-javac:15.0.0.2:jar:api
 MessageDigest: SHA-256 
20dae9df239aa1d346c56b744aee741f753611e7470640ff1ff7b1731283ed1b
 MessageDigest: SHA-512 
e12e603815159cbb348d8d3e73588d8ad549b41cac21831fa1228c0ab9bf23ce18d162b6fe7679de9d249fc2cb3a627edd35ebf2f3851dfd6d2513e1da741447
\ No newline at end of file
diff --git 
a/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-15.0.0.2-impl.jar.external
 
b/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-15.0.0.2-impl.jar.external
index e2f2d12..4e44592 100644
--- 
a/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-15.0.0.2-impl.jar.external
+++ 
b/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-15.0.0.2-impl.jar.external
@@ -1,5 +1,5 @@
 CRC:1851126890
 SIZE:3511612
-URL: m2:/com.dukescript.nbjavac:nb-javac:15.0.0.2
+URL: m2:/com.dukescript.nbjavac:nb-javac:15.0.0.2:jar
 MessageDigest: SHA-256 
809b68535b8d5e564802deba7489308f01041acaf0731584544ffd96c6d385c1
 MessageDigest: SHA-512 
e450cf9da202dee89ef79bff65fab1a287bd97d08ecc2ea19fbeedd8a16ce79371fbc0a72c68d353d8d13cae18e015ad862b28962cd2f6e43874f52767e99de7
\ No newline at end of file
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/AutoUpdate.java 
b/nbbuild/antsrc/org/netbeans/nbbuild/AutoUpdate.java
index f9dbf8f..898d4ea 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/AutoUpdate.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/AutoUpdate.java
@@ -188,7 +188,7 @@ public class AutoUpdate extends Task {
 List info = installed.get(uu.getCodeName());
 if (info != null && !uu.isNewerThan(info.get(0))) {
 log("Version " + info.get(0) + " of " + uu.getCodeName() + " 
is up to date", Project.MSG_VERBOSE);
-if (!force) {
+if (!force) {
 continue;
 }
 }
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java 
b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
index 5b683a5..735683a 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
@@ -35,13 +35,11 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.nio.file.Files;
-import java.nio.file.StandardOpenOption;
+import java.net.URLDecoder;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Consumer;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
@@ -180,11 +178,7 @@ public class DownloadBinaries extends Task {
 }
 
 public static InputStream downloadMaven(Task task, URI u) throws 
IOException {
-if (!"m2".equals(u.getScheme())) {
-throw new IOException("Only m2 URL is supported: " + u);
-

[netbeans-tools] branch master updated: Typo

2021-02-05 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 0a76cb8  Typo
 new 4af6c46  Merge pull request #27 from ramiswailem/patch-1
0a76cb8 is described below

commit 0a76cb87d2bd17d689420f4cb705a334af94c44d
Author: Rami Swailem 
AuthorDate: Tue Feb 18 12:33:57 2020 +0100

Typo
---
 wiki-export/wiki-content/DevFaqTaskLongRunningAsyncTask.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wiki-export/wiki-content/DevFaqTaskLongRunningAsyncTask.xml 
b/wiki-export/wiki-content/DevFaqTaskLongRunningAsyncTask.xml
index 902888c..5ac2761 100644
--- a/wiki-export/wiki-content/DevFaqTaskLongRunningAsyncTask.xml
+++ b/wiki-export/wiki-content/DevFaqTaskLongRunningAsyncTask.xml
@@ -67,7 +67,7 @@ public void actionPerformed(ActionEvent ev) {
 }
 EventQueue.invokeLater(new Runnable() {
 @Override public void run() {
-// do domething with the gui
+// do something with the gui
 }
 });
 }


-
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



[netbeans] branch master updated: Small typo in javadoc comments for KeyStoreProvider.

2021-02-05 Thread matthiasblaesing
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 43f072e  Small typo in javadoc comments for KeyStoreProvider.
 new b87910d  Merge pull request #2733 from ramiswailem/patch-2
43f072e is described below

commit 43f072e85be8954eddcbdc9ba1684a5cec416f6c
Author: Rami Swailem 
AuthorDate: Fri Feb 5 12:04:05 2021 +0100

Small typo in javadoc comments for KeyStoreProvider.

Small typo in javadoc comments for KeyStoreProvider.
---
 .../src/org/netbeans/spi/autoupdate/KeyStoreProvider.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/platform/autoupdate.services/src/org/netbeans/spi/autoupdate/KeyStoreProvider.java
 
b/platform/autoupdate.services/src/org/netbeans/spi/autoupdate/KeyStoreProvider.java
index e94fb1d..e74fafd 100644
--- 
a/platform/autoupdate.services/src/org/netbeans/spi/autoupdate/KeyStoreProvider.java
+++ 
b/platform/autoupdate.services/src/org/netbeans/spi/autoupdate/KeyStoreProvider.java
@@ -23,7 +23,7 @@ import java.security.KeyStore;
 
 /** Registers java.security.KeyStore into Autoupdate 
infrastructure.
  * This KeyStore is used for verification of downloaded NBMs. The system finds 
out
- * the KeyStoreProvider in Lookup.getDefault().
+ * the KeyStoreProvider in Lookup.getDefault().
  * The KeyStoreProvider should be registered using {@link 
org.openide.util.lookup.ServiceProvider}.
  *
  * @author Jiri Rechtacek


-
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



[netbeans-tools] branch master updated: Added check for ext (.) to avoid null pointer exception

2021-01-26 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 7f2aaf0  Added check for ext (.) to avoid null pointer exception
 new 7ffce24  Merge pull request #41 from ebresie/master
7f2aaf0 is described below

commit 7f2aaf0e3884483b57da873b7ecbbd2aefbe64c9
Author: Eric Bresie 
AuthorDate: Mon Jan 25 14:50:14 2021 -0600

Added check for ext (.) to avoid null pointer exception
---
 convert/src/convert/ConvertAndCopy.java | 21 -
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/convert/src/convert/ConvertAndCopy.java 
b/convert/src/convert/ConvertAndCopy.java
index fbcb2c8..df87977 100644
--- a/convert/src/convert/ConvertAndCopy.java
+++ b/convert/src/convert/ConvertAndCopy.java
@@ -86,15 +86,18 @@ public class ConvertAndCopy {
 }
 } else {
 final String name = rel.toString();
-final String fileEnding = 
name.substring(name.lastIndexOf("."));
-if (IMAGE_FILE_ENDINGS.contains(fileEnding)) {
-imageFiles.add(p);
-continue;
-} else if (".properties".equals(fileEnding)) {
-regenerateBundleFile(p, t);
-copied++;
-System.out.println("Regenerated: " + t);
-continue;
+// check if filename includes an extension for special 
cases
+if (name.contains(".")) {
+final String fileEnding = 
name.substring(name.lastIndexOf("."));
+if (IMAGE_FILE_ENDINGS.contains(fileEnding)) {
+imageFiles.add(p);
+continue;
+} else if (".properties".equals(fileEnding)) {
+regenerateBundleFile(p, t);
+copied++;
+System.out.println("Regenerated: " + t);
+continue;
+}
 }
 }
 notCopied.add(p);


-
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



[netbeans-tools] branch master updated: Don't use "of" as alias in SQL queries (reserved keyword since 8.0.1)

2021-01-22 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new ec5a7f9  Don't use "of" as alias in SQL queries (reserved keyword 
since 8.0.1)
 new cf30978  Merge pull request #40 from 
matthiasblaesing/synergy_of_reserved_sql
ec5a7f9 is described below

commit ec5a7f914619b752e5bc473f7353c5db25611c21
Author: Matthias Bläsing 
AuthorDate: Thu Jan 14 20:30:12 2021 +0100

Don't use "of" as alias in SQL queries (reserved keyword since 8.0.1)
---
 synergy/server/db/AssignmentDAO.php | 2 +-
 synergy/server/db/RunDAO.php| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/synergy/server/db/AssignmentDAO.php 
b/synergy/server/db/AssignmentDAO.php
index bae5898..8e44b6c 100644
--- a/synergy/server/db/AssignmentDAO.php
+++ b/synergy/server/db/AssignmentDAO.php
@@ -74,7 +74,7 @@ class AssignmentDAO {
 
 public function getAssignment($assignmentId) {
 DB_DAO::connectDatabase();
-$handler = DB_DAO::getDB()->prepare("SELECT GROUP_CONCAT( of.tribe_id 
SEPARATOR  ';' ) AS tribes_id, u.id AS uid, u.username, a.last_updated, 
a.started, a.issues, a.time_taken, u.first_name,a.keyword_id, u.last_name, 
p.name, a.state, a.number_of_cases, 
a.number_of_completed_cases,a.failed_cases,a.passed_cases, a.skipped_cases, 
k.keyword, a.specification_id,a.id as aid, sp.title as sptitle, a.created_by 
FROM (test_assignement a, user u, platform p, specification sp) LEFT JOIN keyw 
[...]
+$handler = DB_DAO::getDB()->prepare("SELECT GROUP_CONCAT( mof.tribe_id 
SEPARATOR  ';' ) AS tribes_id, u.id AS uid, u.username, a.last_updated, 
a.started, a.issues, a.time_taken, u.first_name,a.keyword_id, u.last_name, 
p.name, a.state, a.number_of_cases, 
a.number_of_completed_cases,a.failed_cases,a.passed_cases, a.skipped_cases, 
k.keyword, a.specification_id,a.id as aid, sp.title as sptitle, a.created_by 
FROM (test_assignement a, user u, platform p, specification sp) LEFT JOIN key 
[...]
 
 $handler->bindValue(":id", $assignmentId);
 if (!$handler->execute()) {
diff --git a/synergy/server/db/RunDAO.php b/synergy/server/db/RunDAO.php
index aafa6cc..23f1325 100755
--- a/synergy/server/db/RunDAO.php
+++ b/synergy/server/db/RunDAO.php
@@ -283,9 +283,9 @@ class RunDAO {
 public function getAssignments($id, $withIssues) {
 DB_DAO::connectDatabase();
 if ($withIssues) {
-$handler = DB_DAO::getDB()->prepare("SELECT GROUP_CONCAT( 
of.tribe_id SEPARATOR  ';' ) AS tribes_id, u.id AS uid, u.username, 
a.last_updated, a.started, a.issues, a.time_taken, u.first_name,a.keyword_id, 
u.last_name, p.name, a.state, a.number_of_cases, 
a.number_of_completed_cases,a.failed_cases,a.passed_cases, a.skipped_cases, 
k.keyword, a.specification_id,a.id as aid, sp.title as sptitle, a.created_by 
FROM (test_assignement a, user u, platform p, specification sp) LEFT JOIN  [...]
+$handler = DB_DAO::getDB()->prepare("SELECT GROUP_CONCAT( 
mof.tribe_id SEPARATOR  ';' ) AS tribes_id, u.id AS uid, u.username, 
a.last_updated, a.started, a.issues, a.time_taken, u.first_name,a.keyword_id, 
u.last_name, p.name, a.state, a.number_of_cases, 
a.number_of_completed_cases,a.failed_cases,a.passed_cases, a.skipped_cases, 
k.keyword, a.specification_id,a.id as aid, sp.title as sptitle, a.created_by 
FROM (test_assignement a, user u, platform p, specification sp) LEFT JOIN [...]
 } else {
-$handler = DB_DAO::getDB()->prepare("SELECT GROUP_CONCAT( 
of.tribe_id SEPARATOR  ';' ) AS tribes_id, u.username, u.id AS uid, 
a.last_updated, a.started, u.first_name,a.keyword_id, u.last_name, p.name, 
a.state, a.number_of_cases, 
a.number_of_completed_cases,a.failed_cases,a.passed_cases, a.skipped_cases, 
k.keyword, a.specification_id,a.id as aid, sp.title as sptitle, a.created_by 
FROM (test_assignement a, user u, platform p, specification sp) LEFT JOIN 
keyword k ON k.id=a.keyw [...]
+$handler = DB_DAO::getDB()->prepare("SELECT GROUP_CONCAT( 
mof.tribe_id SEPARATOR  ';' ) AS tribes_id, u.username, u.id AS uid, 
a.last_updated, a.started, u.first_name,a.keyword_id, u.last_name, p.name, 
a.state, a.number_of_cases, 
a.number_of_completed_cases,a.failed_cases,a.passed_cases, a.skipped_cases, 
k.keyword, a.specification_id,a.id as aid, sp.title as sptitle, a.created_by 
FROM (test_assignement a, user u, platform p, specification sp) LEFT JOIN 
keyword k ON k.id=a.key [...]
 }
 
 $handler->bindValue(":id", $id);


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

For further information abou

[netbeans] branch master updated (894e4b5 -> ed02fd2)

2021-01-21 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from 894e4b5  Merge pull request #2679 from sdedic/lsp/maven-execution-stop
 add ed02fd2  [NETBEANS-1823][NETBEANS-5258] Fix integration with scene 
builder 15

No new revisions were added by this update.

Summary of changes:
 .../netbeans/modules/javafx2/scenebuilder/impl/Bundle.properties| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


-
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



[netbeans] branch master updated: [NETBEANS-2260] Welcome Page header graphics

2021-01-19 Thread matthiasblaesing
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 5456c86  [NETBEANS-2260] Welcome Page header graphics
 new 5b90934  Merge pull request #2689 from 
mhalachev/NETBEANS-2260-Welcome-Page-header-graphics
5456c86 is described below

commit 5456c8675d37a46019bf113a43463e55ec3eb58b
Author: Martin Halachev 
AuthorDate: Mon Jan 18 17:03:01 2021 +0200

[NETBEANS-2260] Welcome Page header graphics

https://issues.apache.org/jira/browse/NETBEANS-2260

- Update content banner image asset
- Set bicubic interpolation before drawing
---
 .../modules/welcome/resources/content_banner.png | Bin 37075 -> 3631 bytes
 .../netbeans/modules/welcome/ui/ContentHeader.java   |   6 ++
 2 files changed, 6 insertions(+)

diff --git 
a/nb/welcome/src/org/netbeans/modules/welcome/resources/content_banner.png 
b/nb/welcome/src/org/netbeans/modules/welcome/resources/content_banner.png
index adf6611..e645e71 100644
Binary files 
a/nb/welcome/src/org/netbeans/modules/welcome/resources/content_banner.png and 
b/nb/welcome/src/org/netbeans/modules/welcome/resources/content_banner.png 
differ
diff --git a/nb/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java 
b/nb/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java
index 838f30d..61c8d46 100644
--- a/nb/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java
+++ b/nb/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java
@@ -24,6 +24,7 @@ import java.awt.GradientPaint;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
+import java.awt.RenderingHints;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -78,6 +79,11 @@ public class ContentHeader extends JPanel implements 
Constants {
 int width = getWidth();
 int height = getHeight();
 
+RenderingHints rh = new RenderingHints(
+ RenderingHints.KEY_INTERPOLATION,
+ RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+
+g2d.setRenderingHints(rh);
 g2d.setColor( Utils.getBorderColor() );
 g2d.drawRect( 0, 0, width, 12 );
 


-
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



[netbeans] branch master updated: [NETBEANS-5195] Change icon for JSON files

2021-01-13 Thread matthiasblaesing
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 21a382d  [NETBEANS-5195] Change icon for JSON files
 new 37aaec6  Merge pull request #2656 from 
mhalachev/NETBEANS-5195-Change-icon-for-JSON-files
21a382d is described below

commit 21a382d6ec15dd2607730c3dc96b53fe8be103f2
Author: Martin Halachev 
AuthorDate: Sat Jan 9 18:14:08 2021 +0200

[NETBEANS-5195] Change icon for JSON files

https://issues.apache.org/jira/browse/NETBEANS-5195
---
 webcommon/javascript2.editor/licenseinfo.xml   |   5 +++
 .../modules/javascript2/editor/JsonLanguage.java   |   2 +-
 .../modules/javascript2/editor/resources/json.png  | Bin 0 -> 454 bytes
 .../modules/javascript2/editor/resources/json.svg  |  42 +
 .../modules/javascript2/editor/resources/layer.xml |   4 +-
 5 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/webcommon/javascript2.editor/licenseinfo.xml 
b/webcommon/javascript2.editor/licenseinfo.xml
index f271c5d..76a02ed 100644
--- a/webcommon/javascript2.editor/licenseinfo.xml
+++ b/webcommon/javascript2.editor/licenseinfo.xml
@@ -41,4 +41,9 @@
 
 
 
+
+
src/org/netbeans/modules/javascript2/editor/resources/json.png
+
+
+
 
diff --git 
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsonLanguage.java
 
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsonLanguage.java
index 4fd567d..e4756bd 100644
--- 
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsonLanguage.java
+++ 
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsonLanguage.java
@@ -66,7 +66,7 @@ public class JsonLanguage extends DefaultLanguageConfig {
 )
 @NbBundle.Messages("JsonResolver=JSON Files")
 @MultiViewElement.Registration(displayName = "#LBL_JsonEditorTab",
-iconBase = 
"org/netbeans/modules/javascript2/editor/resources/javascript.png",
+iconBase = 
"org/netbeans/modules/javascript2/editor/resources/json.png",
 persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED,
 preferredID = "json.source",
 mimeType = JsTokenId.JSON_MIME_TYPE,
diff --git 
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.png
 
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.png
new file mode 100644
index 000..4f7a7ad
Binary files /dev/null and 
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.png
 differ
diff --git 
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.svg
 
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.svg
new file mode 100644
index 000..7cdbb3b
--- /dev/null
+++ 
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/json.svg
@@ -0,0 +1,42 @@
+
+
+http://www.w3.org/2000/svg;
+xmlns:xlink="http://www.w3.org/1999/xlink; width="16" height="16" 
viewBox="0 0 16 16">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
 
 
 


-
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



[netbeans] branch master updated: [NETBEANS-5181] NbBundle only accepts ISO-8859-1 while UTF-8 is default since JDK9

2021-01-09 Thread matthiasblaesing
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 3b8dea5  [NETBEANS-5181] NbBundle only accepts ISO-8859-1 while UTF-8 
is default since JDK9
 new 396d4be  Merge pull request #2633 from jjazzboss/NETBEANS-5181-NbBundle
3b8dea5 is described below

commit 3b8dea5f27a889a42f6356efd23a602418d6c5d3
Author: Jerome Lelasseux 
AuthorDate: Fri Jan 1 21:20:47 2021 +0100

[NETBEANS-5181] NbBundle only accepts ISO-8859-1 while UTF-8 is default 
since JDK9

Change NbBundle to read Bundle files using UTF-1 encoding by default, and
automatically switch to ISO-8859-1 if UTF-1 decoding fails. System property
java.util.PropertyResourceBundle.encoding can can alter the behavior
like for PropertyResourceBundle (from JDK9).
---
 .../src/org/openide/util/NbBundle.java | 106 +-
 .../unit/src/org/openide/util/NbBundleTest.java| 120 -
 2 files changed, 199 insertions(+), 27 deletions(-)

diff --git a/platform/openide.util/src/org/openide/util/NbBundle.java 
b/platform/openide.util/src/org/openide/util/NbBundle.java
index 77b3473..e072141 100644
--- a/platform/openide.util/src/org/openide/util/NbBundle.java
+++ b/platform/openide.util/src/org/openide/util/NbBundle.java
@@ -21,6 +21,7 @@ package org.openide.util;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -28,6 +29,14 @@ import java.lang.annotation.Target;
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import java.net.URL;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -68,7 +77,10 @@ public class NbBundle extends Object {
 
 private static final boolean USE_DEBUG_LOADER = 
Boolean.getBoolean("org.openide.util.NbBundle.DEBUG"); // NOI18N
 private static String brandingToken = null;
-
+
+private static final UtfThenIsoCharset utfThenIsoCharset = new 
UtfThenIsoCharset(false);
+private static final UtfThenIsoCharset utfThenIsoCharsetOnlyUTF8 = new 
UtfThenIsoCharset(true);
+
 /**
  * Cache of URLs for localized files.
  * Keeps only weak references to the class loaders.
@@ -538,8 +550,16 @@ public class NbBundle extends Object {
 (loader != null ? loader.getResourceAsStream(res) : 
ClassLoader.getSystemResourceAsStream(res)) :
 u.openStream();
 
+// #NETBEANS-5181
+String encoding = 
System.getProperty("java.util.PropertyResourceBundle.encoding");
+UtfThenIsoCharset charset = "UTF-8".equals(encoding) ? 
utfThenIsoCharsetOnlyUTF8 : utfThenIsoCharset;
+InputStreamReader reader = new InputStreamReader(is,
+"ISO-8859-1".equals(encoding)
+? StandardCharsets.ISO_8859_1.newDecoder()
+: charset.newDecoder());
+
 try {
-p.load(is);
+p.load(reader);
 } finally {
 is.close();
 }
@@ -1458,4 +1478,86 @@ public class NbBundle extends Object {
 
 }
 }
+
+
+/**
+ * Local charset to decode using UTF-8 by default, but automatically 
switching to ISO-8859-1 if UTF-8 decoding fails.
+ * 
+ */
+static private class UtfThenIsoCharset extends Charset {
+
+private final boolean onlyUTF8;
+
+/**
+ *
+ * @param acceptOnlyUTF8 If true there is no automatic switch to 
ISO-8859-1 if UTF-8 decoding fails.
+ */
+public UtfThenIsoCharset(boolean acceptOnlyUTF8) {
+super(UtfThenIsoCharset.class.getCanonicalName(), null);
+this.onlyUTF8 = acceptOnlyUTF8;
+}
+
+@Override
+public boolean contains(Charset arg0) {
+return this.equals(arg0);
+}
+
+@Override
+public CharsetDecoder newDecoder() {
+return new UtfThenIsoDecoder(this, 1.0f, 1.0f);
+}
+
+@Override
+public CharsetEncoder newEncoder() {
+throw new UnsupportedOperationException("Not supported yet.");
+}
+
+ private final class UtfThenIsoDecoder extends CharsetDecoder 

[netbeans] branch master updated: [NETBEANS-5210] Export code inspection settings

2021-01-06 Thread matthiasblaesing
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 0d935a1  [NETBEANS-5210] Export code inspection settings
 new d80a1dc  Merge pull request #2635 from 
KacerCZ/netbeans-5210-export-inspection-settings
0d935a1 is described below

commit 0d935a100d5f88783b0677948b66ac17ff750327
Author: Tomas Prochazka 
AuthorDate: Sun Jan 3 12:14:25 2021 +0100

[NETBEANS-5210] Export code inspection settings

https://issues.apache.org/jira/browse/NETBEANS-5210

Inspection settings (from Code > Inspect) can be exported from Tools > 
Options.
Settings are registered under Miscellaneous > Code Inspections.
---
 ide/code.analysis/manifest.mf  |  2 +-
 .../netbeans/modules/analysis/Bundle.properties|  1 +
 .../netbeans/modules/analysis/resources/layer.xml  | 34 ++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/ide/code.analysis/manifest.mf b/ide/code.analysis/manifest.mf
index caf7368..4ede2d5 100644
--- a/ide/code.analysis/manifest.mf
+++ b/ide/code.analysis/manifest.mf
@@ -3,4 +3,4 @@ OpenIDE-Module: org.netbeans.modules.code.analysis/0
 OpenIDE-Module-Localizing-Bundle: 
org/netbeans/modules/analysis/Bundle.properties
 OpenIDE-Module-Recommends: org.openide.windows.WindowManager
 OpenIDE-Module-Specification-Version: 1.37
-
+OpenIDE-Module-Layer: org/netbeans/modules/analysis/resources/layer.xml
diff --git 
a/ide/code.analysis/src/org/netbeans/modules/analysis/Bundle.properties 
b/ide/code.analysis/src/org/netbeans/modules/analysis/Bundle.properties
index b7d3bf7..f55fbd7 100644
--- a/ide/code.analysis/src/org/netbeans/modules/analysis/Bundle.properties
+++ b/ide/code.analysis/src/org/netbeans/modules/analysis/Bundle.properties
@@ -24,3 +24,4 @@ RunAnalysisPanel.singleInspectionRadio.text= 
Inspection:
 RunAnalysisPanel.browse.text=
 DN_Default=Default
 RequiredPluginsPanel.warning.text=Additional plugins required for the selected 
configuration.
+Options.Export.Inspections.displayName=Code Inspections
diff --git 
a/ide/code.analysis/src/org/netbeans/modules/analysis/resources/layer.xml 
b/ide/code.analysis/src/org/netbeans/modules/analysis/resources/layer.xml
new file mode 100644
index 000..03e00a6
--- /dev/null
+++ b/ide/code.analysis/src/org/netbeans/modules/analysis/resources/layer.xml
@@ -0,0 +1,34 @@
+
+
+http://www.netbeans.org/dtds/filesystem-1_2.dtd;>
+
+
+
+
+
+
+
+
+
+
+
+


-
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



[netbeans] branch master updated: update default imports for JShell

2021-01-06 Thread matthiasblaesing
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 67a256d  update default imports for JShell
 new 6e0a0cd  Merge pull request #2609 from jherkel/master
67a256d is described below

commit 67a256d75a0cafa883b1ddad436ad73088a33e6c
Author: Jakub Herkel 
AuthorDate: Sat Dec 26 18:13:05 2020 +0100

update default imports for JShell
---
 .../src/org/netbeans/modules/jshell/tool/JShellTool.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/java/jshell.support/src/org/netbeans/modules/jshell/tool/JShellTool.java 
b/java/jshell.support/src/org/netbeans/modules/jshell/tool/JShellTool.java
index 6631060..4bbe156 100644
--- a/java/jshell.support/src/org/netbeans/modules/jshell/tool/JShellTool.java
+++ b/java/jshell.support/src/org/netbeans/modules/jshell/tool/JShellTool.java
@@ -215,13 +215,16 @@ public class JShellTool implements MessageHandler {
 
 static final String DEFAULT_STARTUP =
 "\n" +
-"import java.util.*;\n" +
 "import java.io.*;\n" +
 "import java.math.*;\n" +
 "import java.net.*;\n" +
+"import java.nio.file.*;\n" +
+"import java.util.*;\n" +
 "import java.util.concurrent.*;\n" +
+"import java.util.function.*;\n" +
 "import java.util.prefs.*;\n" +
 "import java.util.regex.*;\n" +
+"import java.util.stream.*;\n" +
 "void printf(String format, Object... args) { 
System.out.printf(format, args); }\n";
 
 // Tool id (tid) mapping: the three name spaces


-
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



[netbeans] branch master updated: [NETBEANS-4783] Unselect added files from CDNJS by default

2021-01-05 Thread matthiasblaesing
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 90bd1ca  [NETBEANS-4783] Unselect added files from CDNJS by default
 new e916a56  Merge pull request #2634 from 
KacerCZ/netbeans-4783-cdnjs-files-unselected
90bd1ca is described below

commit 90bd1cad17f0f401ce9a3fbe478e7881a4d7e2e4
Author: Tomas Prochazka 
AuthorDate: Sun Jan 3 08:25:18 2021 +0100

[NETBEANS-4783] Unselect added files from CDNJS by default

https://issues.apache.org/jira/browse/NETBEANS-4783

When adding new files from CDNJS new files are not selected by default.
---
 .../src/org/netbeans/modules/javascript/cdnjs/ui/FilesNode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/FilesNode.java
 
b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/FilesNode.java
index a089333..a2e9350 100644
--- 
a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/FilesNode.java
+++ 
b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/FilesNode.java
@@ -101,7 +101,7 @@ public class FilesNode extends AbstractNode {
 
 @Override
 protected Node[] createNodes(String key) {
-boolean install = (installedFiles == null) || 
installedFiles.contains(key);
+boolean install = (installedFiles != null) && 
installedFiles.contains(key);
 return new Node[] {new FileNode(key, install)};
 }
 }


-
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



[netbeans] branch master updated: [NETBEANS-5214] Fix handling of global values

2021-01-05 Thread matthiasblaesing
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 1198c66  [NETBEANS-5214] Fix handling of global values
 new bb97001  Merge pull request #2639 from matthiasblaesing/netbeans-5214
1198c66 is described below

commit 1198c6642612764150ad3d0911bf8f437eef6601
Author: Matthias Bläsing 
AuthorDate: Mon Jan 4 20:58:49 2021 +0100

[NETBEANS-5214] Fix handling of global values

When checking the global values, the input state needs to be reset after
the possible values are checked. Before this change the right grammar
element was found, but then could not be processed, because the state
of the input was already changed by the checking.
---
 .../modules/css/lib/api/properties/GrammarResolver.java   |  2 +-
 .../modules/css/lib/api/properties/GrammarResolverTest.java   | 11 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git 
a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/GrammarResolver.java
 
b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/GrammarResolver.java
index df83498..5e1e898 100644
--- 
a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/GrammarResolver.java
+++ 
b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/GrammarResolver.java
@@ -287,12 +287,12 @@ public class GrammarResolver {
 InputState beforeState = createInputState();
 List matching = new 
ArrayList<>(globalValues.length);
 for(ValueGrammarElement vge: globalValues) {
-backupInputState(beforeState);
 if(processValue(vge)) {
 matching.add(vge);
 } else {
 valueNotAccepted(vge);
 }
+backupInputState(beforeState);
 }
 if(! matching.isEmpty()) {
 boolean matched = processValue(matching.get(0));
diff --git 
a/ide/css.lib/test/unit/src/org/netbeans/modules/css/lib/api/properties/GrammarResolverTest.java
 
b/ide/css.lib/test/unit/src/org/netbeans/modules/css/lib/api/properties/GrammarResolverTest.java
index 28151e7..0ad38e5 100644
--- 
a/ide/css.lib/test/unit/src/org/netbeans/modules/css/lib/api/properties/GrammarResolverTest.java
+++ 
b/ide/css.lib/test/unit/src/org/netbeans/modules/css/lib/api/properties/GrammarResolverTest.java
@@ -852,4 +852,15 @@ public class GrammarResolverTest extends CssTestBase {
 }
 
 
+public void testGlobalValuesAreResolved() {
+String grammar = "a";
+
+// Baseline matching - validate, that grammar works
+assertResolve(grammar, "a");
+
+// Verify that the global values unset, inherit and initial are matched
+assertResolve(grammar, "unset");
+assertResolve(grammar, "inherit");
+assertResolve(grammar, "initial");
+}
 }


-
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



[netbeans] branch master updated (0ed3bcd -> c0848d2)

2021-01-02 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from 0ed3bcd  Merge pull request #2632 from 
KacerCZ/netbeans-4092-fix-npm-logo-size
 new 707b0a8  Revert "fixed paint selection"
 new 381af20  Revert "[NETBEANS-5070] fix errors on text selection"
 new 996a7fc  Revert "[NETBEANS-819] partial fix for cursor. Text selection 
does't work"
 new 172a9cf  [NETBEANS-819] Add debug option for character placement of 
characters in terminal
 new 4d1a414  [NETBEANS-819] Remove fast path for glyph drawing as it fails 
for HiDPI scenarios
 new c0848d2  Merge pull request #2628 from 
matthiasblaesing/netbeans-819-fix_terminal

The 4800 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:
 .../org/netbeans/lib/terminalemulator/Line.java| 132 +++--
 .../lib/terminalemulator/MyFontMetrics.java|  21 ++--
 .../src/org/netbeans/lib/terminalemulator/Sel.java |  24 ++--
 .../org/netbeans/lib/terminalemulator/Term.java| 132 -
 4 files changed, 166 insertions(+), 143 deletions(-)


-
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



[netbeans] branch master updated: [NETBEANS-4092] Fix npm logo size

2021-01-02 Thread matthiasblaesing
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 855fe9c  [NETBEANS-4092] Fix npm logo size
 new 0ed3bcd  Merge pull request #2632 from 
KacerCZ/netbeans-4092-fix-npm-logo-size
855fe9c is described below

commit 855fe9c3755da3bfb190a2316f3b668a7529f8a9
Author: Tomas Prochazka 
AuthorDate: Sat Jan 2 11:06:04 2021 +0100

[NETBEANS-4092] Fix npm logo size

https://issues.apache.org/jira/browse/NETBEANS-4092

Changed size of image in npm.svg to match npm.png size.
---
 .../src/org/netbeans/modules/javascript/nodejs/ui/resources/npm.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/resources/npm.svg
 
b/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/resources/npm.svg
index 310d12e..18e648f 100644
--- 
a/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/resources/npm.svg
+++ 
b/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/resources/npm.svg
@@ -28,4 +28,4 @@
 - the file was opened, color was modified to #CC3534 and saved with NetBeans
 - color was taken from here: https://www.schemecolor.com/npm-logo-colors.php
 -->
-http://www.w3.org/2000/svg;>NPM icon
+http://www.w3.org/2000/svg;>NPM icon


-
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



[netbeans] branch master updated: [NETBEANS-4256] Fixed inconsistent xml fontcolor tag names.

2021-01-01 Thread matthiasblaesing
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 7974ac5  [NETBEANS-4256] Fixed inconsistent xml fontcolor tag names.
 new cdeb588  Merge pull request #2625 from rs333/NETBEANS-4256
7974ac5 is described below

commit 7974ac5922c7fc0c20c4fd30e2d3e1f0cdb363c2
Author: Robert Schultz 
AuthorDate: Thu Dec 31 11:11:04 2020 -0500

[NETBEANS-4256] Fixed inconsistent xml fontcolor tag names.
---
 .../src/org/netbeans/api/xml/lexer/XMLTokenId.java |   4 +-
 .../modules/xml/text/resources/Bundle.properties   |   4 +-
 .../modules/xml/text/resources/XML-fontsColors.xml |   4 +-
 .../goldenfiles/ColoringTest/testXMLColoring.pass  | 260 ++---
 4 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/ide/xml.lexer/src/org/netbeans/api/xml/lexer/XMLTokenId.java 
b/ide/xml.lexer/src/org/netbeans/api/xml/lexer/XMLTokenId.java
index be0c75b..1e96171 100644
--- a/ide/xml.lexer/src/org/netbeans/api/xml/lexer/XMLTokenId.java
+++ b/ide/xml.lexer/src/org/netbeans/api/xml/lexer/XMLTokenId.java
@@ -67,9 +67,9 @@ public enum XMLTokenId implements TokenId {
 /* PI target ?target content of pi ?> */
 PI_TARGET("xml-pi-target"),
 /* PI conetnt ?target content of pi ?> */
-PI_CONTENT("pi-content"),
+PI_CONTENT("xml-pi-content"),
 /* PI end delimiter ?target ?> 
*/
-PI_END("pi-end"),
+PI_END("xml-pi-end"),
 /** Cdata section including its delimiters. */
 CDATA_SECTION("xml-cdata-section");
 
diff --git 
a/ide/xml.text/src/org/netbeans/modules/xml/text/resources/Bundle.properties 
b/ide/xml.text/src/org/netbeans/modules/xml/text/resources/Bundle.properties
index eb98248..e75c134 100644
--- a/ide/xml.text/src/org/netbeans/modules/xml/text/resources/Bundle.properties
+++ b/ide/xml.text/src/org/netbeans/modules/xml/text/resources/Bundle.properties
@@ -38,8 +38,8 @@ xml-ws=Markup Whitespace
 xml-operator=Operators
 xml-EOL=New Line (deprecated)
 xml-pi-start=PI Start Delimiter
-pi-end=PI End Delimiter
-pi-target=PI Target
+xml-pi-end=PI End Delimiter
+xml-pi-target=PI Target
 xml-pi-content=PI Content
 xml-cdata-section=CDATA Section
 
diff --git 
a/ide/xml.text/src/org/netbeans/modules/xml/text/resources/XML-fontsColors.xml 
b/ide/xml.text/src/org/netbeans/modules/xml/text/resources/XML-fontsColors.xml
index 62dbcab..29d9bb8 100644
--- 
a/ide/xml.text/src/org/netbeans/modules/xml/text/resources/XML-fontsColors.xml
+++ 
b/ide/xml.text/src/org/netbeans/modules/xml/text/resources/XML-fontsColors.xml
@@ -31,8 +31,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git 
a/ide/xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/syntax/data/goldenfiles/ColoringTest/testXMLColoring.pass
 
b/ide/xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/syntax/data/goldenfiles/ColoringTest/testXMLColoring.pass
index 54dace9..757ee3e 100644
--- 
a/ide/xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/syntax/data/goldenfiles/ColoringTest/testXMLColoring.pass
+++ 
b/ide/xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/syntax/data/goldenfiles/ColoringTest/testXMLColoring.pass
@@ -1,168 +1,168 @@
-pi-start: 
-text: 
+xml-pi-start: 
+xml-text: 
 
 
-comment: 
-text: 
+xml-comment: 
+xml-text: 
 
 
-pi-start: 
-text: 
+xml-pi-start: 
+xml-text: 
 
 
-doctype: 
-text:  
-doctype: 
-text: 
+xml-doctype: 
+xml-text:  
+xml-doctype: 
+xml-text: 
 
-doctype: 
-text:   
-doctype: 
-text: 
+xml-doctype: 
+xml-text:   
+xml-doctype: 
+xml-text: 
 
-ref: %states;
-text: 
-doctype: 
-text: 
+xml-ref: %states;
+xml-text: 
+xml-doctype: 
+xml-text: 
 
-doctype: 
-text:  
-pi-start: 
-text: 
+xml-doctype: 
+xml-text:  
+xml-pi-start: 
+xml-text: 
 
-doctype: 
-text: 
-comment: 
-text: 
+xml-doctype: 
+xml-text: 
+xml-comment: 
+xml-text: 
 
-doctype: 
-text:
-doctype: 
-text: 
+xml-doctype: 
+xml-text:
+xml-doctype: 
+xml-text: 
 
-doctype: 
-text: 
+xml-text: 
 
-comment: 
-text:  
-doctype: 
-text: 
+xml-comment: 
+xml-text:  
+xml-doctype: 
+xml-text: 
 
-doctype: 
-text: 
-comment: 
-text: 
+xml-doctype: 
+xml-text: 
+xml-comment: 
+xml-text: 
 
-doctype: 
-comment: 
-text: 
+xml-doctype: 
+xml-comment: 
+xml-text: 

-doctype: 
-doctype: 
+xml-doctype: 
+xml-doctype: 
 ]>
-text: 
+xml-text: 
 
 
-pi-start: 
-text: 
+xml-pi-start: 
+xml-text: 
 
 
-tag: 
-pi-start: 
-text: 
+xml-tag: 
+xml-pi-start: 
+xml-text: 
   
-tag: 
-text

[netbeans] branch master updated (0415bfa -> ac31344)

2020-12-30 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from 0415bfa  Merge pull request #2615 from 
JaroslavTulach/ProcessTestClasses
 new 5b69408  [NETBEANS-4739] Handle quantifiers (+, *, ?, {}) in Regexp 
Queries correctly
 new e827648  [NETBEANS-4739] Fix CSS index queries
 new 0bc1510  [NETBEANS-4739] Add Test for GotoDeclaration
 new ac31344  Merge pull request #2616 from matthiasblaesing/netbeans-4739

The 4784 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:
 ide/css.editor/nbproject/project.properties|   2 +
 .../modules/css/indexing/api/CssIndex.java |  14 +-
 .../data/testProject/nbproject/project.properties  |   0
 .../unit/data/testProject/nbproject/project.xml|  29 +++
 .../unit/data/testProject/public_html/test.html|  34 
 .../unit/data/testProject/public_html/test1.css|  34 
 .../unit/data/testProject/public_html/test2.css|  42 +
 .../modules/css}/editor/ProjectTestBase.java   |  88 -
 .../css/editor/csl/CssGotoDeclarationTest.java |  47 +
 .../modules/css/indexing/api/CssIndexTest.java | 197 -
 .../css/prep/editor/CPCssIndexModelTest.java   |  23 ++-
 .../refactoring/CPWhereUsedQueryPluginTest.java|   6 +-
 .../modules/parsing/lucene/support/Queries.java|  17 +-
 .../parsing/lucene/support/QueriesTest.java|  55 ++
 14 files changed, 506 insertions(+), 82 deletions(-)
 copy ide/{css.prep => 
css.editor}/test/unit/data/testProject/nbproject/project.properties (100%)
 create mode 100644 
ide/css.editor/test/unit/data/testProject/nbproject/project.xml
 create mode 100644 
ide/css.editor/test/unit/data/testProject/public_html/test.html
 create mode 100644 
ide/css.editor/test/unit/data/testProject/public_html/test1.css
 create mode 100644 
ide/css.editor/test/unit/data/testProject/public_html/test2.css
 rename ide/{css.prep/test/unit/src/org/netbeans/modules/css/prep => 
css.editor/test/unit/src/org/netbeans/modules/css}/editor/ProjectTestBase.java 
(87%)
 create mode 100644 
ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/csl/CssGotoDeclarationTest.java
 create mode 100644 
ide/parsing.lucene/test/unit/src/org/netbeans/modules/parsing/lucene/support/QueriesTest.java


-
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



[netbeans] branch master updated: [NETBEANS-5187] - cleanup Vector raw type warnings..

2020-12-28 Thread matthiasblaesing
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 0ada627  [NETBEANS-5187] - cleanup Vector raw type warnings..
 new f126988  Merge pull request #2611 from 
BradWalker/cleanup_vector_rawtype
0ada627 is described below

commit 0ada62723c782e1871458d23c93271a4971bf3a0
Author: Brad Walker 
AuthorDate: Sun Dec 27 19:50:46 2020 -0700

[NETBEANS-5187] - cleanup Vector raw type warnings..

Cleanup a bunch of the follow raw type warnings related to the use of 
Vector..

   [repeat] 
/home/bwalker/src/netbeans/enterprise/payara.eecommon/build/classes-generated/org/netbeans/modules/payara/eecommon/dd/impl/web/model_4/SessionConfig.java:22:
 warning: [rawtypes] found raw type: Vector
   [repeat] static Vector comparators = new Vector();
   [repeat] ^
   [repeat]   missing type arguments for generic class Vector
   [repeat]   where E is a type-variable:
   [repeat] E extends Object declared in class Vector

This check-in cleans up a lot of these..
---
 .../org/netbeans/modules/cpplite/debugger/CallStackModel.java  |  8 +++-
 .../org/netbeans/modules/cpplite/debugger/VariablesModel.java  |  8 +++-
 .../org/netbeans/modules/cpplite/debugger/WatchesModel.java|  8 +++-
 .../modules/cpplite/debugger/breakpoints/BreakpointModel.java  |  8 +++-
 .../modules/glassfish/eecommon/api/ProgressEventSupport.java   | 10 +-
 .../modules/glassfish/eecommon/api/VerifierSupport.java|  2 +-
 .../org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java |  4 ++--
 .../modules/j2ee/ddloaders/client/ClientDataObject.java|  4 ++--
 .../modules/payara/eecommon/api/ProgressEventSupport.java  |  2 +-
 .../netbeans/modules/payara/eecommon/api/VerifierSupport.java  |  2 +-
 .../org/netbeans/modules/web/monitor/client/Controller.java|  4 ++--
 .../src/org/netbeans/modules/web/monitor/data/ClientData.java  |  2 +-
 .../netbeans/modules/web/monitor/data/ContextAttributes.java   |  2 +-
 .../src/org/netbeans/modules/web/monitor/data/ContextData.java |  2 +-
 .../src/org/netbeans/modules/web/monitor/data/CookieIn.java|  2 +-
 .../src/org/netbeans/modules/web/monitor/data/CookieOut.java   |  2 +-
 .../src/org/netbeans/modules/web/monitor/data/CookiesData.java |  2 +-
 .../org/netbeans/modules/web/monitor/data/DispatchData.java|  2 +-
 .../src/org/netbeans/modules/web/monitor/data/Dispatches.java  |  2 +-
 .../src/org/netbeans/modules/web/monitor/data/EngineData.java  |  2 +-
 .../src/org/netbeans/modules/web/monitor/data/Headers.java |  4 ++--
 .../src/org/netbeans/modules/web/monitor/data/MonitorData.java |  2 +-
 .../src/org/netbeans/modules/web/monitor/data/Param.java   |  2 +-
 .../netbeans/modules/web/monitor/data/RequestAttributesIn.java |  2 +-
 .../modules/web/monitor/data/RequestAttributesOut.java |  2 +-
 .../src/org/netbeans/modules/web/monitor/data/RequestData.java |  4 ++--
 .../src/org/netbeans/modules/web/monitor/data/ServletData.java |  2 +-
 .../src/org/netbeans/modules/web/monitor/data/SessionData.java |  2 +-
 .../src/org/netbeans/modules/web/monitor/data/SessionIn.java   |  2 +-
 .../src/org/netbeans/modules/web/monitor/data/SessionOut.java  |  2 +-
 .../src/org/netbeans/spi/debugger/ActionsProviderSupport.java  |  6 +++---
 .../netbeans/modules/docker/ui/build2/BuildOptionsVisual.java  |  6 +++---
 .../modules/docker/ui/run/RunContainerPropertiesVisual.java|  6 +++---
 .../org/netbeans/modules/xml/catalog/CatalogMounterModel.java  |  2 +-
 .../xml/tax/beans/editor/TreeNodeFilterCustomEditor.java   |  8 
 ide/xml/src/org/netbeans/modules/xml/sync/SyncSupport.java |  2 +-
 ide/xsl/src/org/netbeans/modules/xsl/grammar/ResultNode.java   |  6 --
 .../src/org/netbeans/modules/ant/debugger/CallStackModel.java  |  8 +++-
 .../src/org/netbeans/modules/ant/debugger/VariablesModel.java  |  8 +++-
 .../src/org/netbeans/modules/ant/debugger/WatchesModel.java|  8 +++-
 .../modules/ant/debugger/breakpoints/BreakpointModel.java  |  8 +++-
 .../j2semodule/ui/customizer/J2SEModularProjectProperties.java |  2 +-
 .../java/j2seproject/ui/customizer/J2SEProjectProperties.java  |  2 +-
 .../nashorn/execution/options/JavaScriptNashornPanel.java  |  2 +-
 .../modules/xml/tools/java/generator/ElementBindings.java  |  2 +-
 45 files changed, 82 insertions(+), 96 deletions(-)

diff --git 
a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CallStackModel.java
 
b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CallStackModel.java
index e55eb9d..e11cf36 100644
--- 
a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CallStackModel.java
+++ 
b/cpplite

[netbeans] branch master updated: [NETBEANS-5185] - cleanup imports in the Enterprise Web.Monitor module

2020-12-27 Thread matthiasblaesing
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 f20ae08  [NETBEANS-5185] - cleanup imports in the Enterprise 
Web.Monitor module
 new 49f8d40  Merge pull request #2608 from BradWalker/cleanup_imports
f20ae08 is described below

commit f20ae082d7a1131388b4a1140e9ae67dea1f07cd
Author: Brad Walker 
AuthorDate: Fri Dec 25 14:16:12 2020 -0700

[NETBEANS-5185] - cleanup imports in the Enterprise Web.Monitor module

In cleaning up Vector raw types, I noticed a bunch of imports in the
Enterprise Web.Monitor module that could use some cleanup.

It's bad form to use the "*" when importing. It's pulls in every class in 
the import.

In addition, it can make modularization brought in from Project Jigsaw.
---
 .../modules/web/monitor/data/ClientData.java   | 14 +++-
 .../web/monitor/data/ContextAttributes.java| 17 +-
 .../modules/web/monitor/data/ContextData.java  | 15 -
 .../modules/web/monitor/data/CookieIn.java | 19 +---
 .../modules/web/monitor/data/CookieOut.java| 11 +
 .../modules/web/monitor/data/CookiesData.java  | 15 -
 .../modules/web/monitor/data/DispatchData.java | 18 ---
 .../modules/web/monitor/data/Dispatches.java   | 10 +
 .../modules/web/monitor/data/EngineData.java   | 14 +++-
 .../netbeans/modules/web/monitor/data/Headers.java | 18 ++-
 .../modules/web/monitor/data/MonitorData.java  | 26 +-
 .../netbeans/modules/web/monitor/data/Param.java   | 16 -
 .../web/monitor/data/RequestAttributesIn.java  | 17 +-
 .../web/monitor/data/RequestAttributesOut.java | 17 +-
 .../modules/web/monitor/data/RequestData.java  | 23 +--
 .../modules/web/monitor/data/ServletData.java  | 15 -
 .../modules/web/monitor/data/SessionData.java  | 15 -
 .../modules/web/monitor/data/SessionIn.java| 15 -
 .../modules/web/monitor/data/SessionOut.java   | 15 -
 19 files changed, 206 insertions(+), 104 deletions(-)

diff --git 
a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java
 
b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java
index 01b8c7f..82d8267 100644
--- 
a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java
+++ 
b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java
@@ -19,10 +19,14 @@
 
 package org.netbeans.modules.web.monitor.data;
 
-import org.w3c.dom.*;
-import org.netbeans.modules.schema2beans.*;
-import java.beans.*;
-import java.util.*;
+import java.beans.PropertyChangeListener;
+import java.util.Vector;
+
+import org.netbeans.modules.schema2beans.BaseBean;
+import org.netbeans.modules.schema2beans.BeanComparator;
+import org.netbeans.modules.schema2beans.BeanProp;
+import org.netbeans.modules.schema2beans.Common;
+import org.netbeans.modules.schema2beans.Version;
 
 public class ClientData extends BaseBean {
 
@@ -34,7 +38,7 @@ public class ClientData extends BaseBean {
 }
 
 public ClientData(int options) {
-   super(ClientData.comparators, new 
org.netbeans.modules.schema2beans.Version(1, 0, 6));
+   super(ClientData.comparators, new Version(1, 0, 6));
// Properties (see root bean comments for the bean graph)
this.initialize(options);
 }
diff --git 
a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java
 
b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java
index e03260d..7e208c5 100644
--- 
a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java
+++ 
b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java
@@ -29,10 +29,17 @@
  */
 
 package org.netbeans.modules.web.monitor.data;
-import org.w3c.dom.*;
-import org.netbeans.modules.schema2beans.*;
-import java.beans.*;
-import java.util.*;
+
+import java.beans.PropertyChangeListener;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import org.netbeans.modules.schema2beans.AttrProp;
+import org.netbeans.modules.schema2beans.BaseBean;
+import org.netbeans.modules.schema2beans.BeanComparator;
+import org.netbeans.modules.schema2beans.BeanProp;
+import org.netbeans.modules.schema2beans.Common;
+import org.netbeans.modules.schema2beans.Version;
 
 public class ContextAttributes extends BaseBean {
 
@@ -45,7 +52,7 @@ public class ContextAttributes extends BaseBean {
 }
 
 public ContextAttributes(int options) {
-   super(ContextAttributes.comparators, new 
org.netbeans.modules.schema2beans.Versi

[netbeans] branch master updated: [NETBEANS-5122] fix problem when selecting selenium test framework immediately modifies pom.xml

2020-12-24 Thread matthiasblaesing
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 694bd64  [NETBEANS-5122] fix problem when selecting selenium test 
framework immediately modifies pom.xml
 new e087135  Merge pull request #2607 from jherkel/netbeans-5122
694bd64 is described below

commit 694bd64832d94adb3237d7625769d81d1c0a8813
Author: Jakub Herkel 
AuthorDate: Mon Dec 21 19:33:46 2020 +0100

[NETBEANS-5122] fix problem when selecting selenium test framework 
immediately modifies pom.xml
---
 .../src/org/netbeans/modules/selenium2/api/Selenium2Support.java | 1 +
 .../org/netbeans/modules/selenium2/maven/Selenium2MavenSupportImpl.java  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/ide/selenium2/src/org/netbeans/modules/selenium2/api/Selenium2Support.java 
b/ide/selenium2/src/org/netbeans/modules/selenium2/api/Selenium2Support.java
index 94476ff..f63db3d 100644
--- a/ide/selenium2/src/org/netbeans/modules/selenium2/api/Selenium2Support.java
+++ b/ide/selenium2/src/org/netbeans/modules/selenium2/api/Selenium2Support.java
@@ -147,6 +147,7 @@ public final class Selenium2Support {
 Selenium2SupportImpl selenium2Support = 
Selenium2Support.findSelenium2Support(p);
 if (selenium2Support != null) {
 FileObject dir = context.getTargetFolder();
+selenium2Support.configureProject(dir);
 boolean singleClass = context.isSingleClass();
 if (singleClass) {
 FileObject seleniumTestFile = 
createSeleniumTestFile(selenium2Support, dir, context.getTestClassName());
diff --git 
a/java/selenium2.maven/src/org/netbeans/modules/selenium2/maven/Selenium2MavenSupportImpl.java
 
b/java/selenium2.maven/src/org/netbeans/modules/selenium2/maven/Selenium2MavenSupportImpl.java
index 3cff25f..19ad39e 100644
--- 
a/java/selenium2.maven/src/org/netbeans/modules/selenium2/maven/Selenium2MavenSupportImpl.java
+++ 
b/java/selenium2.maven/src/org/netbeans/modules/selenium2/maven/Selenium2MavenSupportImpl.java
@@ -187,7 +187,6 @@ public class Selenium2MavenSupportImpl extends 
Selenium2SupportImpl {
 
 @Override
 public List getTestSourceRoots(Collection 
createdSourceRoots, FileObject refFileObject) {
-configureProject(refFileObject);
 return Arrays.asList(Utils.getTestSourceRoots(createdSourceRoots, 
refFileObject));
 }
 


-
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



[netbeans-l10n] branch master updated: Update README.md

2020-12-21 Thread matthiasblaesing
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-l10n.git


The following commit(s) were added to refs/heads/master by this push:
 new 04e5735  Update README.md
 new 194f41f  Merge pull request #4 from borisheithecker/master
04e5735 is described below

commit 04e57356911f3ce6fa560e49148a5a30f0865584
Author: borisheithecker 
AuthorDate: Mon Dec 21 00:39:57 2020 +0100

Update README.md
---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 56ded6c..b2af732 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
 # netbeans-l10n
 
-Build l10nantext before building locale_de
+To build your own localization module, use the german module as template. Copy 
"local_de" and rename it (e. g. "locale_fr"). The locale needs to be available 
below netbeans-l10n-zip/src/. Then adapt `` 
in build.xml.
+
+Build l10nantext before building the locale. 


-
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



[netbeans] branch master updated: [NETBEANS-5142] LSP Client creates excessive processes (#2589)

2020-12-14 Thread matthiasblaesing
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 ebde2a5  [NETBEANS-5142] LSP Client creates excessive processes (#2589)
ebde2a5 is described below

commit ebde2a5904506dc10a035e8e4ef9adbc80889b02
Author: Matthias Bläsing 
AuthorDate: Mon Dec 14 21:12:57 2020 +0100

[NETBEANS-5142] LSP Client creates excessive processes (#2589)

The caching of the LSP client that is rooted in project2MimeType2Server
does not work. In the WeakHashMap the keys are help by weak references
and the key is invalidated, once it is GCed. The URIs that are used
as keys become immediately eligible for GC and thus the cache is not
used at all.

To fix this, use a regular HashMap with WeakReference values.

The LSP Clients themselves are either strongly referenced from other
components or can be collected. To not create excessive start/stops of
servers, an additional strong reference is retained for a certain time
after the last bind request was issued. Only after the timeout has
occured, that extra reference is released and the bindings could become
eligible for GC.
---
 .../netbeans/modules/lsp/client/LSPBindings.java   | 240 ++---
 .../lsp/client/options/LanguageStorage.java|   2 +-
 .../lsp/client/options/LanguageStorageTest.java|   2 +-
 3 files changed, 167 insertions(+), 77 deletions(-)

diff --git 
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java 
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java
index b65920a..8d87af3 100644
--- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java
+++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java
@@ -22,7 +22,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.net.InetAddress;
 import java.net.Socket;
@@ -32,6 +32,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -82,6 +83,7 @@ import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
 import org.openide.util.RequestProcessor;
 import org.openide.util.RequestProcessor.Task;
+import org.openide.util.Utilities;
 import org.openide.util.WeakListeners;
 import org.openide.util.lookup.Lookups;
 
@@ -91,17 +93,38 @@ import org.openide.util.lookup.Lookups;
  */
 public class LSPBindings {
 
+private static final int DELAY = 500;
+private static final int LSP_KEEP_ALIVE_MINUTES = 10;
+private static final RequestProcessor WORKER = new 
RequestProcessor(LanguageClientImpl.class.getName(), 1, false, false);
+private static final ChangeSupport cs = new 
ChangeSupport(LSPBindings.class);
+private static final Map lspKeepAlive = new 
IdentityHashMap<>();
+private static final Map>> 
project2MimeType2Server = new HashMap<>();
+private static final Map> 
workspace2Extension2Server = new HashMap<>();
+
 static {
 //Don't perform null checks. The servers may not adhere to the 
specification, and send illegal nulls.
 Preconditions.enableNullChecks(false);
-}
 
-private static final RequestProcessor WORKER = new 
RequestProcessor(LanguageClientImpl.class.getName(), 1, false, false);
-private static final int DELAY = 500;
+// Remove LSP Servers from strong reference tracking, that have not
+// been accessed more than LSP_KEEP_ALIVE_MINUTES minutes
+WORKER.scheduleAtFixedRate(
+() -> {
+synchronized (LSPBindings.class) {
+long tooOld = System.currentTimeMillis() - 
(LSP_KEEP_ALIVE_MINUTES * 60L * 1000L);
+Iterator> iterator = 
lspKeepAlive.entrySet().iterator();
+while (iterator.hasNext()) {
+Entry entry = iterator.next();
+if (entry.getValue() < tooOld) {
+iterator.remove();
+}
+}
+}
+},
+Math.max(LSP_KEEP_ALIVE_MINUTES / 2, 1),
+Math.max(LSP_KEEP_ALIVE_MINUTES / 2, 1),
+TimeUnit.MINUTES);
+}
 
-private static final ChangeSupport cs = new 
ChangeSupport(LSPBindings.class);
-private static final Map> 
project2MimeType2Server = new WeakHashMap<>();
-private static final Map> 
workspace2Extension2Server = new HashMap<>();
 private final Map> 
backgroundTasks = new WeakHash

[netbeans] branch master updated: Update JAXB from 2.2 to 2.3

2020-12-13 Thread matthiasblaesing
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 23e64e2  Update JAXB from 2.2 to 2.3
 new f8d7d41  Merge pull request #2586 from pepness/jaxb-2.3.1
23e64e2 is described below

commit 23e64e26db100b065a4bdaed0628b7514a601b0e
Author: Jose Contreras 
AuthorDate: Tue Aug 18 21:28:29 2020 -0500

Update JAXB from 2.2 to 2.3

- Add javac.compilerargs=-Xlint -Xlint:-serial
- Update licenses types
- Utilize 'jakarta.activation' instead of 'javax.activation'
- Utilize 'jakarta.xml.bind-api' instead of 'jaxb-api'
- Removed legacy technology dependency 'jaxb1-impl'
- Fix wrong jar name
---
 ide/libs.jaxb/external/binaries-list   |   7 +-
 .../jakarta.xml.bind-api-2.3.3-javadoc-license.txt |  36 ++
 .../external/jaxb-2.2.5-2-jaxb-license.txt | 355 
 .../external/jaxb-2.2.5-2-jaxb1-license.txt| 445 -
 ...-xjc-license.txt => jaxb-2.3.3-xjc-license.txt} |   6 +-
 ...doc-license.txt => jaxb-impl-2.3.3-license.txt} |   5 +-
 ide/libs.jaxb/nbproject/project.properties |  12 +-
 ide/libs.jaxb/nbproject/project.xml|   3 -
 .../src/org/netbeans/libs/jaxb/Bundle.properties   |   4 +-
 ide/libs.jaxb/src/org/netbeans/libs/jaxb/jaxb.xml  |   3 +-
 .../external/activation-1.1.1-license.txt  | 354 
 ide/xml.jaxb.api/external/binaries-list|   4 +-
 .../external/jakarta.activation-1.2.2-license.txt  |  36 ++
 .../jakarta.xml.bind-api-2.3.3-license.txt |  36 ++
 .../external/jaxb-api-2.2.6-license.txt| 354 
 ide/xml.jaxb.api/nbproject/project.properties  |   6 +-
 16 files changed, 132 insertions(+), 1534 deletions(-)

diff --git a/ide/libs.jaxb/external/binaries-list 
b/ide/libs.jaxb/external/binaries-list
index 505e38d..6269e8d 100644
--- a/ide/libs.jaxb/external/binaries-list
+++ b/ide/libs.jaxb/external/binaries-list
@@ -14,7 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-387BE740EAEF52B3F6E6EE2F140757E7632584CE com.sun.xml.bind:jaxb-impl:2.2.5-2
-F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3 com.sun.xml.bind:jaxb1-impl:2.2.5-2
-C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7 com.sun.xml.bind:jaxb-xjc:2.2.5-2
-DEA09C627DA5AA8FB0E6B1E39F85B2AE6AE9C3E7 javax.xml.bind:jaxb-api:2.2.5:javadoc
+3758E8C1664979749E647A9CA8C7EA1CD83C9B1E com.sun.xml.bind:jaxb-impl:2.3.3
+77E5784F53E865904BF91CFCD72CFC0AFD070486 com.sun.xml.bind:jaxb-xjc:2.3.3
+5685A1E75F9135DCC71E73A690B378E90FCD3B53 
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3:javadoc
diff --git 
a/ide/libs.jaxb/external/jakarta.xml.bind-api-2.3.3-javadoc-license.txt 
b/ide/libs.jaxb/external/jakarta.xml.bind-api-2.3.3-javadoc-license.txt
new file mode 100644
index 000..67ff1e2
--- /dev/null
+++ b/ide/libs.jaxb/external/jakarta.xml.bind-api-2.3.3-javadoc-license.txt
@@ -0,0 +1,36 @@
+Name: JAXB
+Description: Jakarta XML Binding API
+Version: 2.3.3
+Origin: Eclipse Foundation
+URL: https://projects.eclipse.org/projects/ee4j.jaxb-impl
+License: EDL-1.0
+Files: jakarta.xml.bind-api-2.3.3-javadoc.jar
+
+Eclipse Distribution License - v 1.0
+
+Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* 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.
+* Neither the name of the Eclipse Foundation, Inc. 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 COPYRIGHT OWNER 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

[netbeans] branch master updated: [NETBEANS-4827] Add EditorKit for TypeScript and add action for toggle comment

2020-12-13 Thread matthiasblaesing
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 fd9f6a8  [NETBEANS-4827] Add EditorKit for TypeScript and add action 
for toggle comment
 new f59e2ec  Merge pull request #2588 from matthiasblaesing/netbeans-4827
fd9f6a8 is described below

commit fd9f6a81e8c990b5d0c2e9651136808bf5b70c8a
Author: Matthias Bläsing 
AuthorDate: Fri Dec 11 19:57:39 2020 +0100

[NETBEANS-4827] Add EditorKit for TypeScript and add action for toggle 
comment
---
 webcommon/typescript.editor/nbproject/project.xml  | 18 +
 .../typescript/editor/TypeScriptEditorKit.java | 44 ++
 2 files changed, 62 insertions(+)

diff --git a/webcommon/typescript.editor/nbproject/project.xml 
b/webcommon/typescript.editor/nbproject/project.xml
index a7326c0..595d49c 100644
--- a/webcommon/typescript.editor/nbproject/project.xml
+++ b/webcommon/typescript.editor/nbproject/project.xml
@@ -34,6 +34,24 @@
 
 
 
+
org.netbeans.modules.editor
+
+
+
+3
+1.98
+
+
+
+
org.netbeans.modules.editor.lib
+
+
+
+3
+4.18
+
+
+
 
org.netbeans.modules.editor.mimelookup
 
 
diff --git 
a/webcommon/typescript.editor/src/org/netbeans/modules/typescript/editor/TypeScriptEditorKit.java
 
b/webcommon/typescript.editor/src/org/netbeans/modules/typescript/editor/TypeScriptEditorKit.java
new file mode 100644
index 000..d510fa0
--- /dev/null
+++ 
b/webcommon/typescript.editor/src/org/netbeans/modules/typescript/editor/TypeScriptEditorKit.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+package org.netbeans.modules.typescript.editor;
+
+import javax.swing.Action;
+import javax.swing.text.EditorKit;
+import javax.swing.text.TextAction;
+import org.netbeans.api.editor.mimelookup.MimeRegistration;
+import org.netbeans.modules.editor.NbEditorKit;
+
+@MimeRegistration(mimeType = TypeScriptEditorKit.TYPESCRIPT_MIME_TYPE, service 
= EditorKit.class)
+public class TypeScriptEditorKit extends NbEditorKit {
+
+public static final String TYPESCRIPT_MIME_TYPE = 
"application/x-typescript"; // NOI18N
+
+@Override
+public String getContentType() {
+return TYPESCRIPT_MIME_TYPE;
+}
+
+@Override
+protected Action[] createActions() {
+Action[]  actions = new Action[] {
+new ToggleCommentAction("//"), //NOI18N
+};
+return TextAction.augmentList(super.createActions(), actions);
+}
+}


-
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



[netbeans] branch master updated: [NETBEANS-4458] - enable use of generics

2020-12-11 Thread matthiasblaesing
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 534be04  [NETBEANS-4458] - enable use of generics
 new 38172f4  Merge pull request #2194 from BradWalker/enable_generics
534be04 is described below

commit 534be04f7bddd167d31068ad6d3f5162b0fd0380
Author: Brad Walker 
AuthorDate: Tue Jun 16 17:31:03 2020 -0600

[NETBEANS-4458] - enable use of generics

A lot of places in the code has generic use commented out.. For example, 
the following in
LayoutModel.java

 public void unsetSameSize(List/**/ components, int dimension) {
Iterator i = components.iterator();
while (i.hasNext()) {
String cid = (String)i.next();
LayoutComponent lc = getLayoutComponent(cid);
removeComponentFromLinkSizedGroup(lc, dimension);
}
}

All I've done here is enable it to reduce the warnings and test out the 
code to make sure it works correctly.
---
 .../modules/j2ee/earproject/ui/customizer/EarProjectProperties.java | 2 +-
 enterprise/j2ee.genericserver/nbproject/project.properties  | 2 +-
 .../src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanel.java  | 3 ++-
 .../modules/web/jsf/wizards/PersistenceClientSetupPanel.java| 2 +-
 .../netbeans/modules/web/jsf/wizards/TemplateClientPanelVisual.java | 2 +-
 .../src/org/netbeans/modules/xml/dtd/grammar/DTDParser.java | 2 +-
 .../modules/xml/text/structure/XMLDocumentModelProvider.java| 2 +-
 java/i18n.form/nbproject/project.properties | 2 +-
 .../persistence/wizard/jpacontroller/JpaControllerSetupPanel.java   | 2 +-
 .../test/unit/src/org/openide/filesystems/URLMapperTestHidden.java  | 2 +-
 .../src/org/netbeans/lib/profiler/heap/ClassDumpSegment.java| 6 +++---
 11 files changed, 14 insertions(+), 13 deletions(-)

diff --git 
a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java
 
b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java
index 4051e91..ce9c0f7 100644
--- 
a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java
+++ 
b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java
@@ -844,7 +844,7 @@ public final class EarProjectProperties {
 return;
 }
 
-for( Iterator/**/ it = spp.getSubprojects().iterator(); 
it.hasNext(); ) {
+for( Iterator it = spp.getSubprojects().iterator(); 
it.hasNext(); ) {
 Project sp = (Project) it.next();
 if (ProjectUtils.hasSubprojectCycles(project, sp)) {
 Logger.getLogger("global").log(Level.WARNING, "There would be 
cyclic " + // NOI18N
diff --git a/enterprise/j2ee.genericserver/nbproject/project.properties 
b/enterprise/j2ee.genericserver/nbproject/project.properties
index 44666d3..4d3d434 100644
--- a/enterprise/j2ee.genericserver/nbproject/project.properties
+++ b/enterprise/j2ee.genericserver/nbproject/project.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 javac.compilerargs=-Xlint:unchecked
-javac.source=1.6
+javac.source=1.8
diff --git 
a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanel.java
 
b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanel.java
index 6282338..138ce6c8 100644
--- 
a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanel.java
+++ 
b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/ManagedBeanPanel.java
@@ -123,7 +123,8 @@ final class ManagedBeanPanel implements 
WizardDescriptor.Panel, WizardDescriptor
 }
 return component.isAddBeanToConfig();
 }
-private final Set/**/ listeners = new HashSet(1);
+
+private final Set listeners = new HashSet<>(1);
 
 @Override
 public final void addChangeListener(ChangeListener l) {
diff --git 
a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientSetupPanel.java
 
b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientSetupPanel.java
index beea5d5..25f2e96 100644
--- 
a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientSetupPanel.java
+++ 
b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/PersistenceClientSetupPanel.java
@@ -72,7 +72,7 @@ final class PersistenceClientSetupPanel implements 
WizardDescriptor.Panel, Wizar
 return component.valid(wizardDescriptor);
 }
 
-private final Set/**/ listeners = new HashSet(1);
+private final Set listeners = new HashSet<>(

[netbeans] branch master updated (c9dc923 -> 81f31d3)

2020-12-09 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from c9dc923  Disable 7th and 8th stage of Maven compilation test in 
VSNetBeans. It started to fail for unknown reason after integration.
 new 3618b76  [NETBEANS-4289] Updated JGit to 5.7.0.202003110725
 new eac4b81  [NETBEANS-4289] Fix OSGI manifest of jgit for missing 
Import-Package of javax.management
 new 81f31d3  Merge pull request #2580 from matthiasblaesing/update-jgit

The 4724 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:
 .../libs/git/jgit/commands/TransportCommand.java   |  5 +
 .../org/netbeans/libs/git/jgit/ConnectionTest.java |  5 +
 ide/o.eclipse.jgit/build.xml   | 24 +-
 ide/o.eclipse.jgit/external/binaries-list  |  2 +-
 eclipse.jgit-5.7.0.202003110725-r-license.txt} |  2 +-
 ide/o.eclipse.jgit/nbproject/project.properties|  2 +-
 ide/o.eclipse.jgit/nbproject/project.xml   |  2 +-
 .../org/netbeans/nbbuild/extlibs/ignored-overlaps  |  1 +
 8 files changed, 38 insertions(+), 5 deletions(-)
 rename 
ide/o.eclipse.jgit/external/{org.eclipse.jgit-5.5.1.201910021850-r-license.txt 
=> org.eclipse.jgit-5.7.0.202003110725-r-license.txt} (98%)


-
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



[netbeans] branch master updated: Removing debug output.

2020-12-08 Thread matthiasblaesing
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 90787cc  Removing debug output.
 new 3697145  Merge pull request #2584 from jlahoda/remove-debug
90787cc is described below

commit 90787ccf1d2ad1669ea001b35c4fc20bfc3f341b
Author: Jan Lahoda 
AuthorDate: Tue Dec 8 06:55:46 2020 +0100

Removing debug output.
---
 .../src/org/netbeans/modules/lsp/client/bindings/CustomIndexerImpl.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CustomIndexerImpl.java
 
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CustomIndexerImpl.java
index 7c5c989..097e64f 100644
--- 
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CustomIndexerImpl.java
+++ 
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CustomIndexerImpl.java
@@ -58,7 +58,6 @@ public class CustomIndexerImpl extends CustomIndexer {
 }
 
 Set mimeTypes = new HashSet<>(props.values());
-System.err.println("mimeTypes=" + mimeTypes);
 Project prj = FileOwnerQuery.getOwner(root);
 
 if (prj != null) {


-
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



[netbeans] branch master updated: [NETBEANS-5057] JSF tag attribute help shows default value

2020-12-06 Thread matthiasblaesing
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 a4da33c  [NETBEANS-5057] JSF tag attribute help shows default value
 new fb89333  Merge pull request #2582 from e-Contract/jsf-editor
a4da33c is described below

commit a4da33c39f056bb0f244b72d495b393a9eb41b1a
Author: Frank Cornelis 
AuthorDate: Sat Dec 5 13:25:00 2020 +0100

[NETBEANS-5057] JSF tag attribute help shows default value
---
 .../modules/web/jsf/editor/completion/Bundle.properties  |  2 ++
 .../web/jsf/editor/completion/JsfCompletionItem.java | 16 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git 
a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/completion/Bundle.properties
 
b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/completion/Bundle.properties
index 146e1ae..be9d5f5 100644
--- 
a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/completion/Bundle.properties
+++ 
b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/completion/Bundle.properties
@@ -22,3 +22,5 @@ MSG_NoAttributeDescription=No Attribute Description Available
 MSG_Tag=Tag
 MSG_Type=Type
 MSG_Library=Library
+MSG_DefaultValue=Default Value
+MSG_MethodSignature=Method Signature
\ No newline at end of file
diff --git 
a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/completion/JsfCompletionItem.java
 
b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/completion/JsfCompletionItem.java
index d905b53..bb151e6 100644
--- 
a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/completion/JsfCompletionItem.java
+++ 
b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/completion/JsfCompletionItem.java
@@ -269,6 +269,20 @@ public class JsfCompletionItem {
 sb.append(attr.getType());
 sb.append(""); //NOI18N
 }
+if (attr.getMethodSignature() != null) {
+sb.append(""); //NOI18N
+sb.append(NbBundle.getMessage(JsfCompletionItem.class, 
"MSG_MethodSignature"));
+sb.append(": "); //NOI18N
+sb.append(attr.getMethodSignature());
+sb.append(""); //NOI18N
+}
+if (attr.getDefaultValue() != null) {
+sb.append(""); //NOI18N
+sb.append(NbBundle.getMessage(JsfCompletionItem.class, 
"MSG_DefaultValue"));
+sb.append(": "); //NOI18N
+sb.append(attr.getDefaultValue());
+sb.append(""); //NOI18N
+}
 if(attr.isRequired()) {
 sb.append("");
 sb.append(NbBundle.getMessage(JsfCompletionItem.class, 
"MSG_RequiredAttribute"));
@@ -307,7 +321,7 @@ public class JsfCompletionItem {
 if (library.getLegacyNamespace() != null) {
 sb.append(", ").append(library.getLegacyNamespace()); //NOI18N
 }
-if(library.getDisplayName() != null) {
+if (library.getDisplayName() != null && 
!library.getDisplayName().equals(library.getNamespace())) {
 sb.append(" ("); //NOI18N
 sb.append(library.getDisplayName());
 sb.append(")"); //NOI18N


-
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



[netbeans] branch master updated: Fix bug when adding to the potentially unmodifiable collection returned by original.select(URI).

2020-12-06 Thread matthiasblaesing
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 3914fb5  Fix bug when adding to the potentially unmodifiable 
collection returned by original.select(URI).
 new d8dfc52  Merge pull request #2579 from 
streamsim/do-not-try-to-add-to-an-potential-unmodifiablecollection
3914fb5 is described below

commit 3914fb5c870453bfa8a93b41e70c5c07523ba0b7
Author: Matteo Di Giovinazzo 
AuthorDate: Fri Dec 4 10:27:03 2020 -0700

Fix bug when adding to the potentially unmodifiable collection returned by 
original.select(URI).

Also always add to the res variable created at the beginning of the method.
---
 .../src/org/netbeans/core/network/proxy/NbProxySelector.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/platform/core.network/src/org/netbeans/core/network/proxy/NbProxySelector.java
 
b/platform/core.network/src/org/netbeans/core/network/proxy/NbProxySelector.java
index 394c39a..8143984 100644
--- 
a/platform/core.network/src/org/netbeans/core/network/proxy/NbProxySelector.java
+++ 
b/platform/core.network/src/org/netbeans/core/network/proxy/NbProxySelector.java
@@ -67,12 +67,12 @@ public final class NbProxySelector extends ProxySelector {
 int proxyType = ProxySettings.getProxyType ();
 switch (proxyType) {
 case ProxySettings.DIRECT_CONNECTION:
-res = Collections.singletonList (Proxy.NO_PROXY);
+res.add(Proxy.NO_PROXY);
 break;
 case ProxySettings.AUTO_DETECT_PROXY:
 if (useSystemProxies ()) {
 if (original != null) {
-res = original.select(uri);   
+res.addAll(original.select(uri));
 }
 } else {
 String protocol = uri.getScheme ();
@@ -145,7 +145,7 @@ public final class NbProxySelector extends ProxySelector {
 case ProxySettings.AUTO_DETECT_PAC:
 if (useSystemProxies ()) {
 if (original != null) {
-res = original.select(uri);   
+res.addAll(original.select(uri));
 }
 } else {
 ProxyAutoConfig pac = ProxyAutoConfig.get(getPacFile());


-
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



[netbeans] branch master updated (c6ba791 -> fcdaae8)

2020-12-04 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from c6ba791  Merge pull request #2557 from e-Contract/jsf-composite-lib-fix
 add fcdaae8  [NETBEANS-5057] improved help on JSF composite component 
attributes

No new revisions were added by this update.

Summary of changes:
 .../web/jsf/editor/completion/Bundle.properties |  3 +++
 .../jsf/editor/completion/JsfCompletionItem.java| 21 +
 .../editor/facelets/CompositeComponentLibrary.java  |  6 --
 3 files changed, 24 insertions(+), 6 deletions(-)


-
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



[netbeans] branch master updated: [NETBEANS-5057] fix for indexing composite components

2020-12-04 Thread matthiasblaesing
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 f351742  [NETBEANS-5057] fix for indexing composite components
 new c6ba791  Merge pull request #2557 from e-Contract/jsf-composite-lib-fix
f351742 is described below

commit f3517423d17cc1c945ea6e8ab47eabbe8f19f984
Author: Frank Cornelis 
AuthorDate: Mon Nov 23 09:32:13 2020 +0100

[NETBEANS-5057] fix for indexing composite components
---
 .../modules/web/jsf/editor/index/CompositeComponentModel.java | 2 +-
 .../org/netbeans/modules/web/jsf/editor/index/JsfBinaryIndexer.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/CompositeComponentModel.java
 
b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/CompositeComponentModel.java
index e96611b..c1962c7 100644
--- 
a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/CompositeComponentModel.java
+++ 
b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/CompositeComponentModel.java
@@ -270,7 +270,7 @@ public class CompositeComponentModel extends JsfPageModel {
 if (folder.getName().equalsIgnoreCase("resources")) { //NOI18N
 //check if its parent is META-INF
 FileObject parent = folder.getParent();
-if (parent != null && 
parent.getNameExt().startsWith("META-INF")) { //NOI18N
+if (parent != null && parent.getName().startsWith("META-INF")) 
{ //NOI18N
 //the folder seems to be the right resources folder
 return folder;
 }
diff --git 
a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/JsfBinaryIndexer.java
 
b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/JsfBinaryIndexer.java
index c0d87ad..14f1d7d 100644
--- 
a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/JsfBinaryIndexer.java
+++ 
b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/JsfBinaryIndexer.java
@@ -48,14 +48,14 @@ import org.openide.util.Exceptions;
  * @author marekfukala
  */
 @ConstrainedBinaryIndexer.Registration(
-namePattern = ".*\\.tld|.*\\.taglib\\.xml",
+namePattern = ".*\\.tld|.*\\.taglib\\.xml|.*\\.xhtml",
 indexVersion = JsfBinaryIndexer.INDEXER_VERSION,
 indexerName = JsfBinaryIndexer.INDEXER_NAME)
 public class JsfBinaryIndexer extends ConstrainedBinaryIndexer {
 
 private static final Logger LOGGER = 
Logger.getLogger(JsfBinaryIndexer.class.getSimpleName());
 private static final String CONTENT_UNKNOWN = "content/unknown";
//NOI18N
-static final int INDEXER_VERSION = 10; //NOI18N
+static final int INDEXER_VERSION = 11; //NOI18N
 static final String INDEXER_NAME = "jsfBinary"; //NOI18N
 
 @Override


-
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



[netbeans] branch master updated: [NETBEANS-5074] - cleanup ArrayList warnings..

2020-11-29 Thread matthiasblaesing
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 9f7f605  [NETBEANS-5074] - cleanup ArrayList warnings..
 new 29e61c8  Merge pull request #2566 from 
BradWalker/cleanup_arraylist_warnings
9f7f605 is described below

commit 9f7f605f325398e97929b77cf6e0cc177c2c1b27
Author: Brad Walker 
AuthorDate: Sat Nov 28 00:26:32 2020 -0700

[NETBEANS-5074] - cleanup ArrayList warnings..

This work cleans up a bunch of warnings surrounding the use of ArrayList..

For example:

   [repeat] 
/home/bwalker/src/netbeans/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/TabLayoutManager.java:245:
 warning: [unchecked] unchecked conversion
   [repeat] List[] rowIndexes = new 
ArrayList[rowCount];
   [repeat]  ^
   [repeat]   required: List[]
   [repeat]   found:ArrayList[]

ActionsManager.java was especially involved since one change would require 
another. And keeping track of
that, so as not to break things, was hard.
---
 .../modules/j2ee/ddloaders/app/EarDataObject.java  |  2 +-
 .../j2ee/ddloaders/client/ClientDataObject.java|  2 +-
 .../web.core.syntax/nbproject/project.properties   |  2 +-
 .../web/core/syntax/ErrorAnnotationImpl.java   | 13 +++---
 .../ui/NewWebFreeformProjectWizardIterator.java|  2 +-
 .../websvc/manager/ui/ReflectionHelper.java|  2 +-
 .../org/netbeans/api/debugger/ActionsManager.java  | 52 +-
 .../modules/bugtracking/issuetable/IssueTable.java |  4 +-
 .../modules/bugtracking/RepositoryImpl.java|  8 ++--
 .../storage/ui/CodeTemplatesModel.java |  2 +-
 .../modules/editor/fold/ui/ActionFactory.java  |  2 +-
 .../editor/settings/storage/StorageImpl.java   |  2 +-
 ide/html/nbproject/project.properties  |  2 +-
 .../debugger/ui/views/ViewModelListener.java   |  2 +-
 .../src/org/netbeans/modules/turbo/Turbo.java  |  2 +-
 .../modules/xml/api/model/GrammarQueryManager.java |  3 +-
 .../modules/xml/text/syntax/XMLSyntaxSupport.java  |  2 +-
 .../modules/xml/actions/CollectSystemAction.java   |  2 +-
 java/ant.freeform/nbproject/project.properties |  2 +-
 .../ant/freeform/ui/TargetMappingPanel.java|  2 +-
 .../modules/dbschema/DBMemoryCollection.java   |  2 +-
 .../jpda/ui/models/DebuggingMonitorModel.java  |  2 +-
 .../debugger/jpda/ThreadsCollectorImpl.java|  2 +-
 .../debugger/jpda/models/JPDAClassTypeImpl.java|  4 +-
 .../debugger/jpda/models/JPDAThreadImpl.java   |  2 +-
 .../modules/debugger/jpda/models/ThreadsCache.java |  4 +-
 .../modules/java/graph/DependencyGraphScene.java   | 10 ++---
 .../java/source/ui/OpenProjectFastIndex.java   |  8 ++--
 .../netbeans/modules/maven/graph/MavenAction.java  |  2 +-
 .../src/org/openide/nodes/BeanNode.java|  9 ++--
 .../src/org/openide/nodes/CookieSetLkp.java|  2 +-
 .../src/org/openide/nodes/FilterNode.java  |  2 +-
 .../src/org/openide/nodes/NodeLookup.java  |  5 ++-
 .../org/openide/util/TopologicalSortException.java |  2 +-
 .../org/openide/util/io/NbObjectOutputStream.java  |  2 +-
 .../profiler/oql/engine/api/impl/Snapshot.java |  2 +-
 36 files changed, 92 insertions(+), 78 deletions(-)

diff --git 
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java
 
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java
index a6cd1a5..39961ed 100644
--- 
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java
+++ 
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java
@@ -142,7 +142,7 @@ public class EarDataObject extends DD2beansDataObject
 }
 
 private void refreshSourceFolders () {
-ArrayList srcRootList = new ArrayList ();
+List srcRootList = new ArrayList<>();
 
 Project project = FileOwnerQuery.getOwner (getPrimaryFile ());
 if (project != null) {
diff --git 
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java
 
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java
index 9f59205..94e71b1 100644
--- 
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java
+++ 
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java
@@ -119,7 +119,7 @@ public class ClientDataObject extends  DDMultiViewDataObject
 }
 
 private void refreshSourceFolders() {
-ArrayList srcRootList = new ArrayList();
+List srcRootList = new ArrayList<>();
 
 Pro

[netbeans] branch master updated: [NETBEANS-5054] include web.bootsfaces in cluster.properties

2020-11-26 Thread matthiasblaesing
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 f16b89d  [NETBEANS-5054] include web.bootsfaces in cluster.properties
 new 70f688c  Merge pull request #2559 from t-oster/patch-1
f16b89d is described below

commit f16b89db542463c5ee1865746e53ee2085b3f5ba
Author: Thomas Oster 
AuthorDate: Wed Nov 25 07:56:36 2020 +0100

[NETBEANS-5054] include web.bootsfaces in cluster.properties
---
 nbbuild/cluster.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index b6fd92b..561812b 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -831,6 +831,7 @@ nb.cluster.enterprise=\
 spring.webmvc,\
 tomcat5,\
 web.beans,\
+web.bootsfaces,\
 web.client.rest,\
 web.core,\
 web.core.syntax,\


-
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



[netbeans] branch master updated: [NETBEANS-5066] - cleanup usage of EMPTY_MAP warnings..

2020-11-26 Thread matthiasblaesing
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 5f50835  [NETBEANS-5066] - cleanup usage of EMPTY_MAP warnings..
 new b84cf97  Merge pull request #2561 from 
BradWalker/cleanup_EMPTYMAP_warnings
5f50835 is described below

commit 5f508353549092d6083efc106264c93622f2a714
Author: Brad Walker 
AuthorDate: Thu Nov 26 00:59:41 2020 -0700

[NETBEANS-5066] - cleanup usage of EMPTY_MAP warnings..

In many places there are unchecked conversion warnings.. This change 
reduces these errors
when using Collections.EMPTY_MAP to a bare minimum..

For example,

   [repeat] 
/tmp/netbeans/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java:172:
 warning: [unchecked] unchecked conversion
   [repeat] result = Collections.EMPTY_MAP;
   [repeat] ^
   [repeat]   required: Map
   [repeat]   found:Map

Clean this up..
---
 .../web/jsf/impl/facesmodel/JSFConfigComponentImpl.java|  2 +-
 .../modules/websvc/rest/support/SourceGroupSupport.java|  2 +-
 .../src/org/netbeans/spi/debugger/ContextAwareSupport.java |  2 +-
 .../org/netbeans/modules/schema2beans/JavaBeansUtil.java   |  2 +-
 .../xml/text/structure/XMLDocumentModelProvider.java   | 14 +++---
 .../netbeans/modules/form/layoutdesign/LayoutUtils.java|  2 +-
 .../modules/j2ee/persistence/jpqleditor/JPQLExecutor.java  |  2 +-
 .../j2ee/persistence/provider/DataNucleusProvider.java |  2 +-
 .../modules/j2ee/persistence/provider/DefaultProvider.java |  4 ++--
 .../j2ee/persistence/provider/EclipseLinkProvider.java |  4 ++--
 .../j2ee/persistence/provider/HibernateProvider.java   |  2 +-
 .../modules/j2ee/persistence/provider/KodoProvider.java|  4 ++--
 .../modules/j2ee/persistence/provider/OpenJPAProvider.java |  4 ++--
 .../modules/j2ee/persistence/provider/ToplinkProvider.java |  4 ++--
 .../netbeans/modules/java/source/pretty/VeryPretty.java|  2 +-
 .../org/netbeans/actions/spi/ContextProviderSupport.java   |  2 +-
 .../src/org/netbeans/actions/spi/ProxyContextProvider.java |  2 +-
 .../modules/php/editor/parser/UnknownAnnotationLine.java   |  2 +-
 .../php/editor/parser/annotation/LinkParsedLine.java   |  2 +-
 .../modules/php/editor/parser/astnodes/PHPDocTag.java  |  2 +-
 .../src/org/openide/filesystems/XMLMapAttr.java|  2 +-
 .../profiler/results/cpu/StackTraceSnapshotBuilder.java|  5 +++--
 .../modules/javascript2/editor/JsCompletionItem.java   |  2 +-
 .../webkit/knockout/unused/UnusedBindingsPanel.java|  2 +-
 24 files changed, 37 insertions(+), 36 deletions(-)

diff --git 
a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentImpl.java
 
b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentImpl.java
index 7e512fe..1d95f72 100644
--- 
a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentImpl.java
+++ 
b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentImpl.java
@@ -101,7 +101,7 @@ public abstract class JSFConfigComponentImpl extends 
AbstractDocumentComponent <
 }
 
 protected Map getOrderedMapOfLocalNames(){
-return Collections.EMPTY_MAP;
+return Collections.emptyMap();
 }
 
 protected void reorderChildren(){
diff --git 
a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java
 
b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java
index d519a2a..454cc89 100644
--- 
a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java
+++ 
b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java
@@ -169,7 +169,7 @@ public class SourceGroupSupport {
 private static Map createFoldersToSourceGroupsMap(final SourceGroup[] 
sourceGroups) {
 Map result;
 if (sourceGroups.length == 0) {
-result = Collections.EMPTY_MAP;
+result = Collections.emptyMap();
 } else {
 result = new HashMap<>(2 * sourceGroups.length, .5f);
 for (int i = 0; i < sourceGroups.length; i++) {
diff --git 
a/ide/api.debugger/src/org/netbeans/spi/debugger/ContextAwareSupport.java 
b/ide/api.debugger/src/org/netbeans/spi/debugger/ContextAwareSupport.java
index f0fb9fe..f14f7d2 100644
--- a/ide/api.debugger/src/org/netbeans/spi/debugger/ContextAwareSupport.java
+++ b/ide/api.debugger/src/org/netbeans/spi/debugger/ContextAwareSupport.java
@@ -177,7 +177,7 @@ public final class ContextAwareSupport {
 Proxy.newProxyInstance(
   

[netbeans] branch master updated: [NETBEANS-5053] - cleanup Set raw type warnings..

2020-11-24 Thread matthiasblaesing
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 6ba5fdb  [NETBEANS-5053] - cleanup Set raw type warnings..
 new e990d2b  Merge pull request #2556 from 
BradWalker/cleanup_set_rawtype_warnings
6ba5fdb is described below

commit 6ba5fdb52a1653696559e4abc3b1c26ec72c4ba4
Author: Brad Walker 
AuthorDate: Sun Nov 22 20:32:29 2020 -0700

[NETBEANS-5053] - cleanup Set raw type warnings..

I am trying to cleanup a bunch of the Set raw type warnings.. They look 
like this..

   [repeat] 
/home/bwalker/src/netbeans/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/breakpoints/CPPLiteBreakpointActionProvider.java:50:
 warning: [rawtypes] found raw type: Set
   [repeat] private static final Set actions = Collections.singleton (
   [repeat]  ^
   [repeat]   missing type arguments for generic class Set
   [repeat]   where E is a type-variable:
   [repeat] E extends Object declared in interface Set

This change reduces the warnings dramatically. The ones remaining are in 
public interfaces
and it's beyond the scope for me to tackle that.. Hopefully, in the future.
---
 .../glassfish/javaee/Hk2OptionalFactory.java   |  2 +-
 .../javaee/templates/WebLogicDDWizardIterator.java |  2 +-
 .../j2ee/ejbrefactoring/EjbRefactoringPlugin.java  |  2 +-
 .../api/ant/ui/wizard/J2eeVersionWarningPanel.java |  2 +-
 .../api/ant/ui/wizard/ProjectServerPanel.java  |  4 +--
 .../eecommon/dd/wizard/PayaraDDWizardIterator.java |  2 +-
 .../websvc/manager/model/WebServiceListModel.java  |  2 +-
 .../websvc/rest/support/SourceGroupSupport.java|  6 ++--
 .../org/netbeans/insane/scanner/ScannerUtils.java  |  2 +-
 .../db/explorer/support/DatabaseExplorerUIs.java   |  2 +-
 .../debugger/ui/DebuggerManagerListener.java   |  2 +-
 .../modules/xml/dtd/grammar/DTDGrammar.java|  6 ++--
 .../beans/editor/TreeNodeFilterCustomEditor.java   |  4 +--
 .../modules/xsl/grammar/XSLGrammarQuery.java   | 34 +++---
 .../netbeans/modules/ant/debugger/AntDebugger.java |  5 ++--
 .../java/examples/J2SESampleProjectIterator.java   |  3 +-
 .../refactoring/InspectAndRefactorPanel.java   |  2 +-
 .../java/platform/ui/PlatformsCustomizer.java  |  4 +--
 .../source/queriesimpl/TemplateWizardIterator.java |  4 +--
 .../codegen/java/support/SourceGroupSupport.java   |  2 +-
 .../xml/tools/java/generator/GenerationUtils.java  |  2 +-
 .../core/startup/layers/LocalFileSystemEx.java |  2 +-
 .../org/openide/filesystems/MultiFileObject.java   |  4 +--
 .../org/openide/util/TopologicalSortException.java |  8 ++---
 .../NbModuleProjectProfilingSupportProvider.java   |  4 +--
 .../webkit/tooling/networkmonitor/ModelItem.java   |  9 +++---
 26 files changed, 60 insertions(+), 61 deletions(-)

diff --git 
a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java
 
b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java
index 45befb2..7a88505 100644
--- 
a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java
+++ 
b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java
@@ -232,7 +232,7 @@ public class Hk2OptionalFactory extends 
OptionalDeploymentManagerFactory {
 
 @Override
 public Set instantiate() throws IOException {
-Set set = delegate.instantiate();
+Set set = delegate.instantiate();
 if(!set.isEmpty()) {
 Object obj = set.iterator().next();
 if(obj instanceof ServerInstance) {
diff --git 
a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardIterator.java
 
b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardIterator.java
index 0d1c6e3..cbd398c 100644
--- 
a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardIterator.java
+++ 
b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardIterator.java
@@ -90,7 +90,7 @@ public final class WebLogicDDWizardIterator implements 
WizardDescriptor.Instanti
 
 @Override
 public Set instantiate() throws IOException {
-Set result = Collections.emptySet();
+Set result = Collections.emptySet();
 WebLogicDDWizardPanel wizardPanel = (WebLogicDDWizardPanel) panels[0];
 
 File configDir = wizardPanel.getSelectedLocation();
diff --git 
a/enterprise/j2ee.ejbrefactoring/src/org/netbeans/modules/j2ee/ejbrefactoring/EjbRefactoringPlugin.java
 
b/enterprise/j2ee.ejbrefactoring/src/org/netbeans/modules/j2ee/ejbrefactoring

[netbeans-tools] branch master updated: [NETBEANS-5039] Remove duplicate '/' from the download URL

2020-11-19 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 1c490ba  [NETBEANS-5039] Remove duplicate '/' from the download URL
 new eb4f254  Merge pull request #39 from junichi11/netbeans-5039
1c490ba is described below

commit 1c490bafa8adb88485394c6d835d51ab6b82bcc9
Author: junichi11 
AuthorDate: Thu Nov 19 14:11:30 2020 +0900

[NETBEANS-5039] Remove duplicate '/' from the download URL
---
 pp3/module/Application/src/Application/Pp/Catalog.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pp3/module/Application/src/Application/Pp/Catalog.php 
b/pp3/module/Application/src/Application/Pp/Catalog.php
index 0c0f216..0d34b48 100644
--- a/pp3/module/Application/src/Application/Pp/Catalog.php
+++ b/pp3/module/Application/src/Application/Pp/Catalog.php
@@ -177,7 +177,7 @@ class Catalog {
 $licenseSource = 
$moduleSource[0]->getElementsByTagName(self::LICENSE_ELEMENT);
 
 $moduleElement = $xml->createElement(self::MODULE_ELEMENT);
-$moduleElement->setAttribute(self::MODULE_ATTR_distribution, 
$this->_downloadPath.'/'.$item->getId().'/'.$item->getArtifactFilename());
+$moduleElement->setAttribute(self::MODULE_ATTR_distribution, 
rtrim($this->_downloadPath, 
'/').'/'.$item->getId().'/'.$item->getArtifactFilename());
 $moduleElement->setAttribute(self::MODULE_ATTR_downloadsize, 
intval($item->getArtifactSize()));
 foreach(self::MODULE_ATTRS as $attr) {
 if($moduleSource[0]->hasAttribute($attr)) {


-
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



[netbeans] branch master updated: Upgrade metro from 2.3.1 to 2.4.4

2020-11-16 Thread matthiasblaesing
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 08977a9  Upgrade metro from 2.3.1 to 2.4.4
 new f3d44fd  Merge pull request #2526 from pepness/metro-2.4.4
08977a9 is described below

commit 08977a941525a8977a3b94ca9728cb9e0fdd32b4
Author: Jose Contreras 
AuthorDate: Sat Aug 15 22:43:14 2020 -0500

Upgrade metro from 2.3.1 to 2.4.4
---
 enterprise/websvc.metro.lib/external/binaries-list |  20 +-
 .../external/metro-2.0-license.txt | 406 -
 .../external/metro-2.4.4-license.txt   |  35 ++
 .../websvc.metro.lib/nbproject/project.properties  |  23 +-
 .../modules/websvc/metro/lib/Bundle.properties |   6 +-
 .../netbeans/modules/websvc/metro/lib/metro.xml|  10 +-
 6 files changed, 65 insertions(+), 435 deletions(-)

diff --git a/enterprise/websvc.metro.lib/external/binaries-list 
b/enterprise/websvc.metro.lib/external/binaries-list
index d582095..11d6e9b 100644
--- a/enterprise/websvc.metro.lib/external/binaries-list
+++ b/enterprise/websvc.metro.lib/external/binaries-list
@@ -14,13 +14,13 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-3B8B390A393F10C62E12F996587300ECEF26D28A 
org.glassfish.metro:webservices-api:2.3.1
-9CFABDBB1F6EDBC1AE2916D2BA1F738981DE08B7 
org.glassfish.metro:webservices-extra:2.3.1
-259279ECB6920CE2186843F9F67858DC324323A3 
org.glassfish.metro:webservices-extra-api:2.3.1
-1D8E531F46CA89B33AE52FAA0B26635905018A2F 
org.glassfish.metro:webservices-rt:2.3.1
-83EB6E44F85D7308F9401829AF73330240A8C578 
org.glassfish.metro:webservices-tools:2.3.1
-F5BA7064C158139EF8CEE3B7EC082FB3CE4FD34A 
org.glassfish.metro:webservices-api:2.3.1:javadoc
-0299872063EEFBDF5A39677ED96C744266F0AA81 
org.glassfish.metro:webservices-extra:2.3.1:javadoc
-5F47E4BE63487869DF2C10ABDBD1F626512890B9 
org.glassfish.metro:webservices-extra-api:2.3.1:javadoc
-E128FBBA080246E05016398FD79FFFEF079C95CB 
org.glassfish.metro:webservices-rt:2.3.1:javadoc
-6203D4C5456B8B003A81AFB97954A8818A886444 
org.glassfish.metro:webservices-tools:2.3.1:javadoc
+5AC4C523E54635598BEA4AE2E022B6AAEB0EF033 
org.glassfish.metro:webservices-api:2.4.4
+D4B7C3207D05825E189E59943857FE56DFD77A65 
org.glassfish.metro:webservices-extra:2.4.4
+96BDAE9907C1E75B0271C0E076D3D0F8330F7EF9 
org.glassfish.metro:webservices-extra-api:2.4.4
+1DBCB66DC136E51536C92DC8C510888B853F6A34 
org.glassfish.metro:webservices-rt:2.4.4
+339CBADE626F7C4B6DB3AD3B243A6E076579E8A7 
org.glassfish.metro:webservices-tools:2.4.4
+741C18AA0D8349936C06A9D829750EB940105EB1 
org.glassfish.metro:webservices-api:2.4.4:javadoc
+B4CCA91692603CE46234A8B6974E31746B78451C 
org.glassfish.metro:webservices-extra:2.4.4:javadoc
+76CDDDC0CC849450124BFCB11954145C95B64B36 
org.glassfish.metro:webservices-extra-api:2.4.4:javadoc
+B4BE508CDFC0E0BA9DE8E26C16D97CC4F145C96E 
org.glassfish.metro:webservices-rt:2.4.4:javadoc
+40CC537B25BC564E4CDA3D8E99C90DCBCB1D2A29 
org.glassfish.metro:webservices-tools:2.4.4:javadoc
diff --git a/enterprise/websvc.metro.lib/external/metro-2.0-license.txt 
b/enterprise/websvc.metro.lib/external/metro-2.0-license.txt
deleted file mode 100644
index 39c36ae..000
--- a/enterprise/websvc.metro.lib/external/metro-2.0-license.txt
+++ /dev/null
@@ -1,406 +0,0 @@
-Name: METRO
-Version: 2.0
-Description: METRO
-License: CDDL-1.1
-Origin: Oracle (https://javaee.github.io/metro/)
-Files: webservices-api-2.3.1.jar, webservices-extra-2.3.1.jar, 
webservices-extra-api-2.3.1.jar, webservices-rt-2.3.1.jar, 
webservices-tools-2.3.1.jar, webservices-api-2.3.1-javadoc.jar, 
webservices-extra-2.3.1-javadoc.jar, webservices-extra-api-2.3.1-javadoc.jar, 
webservices-rt-2.3.1-javadoc.jar, webservices-tools-2.3.1-javadoc.jar
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
-
-1. Definitions.
-
-1.1. "Contributor" means each individual or entity that
-creates or contributes to the creation of Modifications.
-
-1.2. "Contributor Version" means the combination of the
-Original Software, prior Modifications used by a
-Contributor (if any), and the Modifications made by that
-particular Contributor.
-
-1.3. "Covered Software" means (a) the Original Software, or
-(b) Modifications, or (c) the combination of files
-containing Original Software with files containing
-Modifications, in each case including portions thereof.
-
-1.4. "Executable" means the Covered Software in any form
-other than Source Code.
-
-1.5. "Initial Developer" means the individual or entity
-that first makes Original Software available under this
-License.
-
-1.6. "Larger Work" means a work which combines Covered
-Software or portions thereof with code not governed by the
-terms of

[netbeans-tools] branch master updated: [NETBEANS-5013] Fix syntax error in plugin portal verification code

2020-11-13 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 90d2bbd  [NETBEANS-5013] Fix syntax error in plugin portal 
verification code
 new 6cb1c92  Merge pull request #37 from 
matthiasblaesing/pp3-fix-netbeans-5013
90d2bbd is described below

commit 90d2bbd10c40edf8760e0aacb91999045b5fb76c
Author: Matthias Bläsing 
AuthorDate: Fri Nov 13 22:40:53 2020 +0100

[NETBEANS-5013] Fix syntax error in plugin portal verification code
---
 .../Application/src/Application/Controller/VerificationController.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/pp3/module/Application/src/Application/Controller/VerificationController.php 
b/pp3/module/Application/src/Application/Controller/VerificationController.php
index e83ccd0..1a68c51 100644
--- 
a/pp3/module/Application/src/Application/Controller/VerificationController.php
+++ 
b/pp3/module/Application/src/Application/Controller/VerificationController.php
@@ -104,7 +104,7 @@ class VerificationController extends 
AuthenticatedController {
 $this->_sendNoGoNotification($req->getVerification(), $comment);
 } elseif ($verification->getStatus() == 
\Application\Entity\Verification::STATUS_GO) {
 $this->_sendGoNotification($req->getVerification(), $comment);
-$nbVersion = 
$verification->getNbVersionPluginVersion()->getNbVersion()->get;
+$nbVersion = 
$verification->getNbVersionPluginVersion()->getNbVersion();
 $nbVersion->requestCatalogRebuild();
 $this->_nbVersionRepository->persist($nbVersion);
 }


-
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



[netbeans-tools] branch master updated: [NETBEANS-5013] Fix syntax error in plugin portal verification code

2020-11-13 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 90d2bbd  [NETBEANS-5013] Fix syntax error in plugin portal 
verification code
 new 6cb1c92  Merge pull request #37 from 
matthiasblaesing/pp3-fix-netbeans-5013
90d2bbd is described below

commit 90d2bbd10c40edf8760e0aacb91999045b5fb76c
Author: Matthias Bläsing 
AuthorDate: Fri Nov 13 22:40:53 2020 +0100

[NETBEANS-5013] Fix syntax error in plugin portal verification code
---
 .../Application/src/Application/Controller/VerificationController.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/pp3/module/Application/src/Application/Controller/VerificationController.php 
b/pp3/module/Application/src/Application/Controller/VerificationController.php
index e83ccd0..1a68c51 100644
--- 
a/pp3/module/Application/src/Application/Controller/VerificationController.php
+++ 
b/pp3/module/Application/src/Application/Controller/VerificationController.php
@@ -104,7 +104,7 @@ class VerificationController extends 
AuthenticatedController {
 $this->_sendNoGoNotification($req->getVerification(), $comment);
 } elseif ($verification->getStatus() == 
\Application\Entity\Verification::STATUS_GO) {
 $this->_sendGoNotification($req->getVerification(), $comment);
-$nbVersion = 
$verification->getNbVersionPluginVersion()->getNbVersion()->get;
+$nbVersion = 
$verification->getNbVersionPluginVersion()->getNbVersion();
 $nbVersion->requestCatalogRebuild();
 $this->_nbVersionRepository->persist($nbVersion);
 }


-
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



[netbeans-tools] branch master updated: [NETBEANS-5013] Fix syntax error in plugin portal verification code

2020-11-13 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 90d2bbd  [NETBEANS-5013] Fix syntax error in plugin portal 
verification code
 new 6cb1c92  Merge pull request #37 from 
matthiasblaesing/pp3-fix-netbeans-5013
90d2bbd is described below

commit 90d2bbd10c40edf8760e0aacb91999045b5fb76c
Author: Matthias Bläsing 
AuthorDate: Fri Nov 13 22:40:53 2020 +0100

[NETBEANS-5013] Fix syntax error in plugin portal verification code
---
 .../Application/src/Application/Controller/VerificationController.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/pp3/module/Application/src/Application/Controller/VerificationController.php 
b/pp3/module/Application/src/Application/Controller/VerificationController.php
index e83ccd0..1a68c51 100644
--- 
a/pp3/module/Application/src/Application/Controller/VerificationController.php
+++ 
b/pp3/module/Application/src/Application/Controller/VerificationController.php
@@ -104,7 +104,7 @@ class VerificationController extends 
AuthenticatedController {
 $this->_sendNoGoNotification($req->getVerification(), $comment);
 } elseif ($verification->getStatus() == 
\Application\Entity\Verification::STATUS_GO) {
 $this->_sendGoNotification($req->getVerification(), $comment);
-$nbVersion = 
$verification->getNbVersionPluginVersion()->getNbVersion()->get;
+$nbVersion = 
$verification->getNbVersionPluginVersion()->getNbVersion();
 $nbVersion->requestCatalogRebuild();
 $this->_nbVersionRepository->persist($nbVersion);
 }


-
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



[netbeans-tools] branch master updated: [NETBEANS-5013] Fix syntax error in plugin portal verification code

2020-11-13 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 90d2bbd  [NETBEANS-5013] Fix syntax error in plugin portal 
verification code
 new 6cb1c92  Merge pull request #37 from 
matthiasblaesing/pp3-fix-netbeans-5013
90d2bbd is described below

commit 90d2bbd10c40edf8760e0aacb91999045b5fb76c
Author: Matthias Bläsing 
AuthorDate: Fri Nov 13 22:40:53 2020 +0100

[NETBEANS-5013] Fix syntax error in plugin portal verification code
---
 .../Application/src/Application/Controller/VerificationController.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/pp3/module/Application/src/Application/Controller/VerificationController.php 
b/pp3/module/Application/src/Application/Controller/VerificationController.php
index e83ccd0..1a68c51 100644
--- 
a/pp3/module/Application/src/Application/Controller/VerificationController.php
+++ 
b/pp3/module/Application/src/Application/Controller/VerificationController.php
@@ -104,7 +104,7 @@ class VerificationController extends 
AuthenticatedController {
 $this->_sendNoGoNotification($req->getVerification(), $comment);
 } elseif ($verification->getStatus() == 
\Application\Entity\Verification::STATUS_GO) {
 $this->_sendGoNotification($req->getVerification(), $comment);
-$nbVersion = 
$verification->getNbVersionPluginVersion()->getNbVersion()->get;
+$nbVersion = 
$verification->getNbVersionPluginVersion()->getNbVersion();
 $nbVersion->requestCatalogRebuild();
 $this->_nbVersionRepository->persist($nbVersion);
 }


-
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



[netbeans-tools] branch master updated: [NETBEANS-5013] Fix syntax error in plugin portal verification code

2020-11-13 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 90d2bbd  [NETBEANS-5013] Fix syntax error in plugin portal 
verification code
 new 6cb1c92  Merge pull request #37 from 
matthiasblaesing/pp3-fix-netbeans-5013
90d2bbd is described below

commit 90d2bbd10c40edf8760e0aacb91999045b5fb76c
Author: Matthias Bläsing 
AuthorDate: Fri Nov 13 22:40:53 2020 +0100

[NETBEANS-5013] Fix syntax error in plugin portal verification code
---
 .../Application/src/Application/Controller/VerificationController.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/pp3/module/Application/src/Application/Controller/VerificationController.php 
b/pp3/module/Application/src/Application/Controller/VerificationController.php
index e83ccd0..1a68c51 100644
--- 
a/pp3/module/Application/src/Application/Controller/VerificationController.php
+++ 
b/pp3/module/Application/src/Application/Controller/VerificationController.php
@@ -104,7 +104,7 @@ class VerificationController extends 
AuthenticatedController {
 $this->_sendNoGoNotification($req->getVerification(), $comment);
 } elseif ($verification->getStatus() == 
\Application\Entity\Verification::STATUS_GO) {
 $this->_sendGoNotification($req->getVerification(), $comment);
-$nbVersion = 
$verification->getNbVersionPluginVersion()->getNbVersion()->get;
+$nbVersion = 
$verification->getNbVersionPluginVersion()->getNbVersion();
 $nbVersion->requestCatalogRebuild();
 $this->_nbVersionRepository->persist($nbVersion);
 }


-
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



[netbeans-tools] branch master updated: Add option to force regeneration of catalogs

2020-11-10 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 4ea7246  Add option to force regeneration of catalogs
4ea7246 is described below

commit 4ea724675d36a65ebc2c07f7df3795e2f56391e6
Author: Matthias Bläsing 
AuthorDate: Tue Nov 10 21:13:52 2020 +0100

Add option to force regeneration of catalogs
---
 pp3/module/Application/config/module.config.php.dist | 2 +-
 .../Application/src/Application/Controller/CliController.php | 9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pp3/module/Application/config/module.config.php.dist 
b/pp3/module/Application/config/module.config.php.dist
index d5c3fba..5dafbfb 100755
--- a/pp3/module/Application/config/module.config.php.dist
+++ b/pp3/module/Application/config/module.config.php.dist
@@ -258,7 +258,7 @@ return array(
 'routes' => array(
 'generate-catalogs' => array(
 'options' => array(
-'route' => 'generate-catalogs',
+'route' => 'generate-catalogs [--force]',
 'defaults' => array(
 '__NAMESPACE__' => 'Application\Controller',
 'controller' => 'Cli',
diff --git 
a/pp3/module/Application/src/Application/Controller/CliController.php 
b/pp3/module/Application/src/Application/Controller/CliController.php
index d50bb88..6f9f3df 100644
--- a/pp3/module/Application/src/Application/Controller/CliController.php
+++ b/pp3/module/Application/src/Application/Controller/CliController.php
@@ -48,18 +48,19 @@ class CliController extends BaseController {
 }
 
 public function generateCatalogsAction() {
+$force = $this->request->getParams()->get('force');
 printf("Regenerating catalogs " . ((new 
\DateTime('now'))->format("Y-m-d\TH:i:sO")). "\n");
 $versions = 
$this->_nbVersionRepository->getEntityRepository()->findAll();
 foreach ($versions as $v) {
-$this->createCatalog($v, true);
-$this->createCatalog($v, false);
+$this->createCatalog($v, true, $force);
+$this->createCatalog($v, false, $force);
 
 $v->markCatalogRebuild();
 $this->_nbVersionRepository->persist($v);
 }
 }
 
-private function createCatalog(\Application\Entity\NbVersion $version, 
$experimental) {
+private function createCatalog(\Application\Entity\NbVersion $version, 
$experimental, $force) {
 if ($experimental) {
 $items = 
$this->_pluginVersionRepository->getNonVerifiedVersionsByNbVersion($version->getVersion(),
 true);
 } else {
@@ -83,6 +84,8 @@ class CliController extends BaseController {
 
 $rebuildNeeded |= (! $catalog->catalogFileExits());
 
+$rebuildNeeded |= $force;
+
 if (! $rebuildNeeded) {
 printf("Skipping %scatalog for %s\n", $experimental ? 
'experimental ' : '', $version->getVersion());
 return;


-
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



[netbeans-tools] branch master updated: Add option to force regeneration of catalogs

2020-11-10 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 4ea7246  Add option to force regeneration of catalogs
4ea7246 is described below

commit 4ea724675d36a65ebc2c07f7df3795e2f56391e6
Author: Matthias Bläsing 
AuthorDate: Tue Nov 10 21:13:52 2020 +0100

Add option to force regeneration of catalogs
---
 pp3/module/Application/config/module.config.php.dist | 2 +-
 .../Application/src/Application/Controller/CliController.php | 9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pp3/module/Application/config/module.config.php.dist 
b/pp3/module/Application/config/module.config.php.dist
index d5c3fba..5dafbfb 100755
--- a/pp3/module/Application/config/module.config.php.dist
+++ b/pp3/module/Application/config/module.config.php.dist
@@ -258,7 +258,7 @@ return array(
 'routes' => array(
 'generate-catalogs' => array(
 'options' => array(
-'route' => 'generate-catalogs',
+'route' => 'generate-catalogs [--force]',
 'defaults' => array(
 '__NAMESPACE__' => 'Application\Controller',
 'controller' => 'Cli',
diff --git 
a/pp3/module/Application/src/Application/Controller/CliController.php 
b/pp3/module/Application/src/Application/Controller/CliController.php
index d50bb88..6f9f3df 100644
--- a/pp3/module/Application/src/Application/Controller/CliController.php
+++ b/pp3/module/Application/src/Application/Controller/CliController.php
@@ -48,18 +48,19 @@ class CliController extends BaseController {
 }
 
 public function generateCatalogsAction() {
+$force = $this->request->getParams()->get('force');
 printf("Regenerating catalogs " . ((new 
\DateTime('now'))->format("Y-m-d\TH:i:sO")). "\n");
 $versions = 
$this->_nbVersionRepository->getEntityRepository()->findAll();
 foreach ($versions as $v) {
-$this->createCatalog($v, true);
-$this->createCatalog($v, false);
+$this->createCatalog($v, true, $force);
+$this->createCatalog($v, false, $force);
 
 $v->markCatalogRebuild();
 $this->_nbVersionRepository->persist($v);
 }
 }
 
-private function createCatalog(\Application\Entity\NbVersion $version, 
$experimental) {
+private function createCatalog(\Application\Entity\NbVersion $version, 
$experimental, $force) {
 if ($experimental) {
 $items = 
$this->_pluginVersionRepository->getNonVerifiedVersionsByNbVersion($version->getVersion(),
 true);
 } else {
@@ -83,6 +84,8 @@ class CliController extends BaseController {
 
 $rebuildNeeded |= (! $catalog->catalogFileExits());
 
+$rebuildNeeded |= $force;
+
 if (! $rebuildNeeded) {
 printf("Skipping %scatalog for %s\n", $experimental ? 
'experimental ' : '', $version->getVersion());
 return;


-
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



[netbeans-tools] branch master updated: Add option to force regeneration of catalogs

2020-11-10 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 4ea7246  Add option to force regeneration of catalogs
4ea7246 is described below

commit 4ea724675d36a65ebc2c07f7df3795e2f56391e6
Author: Matthias Bläsing 
AuthorDate: Tue Nov 10 21:13:52 2020 +0100

Add option to force regeneration of catalogs
---
 pp3/module/Application/config/module.config.php.dist | 2 +-
 .../Application/src/Application/Controller/CliController.php | 9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pp3/module/Application/config/module.config.php.dist 
b/pp3/module/Application/config/module.config.php.dist
index d5c3fba..5dafbfb 100755
--- a/pp3/module/Application/config/module.config.php.dist
+++ b/pp3/module/Application/config/module.config.php.dist
@@ -258,7 +258,7 @@ return array(
 'routes' => array(
 'generate-catalogs' => array(
 'options' => array(
-'route' => 'generate-catalogs',
+'route' => 'generate-catalogs [--force]',
 'defaults' => array(
 '__NAMESPACE__' => 'Application\Controller',
 'controller' => 'Cli',
diff --git 
a/pp3/module/Application/src/Application/Controller/CliController.php 
b/pp3/module/Application/src/Application/Controller/CliController.php
index d50bb88..6f9f3df 100644
--- a/pp3/module/Application/src/Application/Controller/CliController.php
+++ b/pp3/module/Application/src/Application/Controller/CliController.php
@@ -48,18 +48,19 @@ class CliController extends BaseController {
 }
 
 public function generateCatalogsAction() {
+$force = $this->request->getParams()->get('force');
 printf("Regenerating catalogs " . ((new 
\DateTime('now'))->format("Y-m-d\TH:i:sO")). "\n");
 $versions = 
$this->_nbVersionRepository->getEntityRepository()->findAll();
 foreach ($versions as $v) {
-$this->createCatalog($v, true);
-$this->createCatalog($v, false);
+$this->createCatalog($v, true, $force);
+$this->createCatalog($v, false, $force);
 
 $v->markCatalogRebuild();
 $this->_nbVersionRepository->persist($v);
 }
 }
 
-private function createCatalog(\Application\Entity\NbVersion $version, 
$experimental) {
+private function createCatalog(\Application\Entity\NbVersion $version, 
$experimental, $force) {
 if ($experimental) {
 $items = 
$this->_pluginVersionRepository->getNonVerifiedVersionsByNbVersion($version->getVersion(),
 true);
 } else {
@@ -83,6 +84,8 @@ class CliController extends BaseController {
 
 $rebuildNeeded |= (! $catalog->catalogFileExits());
 
+$rebuildNeeded |= $force;
+
 if (! $rebuildNeeded) {
 printf("Skipping %scatalog for %s\n", $experimental ? 
'experimental ' : '', $version->getVersion());
 return;


-
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



[netbeans-tools] branch master updated: Add option to force regeneration of catalogs

2020-11-10 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 4ea7246  Add option to force regeneration of catalogs
4ea7246 is described below

commit 4ea724675d36a65ebc2c07f7df3795e2f56391e6
Author: Matthias Bläsing 
AuthorDate: Tue Nov 10 21:13:52 2020 +0100

Add option to force regeneration of catalogs
---
 pp3/module/Application/config/module.config.php.dist | 2 +-
 .../Application/src/Application/Controller/CliController.php | 9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pp3/module/Application/config/module.config.php.dist 
b/pp3/module/Application/config/module.config.php.dist
index d5c3fba..5dafbfb 100755
--- a/pp3/module/Application/config/module.config.php.dist
+++ b/pp3/module/Application/config/module.config.php.dist
@@ -258,7 +258,7 @@ return array(
 'routes' => array(
 'generate-catalogs' => array(
 'options' => array(
-'route' => 'generate-catalogs',
+'route' => 'generate-catalogs [--force]',
 'defaults' => array(
 '__NAMESPACE__' => 'Application\Controller',
 'controller' => 'Cli',
diff --git 
a/pp3/module/Application/src/Application/Controller/CliController.php 
b/pp3/module/Application/src/Application/Controller/CliController.php
index d50bb88..6f9f3df 100644
--- a/pp3/module/Application/src/Application/Controller/CliController.php
+++ b/pp3/module/Application/src/Application/Controller/CliController.php
@@ -48,18 +48,19 @@ class CliController extends BaseController {
 }
 
 public function generateCatalogsAction() {
+$force = $this->request->getParams()->get('force');
 printf("Regenerating catalogs " . ((new 
\DateTime('now'))->format("Y-m-d\TH:i:sO")). "\n");
 $versions = 
$this->_nbVersionRepository->getEntityRepository()->findAll();
 foreach ($versions as $v) {
-$this->createCatalog($v, true);
-$this->createCatalog($v, false);
+$this->createCatalog($v, true, $force);
+$this->createCatalog($v, false, $force);
 
 $v->markCatalogRebuild();
 $this->_nbVersionRepository->persist($v);
 }
 }
 
-private function createCatalog(\Application\Entity\NbVersion $version, 
$experimental) {
+private function createCatalog(\Application\Entity\NbVersion $version, 
$experimental, $force) {
 if ($experimental) {
 $items = 
$this->_pluginVersionRepository->getNonVerifiedVersionsByNbVersion($version->getVersion(),
 true);
 } else {
@@ -83,6 +84,8 @@ class CliController extends BaseController {
 
 $rebuildNeeded |= (! $catalog->catalogFileExits());
 
+$rebuildNeeded |= $force;
+
 if (! $rebuildNeeded) {
 printf("Skipping %scatalog for %s\n", $experimental ? 
'experimental ' : '', $version->getVersion());
 return;


-
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



[netbeans-tools] branch master updated: Add option to force regeneration of catalogs

2020-11-10 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 4ea7246  Add option to force regeneration of catalogs
4ea7246 is described below

commit 4ea724675d36a65ebc2c07f7df3795e2f56391e6
Author: Matthias Bläsing 
AuthorDate: Tue Nov 10 21:13:52 2020 +0100

Add option to force regeneration of catalogs
---
 pp3/module/Application/config/module.config.php.dist | 2 +-
 .../Application/src/Application/Controller/CliController.php | 9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pp3/module/Application/config/module.config.php.dist 
b/pp3/module/Application/config/module.config.php.dist
index d5c3fba..5dafbfb 100755
--- a/pp3/module/Application/config/module.config.php.dist
+++ b/pp3/module/Application/config/module.config.php.dist
@@ -258,7 +258,7 @@ return array(
 'routes' => array(
 'generate-catalogs' => array(
 'options' => array(
-'route' => 'generate-catalogs',
+'route' => 'generate-catalogs [--force]',
 'defaults' => array(
 '__NAMESPACE__' => 'Application\Controller',
 'controller' => 'Cli',
diff --git 
a/pp3/module/Application/src/Application/Controller/CliController.php 
b/pp3/module/Application/src/Application/Controller/CliController.php
index d50bb88..6f9f3df 100644
--- a/pp3/module/Application/src/Application/Controller/CliController.php
+++ b/pp3/module/Application/src/Application/Controller/CliController.php
@@ -48,18 +48,19 @@ class CliController extends BaseController {
 }
 
 public function generateCatalogsAction() {
+$force = $this->request->getParams()->get('force');
 printf("Regenerating catalogs " . ((new 
\DateTime('now'))->format("Y-m-d\TH:i:sO")). "\n");
 $versions = 
$this->_nbVersionRepository->getEntityRepository()->findAll();
 foreach ($versions as $v) {
-$this->createCatalog($v, true);
-$this->createCatalog($v, false);
+$this->createCatalog($v, true, $force);
+$this->createCatalog($v, false, $force);
 
 $v->markCatalogRebuild();
 $this->_nbVersionRepository->persist($v);
 }
 }
 
-private function createCatalog(\Application\Entity\NbVersion $version, 
$experimental) {
+private function createCatalog(\Application\Entity\NbVersion $version, 
$experimental, $force) {
 if ($experimental) {
 $items = 
$this->_pluginVersionRepository->getNonVerifiedVersionsByNbVersion($version->getVersion(),
 true);
 } else {
@@ -83,6 +84,8 @@ class CliController extends BaseController {
 
 $rebuildNeeded |= (! $catalog->catalogFileExits());
 
+$rebuildNeeded |= $force;
+
 if (! $rebuildNeeded) {
 printf("Skipping %scatalog for %s\n", $experimental ? 
'experimental ' : '', $version->getVersion());
 return;


-
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



[netbeans-tools] branch master updated: Fix version incompatibilities (Testsystem has too recent version of PHP to notice)

2020-11-10 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 1416247  Fix version incompatibilities (Testsystem has too recent 
version of PHP to notice)
1416247 is described below

commit 1416247f809f59a536df39455423d188afcb2e50
Author: Matthias Bläsing 
AuthorDate: Tue Nov 10 21:00:42 2020 +0100

Fix version incompatibilities (Testsystem has too recent version of PHP to 
notice)
---
 pp3/module/Application/src/Application/Controller/CliController.php | 2 +-
 pp3/module/Application/src/Application/Entity/Base/NbVersion.php| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/pp3/module/Application/src/Application/Controller/CliController.php 
b/pp3/module/Application/src/Application/Controller/CliController.php
index 9d24b07..d50bb88 100644
--- a/pp3/module/Application/src/Application/Controller/CliController.php
+++ b/pp3/module/Application/src/Application/Controller/CliController.php
@@ -48,7 +48,7 @@ class CliController extends BaseController {
 }
 
 public function generateCatalogsAction() {
-printf("Regenerating catalogs " . ((new 
\DateTime('now'))->format(\DateTimeInterface::ISO8601)). "\n");
+printf("Regenerating catalogs " . ((new 
\DateTime('now'))->format("Y-m-d\TH:i:sO")). "\n");
 $versions = 
$this->_nbVersionRepository->getEntityRepository()->findAll();
 foreach ($versions as $v) {
 $this->createCatalog($v, true);
diff --git a/pp3/module/Application/src/Application/Entity/Base/NbVersion.php 
b/pp3/module/Application/src/Application/Entity/Base/NbVersion.php
index 00a3d83..9ccfa8a 100644
--- a/pp3/module/Application/src/Application/Entity/Base/NbVersion.php
+++ b/pp3/module/Application/src/Application/Entity/Base/NbVersion.php
@@ -83,7 +83,7 @@ class NbVersion {
 return $this->nbVersionsPluginVersions;
 }
 
-function getCatalogRebuildRequested(): \DateTime {
+function getCatalogRebuildRequested() {
 return $this->catalog_rebuild_requested;
 }
 
@@ -91,7 +91,7 @@ class NbVersion {
 $this->catalog_rebuild_requested = $catalog_rebuild_requested;
 }
 
-function getCatalogRebuild(): \DateTime {
+function getCatalogRebuild() {
 return $this->catalog_rebuild;
 }
 


-
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



[netbeans-tools] branch master updated: Add missing dtd files for autoupdate info (version 2.0, 2.2 + 2.3)

2020-11-10 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new d4b540a  Add missing dtd files for autoupdate info (version 2.0, 2.2 + 
2.3)
d4b540a is described below

commit d4b540a8bc119f4d5ef95f8258d8e611dc59c886
Author: Matthias Bläsing 
AuthorDate: Tue Nov 10 20:50:36 2020 +0100

Add missing dtd files for autoupdate info (version 2.0, 2.2 + 2.3)
---
 .../Application/src/Application/Pp/Catalog.php |  6 ++
 pp3/public/dtd/autoupdate-info-2_0.dtd | 68 +
 pp3/public/dtd/autoupdate-info-2_2.dtd | 70 +
 pp3/public/dtd/autoupdate-info-2_3.dtd | 71 ++
 4 files changed, 215 insertions(+)

diff --git a/pp3/module/Application/src/Application/Pp/Catalog.php 
b/pp3/module/Application/src/Application/Pp/Catalog.php
index f3abdf3..0c0f216 100644
--- a/pp3/module/Application/src/Application/Pp/Catalog.php
+++ b/pp3/module/Application/src/Application/Pp/Catalog.php
@@ -114,6 +114,12 @@ class Catalog {
 function ($public, $system, $context) {
 if($public === '-//NetBeans//DTD Autoupdate Catalog 2.8//EN') {
 return __DIR__ . 
"/../../../../../public/dtd/autoupdate-catalog-2_8.dtd";
+} else if($public === '-//NetBeans//DTD Autoupdate Module Info 
2.0//EN') {
+return __DIR__ . 
"/../../../../../public/dtd/autoupdate-info-2_0.dtd";
+} else if($public === '-//NetBeans//DTD Autoupdate Module Info 
2.2//EN') {
+return __DIR__ . 
"/../../../../../public/dtd/autoupdate-info-2_2.dtd";
+} else if($public === '-//NetBeans//DTD Autoupdate Module Info 
2.3//EN') {
+return __DIR__ . 
"/../../../../../public/dtd/autoupdate-info-2_3.dtd";
 } else if($public === '-//NetBeans//DTD Autoupdate Module Info 
2.4//EN') {
 return __DIR__ . 
"/../../../../../public/dtd/autoupdate-info-2_4.dtd";
 } else if($public === '-//NetBeans//DTD Autoupdate Module Info 
2.5//EN') {
diff --git a/pp3/public/dtd/autoupdate-info-2_0.dtd 
b/pp3/public/dtd/autoupdate-info-2_0.dtd
new file mode 100644
index 000..a1d7bd1
--- /dev/null
+++ b/pp3/public/dtd/autoupdate-info-2_0.dtd
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pp3/public/dtd/autoupdate-info-2_2.dtd 
b/pp3/public/dtd/autoupdate-info-2_2.dtd
new file mode 100644
index 000..ae681c5
--- /dev/null
+++ b/pp3/public/dtd/autoupdate-info-2_2.dtd
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pp3/public/dtd/autoupdate-info-2_3.dtd 
b/pp3/public/dtd/autoupdate-info-2_3.dtd
new file mode 100644
index 000..5ca63c5
--- /dev/null
+++ b/pp3/public/dtd/autoupdate-info-2_3.dtd
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


-
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



[netbeans-tools] branch master updated (5db6098 -> 566c5ff)

2020-11-10 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git.


from 5db6098  Merge pull request #35 from 
matthiasblaesing/pp3-update-edit-date-version-edit
 new 8cb6e31  [NETBEANS-4987] Decouple building plugin catalog from UI 
actions
 new b5bc6a1  [NETBEANS-4987] Show details for errors from catalog 
generation in admin area
 new a558377  [NETBEANS-4987] Store errors from verification and make the 
available to plugin owner
 new 819c3de  [NETBEANS-4987] Rebuild catalogs also if the corresponding 
disc file is missing
 new 566c5ff  Merge pull request #36 from 
matthiasblaesing/pp3_stabilize_catalog_building

The 158 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:
 pp3/config/pp3.sql |   3 +
 .../config/cron-rebuild-catalog-crond.dist |   2 +
 .../Application/config/module.config.php.dist  |  16 ++-
 .../src/Application/Controller/AdminController.php |  82 ---
 .../src/Application/Controller/CliController.php   | 151 +
 .../Application/Controller/PluginController.php|  19 +--
 .../Controller/PluginVersionController.php |  24 ++--
 .../Controller/VerificationController.php  |  16 +--
 .../src/Application/Entity/Base/NbVersion.php  |  22 +++
 .../src/Application/Entity/Base/PluginVersion.php  |  16 ++-
 .../src/Application/Entity/NbVersion.php   |   7 +
 ...trollerFactory.php => CliControllerFactory.php} |  37 ++---
 .../Factory/VerificationControllerFactory.php  |   8 +-
 .../Application/src/Application/Pp/Catalog.php |  93 +
 .../Application/Repository/NbVersionRepository.php |  11 ++
 .../Repository/PluginVersionRepository.php |  16 ++-
 .../view/application/admin/_plugin-listrow.phtml   |  14 +-
 .../_pluginVersion-error-report.phtml} |  28 ++--
 .../plugin-version/_pluginVersion-form.phtml   |   4 +-
 .../view/application/plugin-version/edit.phtml |   8 ++
 .../view/application/plugin/_plugin-listrow.phtml  |  16 ++-
 pp3/module/Application/view/layout/flash.phtml |   4 +-
 ...ate-catalog-2_8.dtd => autoupdate-info-2_4.dtd} |  48 ++-
 ...ate-catalog-2_8.dtd => autoupdate-info-2_5.dtd} |  33 +
 ...ate-catalog-2_8.dtd => autoupdate-info-2_7.dtd} |  32 +
 25 files changed, 478 insertions(+), 232 deletions(-)
 create mode 100644 
pp3/module/Application/config/cron-rebuild-catalog-crond.dist
 create mode 100644 
pp3/module/Application/src/Application/Controller/CliController.php
 copy 
pp3/module/Application/src/Application/Factory/{PluginControllerFactory.php => 
CliControllerFactory.php} (64%)
 mode change 100755 => 100644
 copy pp3/module/Application/view/application/{plugin/list.phtml => 
plugin-version/_pluginVersion-error-report.phtml} (63%)
 copy pp3/public/dtd/{autoupdate-catalog-2_8.dtd => autoupdate-info-2_4.dtd} 
(61%)
 copy pp3/public/dtd/{autoupdate-catalog-2_8.dtd => autoupdate-info-2_5.dtd} 
(74%)
 copy pp3/public/dtd/{autoupdate-catalog-2_8.dtd => autoupdate-info-2_7.dtd} 
(76%)


-
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



[netbeans-tools] branch master updated: Update "last edited at" timestamp for plugin when plugin -> NB version assignment is updated

2020-11-02 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 59c0bc2  Update "last edited at" timestamp for plugin when plugin -> 
NB version assignment is updated
 new 5db6098  Merge pull request #35 from 
matthiasblaesing/pp3-update-edit-date-version-edit
59c0bc2 is described below

commit 59c0bc2b2e36c83d582f0673008f1692b6172c8b
Author: Matthias Bläsing 
AuthorDate: Thu Oct 29 22:00:06 2020 +0100

Update "last edited at" timestamp for plugin when plugin -> NB version 
assignment is updated
---
 .../Application/src/Application/Controller/PluginVersionController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/pp3/module/Application/src/Application/Controller/PluginVersionController.php 
b/pp3/module/Application/src/Application/Controller/PluginVersionController.php
index ae990eb..2b7e135 100644
--- 
a/pp3/module/Application/src/Application/Controller/PluginVersionController.php
+++ 
b/pp3/module/Application/src/Application/Controller/PluginVersionController.php
@@ -93,6 +93,9 @@ class PluginVersionController extends AuthenticatedController 
{
 $this->rebuildAllCatalogs();
 
 if ($showFlash) {
+$plugin = $pluginVersion->getPlugin();
+$plugin->setLastUpdatedAt(new \DateTime('now'));
+$this->_pluginRepository->persist($plugin);
 
$this->flashMessenger()->setNamespace('success')->addMessage('Plugin version 
updated');
 return 
$this->redirect()->toUrl('./edit?id='.$pluginVersion->getId());
 }


-
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



[netbeans] branch master updated: [NETBEANS-626] Invoke tableDataChanged on CountingTableModel from InsertRecordDialog

2020-11-01 Thread matthiasblaesing
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 eee4150  [NETBEANS-626] Invoke tableDataChanged on CountingTableModel 
from InsertRecordDialog
 new a8e9e91  Merge pull request #2278 from Enroi/NETBEANS-626
eee4150 is described below

commit eee41509466b44e19187999a911d8e8dad5cfe7e
Author: Vladimir Orlyanskiy 
AuthorDate: Wed Jul 29 01:00:26 2020 +0300

[NETBEANS-626] Invoke tableDataChanged on CountingTableModel from 
InsertRecordDialog
---
 .../org/netbeans/modules/db/dataview/table/JXTableRowHeader.java   | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableRowHeader.java
 
b/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableRowHeader.java
index c4c5529..a1c0dbc 100644
--- 
a/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableRowHeader.java
+++ 
b/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/JXTableRowHeader.java
@@ -32,6 +32,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTable;
 import javax.swing.RowSorter;
+import javax.swing.SwingUtilities;
 import javax.swing.event.RowSorterEvent;
 import javax.swing.event.RowSorterListener;
 import javax.swing.event.TableModelEvent;
@@ -187,8 +188,10 @@ public final class JXTableRowHeader extends JComponent {
 }
 
 private void tableDataChanged() {
-setCount(backingTable.getRowCount());
-fireTableDataChanged();
+SwingUtilities.invokeLater(() -> {
+setCount(backingTable.getRowCount());
+fireTableDataChanged();
+});
 }
 
 @Override


-
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



[netbeans] branch master updated (9d6b920 -> d3a28fa)

2020-11-01 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from 9d6b920  Merge Apache NetBeans 12.2-beta3 changes to master
 new 32fcad7  Fix XML Schema based completion for schemas supplied by 
Catalog
 new 69fbca5  Fix xml.schema.completion test/implementation
 new d3a28fa  Merge pull request #2484 from 
matthiasblaesing/bugfix-xml-schema-completion

The 4605 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:
 .travis.yml|   2 +-
 .../nbproject/project.properties   |  34 --
 ide/xml.schema.completion/nbproject/project.xml|  17 +--
 .../xml/schema/completion/RuntimeCatalogModel.java |  79 ++
 .../completion/util/CompletionContextImpl.java |   9 +-
 .../completion/CatalogAbstractElementTest.java | 116 +
 .../resources/CatalogAbstractElementChild.xsd  |  41 
 .../resources/CatalogAbstractElementCompletion.xml |  27 +
 .../resources/CatalogAbstractElementParent.xsd |  44 
 .../completion/resources/CompletionContext.xml |  29 ++
 .../completion/util/CompletionContextImplTest.java |  56 ++
 11 files changed, 384 insertions(+), 70 deletions(-)
 create mode 100644 
ide/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/CatalogAbstractElementTest.java
 create mode 100644 
ide/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/resources/CatalogAbstractElementChild.xsd
 create mode 100644 
ide/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/resources/CatalogAbstractElementCompletion.xml
 create mode 100644 
ide/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/resources/CatalogAbstractElementParent.xsd
 create mode 100644 
ide/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/resources/CompletionContext.xml
 create mode 100644 
ide/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/util/CompletionContextImplTest.java


-
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



[netbeans] branch master updated: [NETBEANS-4819] Applied Emilian Bold's patch that fixes missing time-stamp authority for nbm signing patch found at https://bugzilla-attachments-243213.netbeans.org/b

2020-10-07 Thread matthiasblaesing
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 8109ad9  [NETBEANS-4819] Applied Emilian Bold's patch that fixes 
missing time-stamp authority for nbm signing patch found at 
https://bugzilla-attachments-243213.netbeans.org/bugzilla/attachment.cgi?id=161749
 new 0e88bed  Merge pull request #2413 from SirIntellegence/NETBEANS-4819
8109ad9 is described below

commit 8109ad9c434363732198597d7d498f8a19a92dab
Author: Austin Stephens 
AuthorDate: Thu Oct 1 14:42:23 2020 -0600

[NETBEANS-4819] Applied Emilian Bold's patch that fixes missing time-stamp 
authority for nbm signing
patch found at 
https://bugzilla-attachments-243213.netbeans.org/bugzilla/attachment.cgi?id=161749
---
 nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java | 15 +++
 nbbuild/templates/common.xml |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java 
b/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
index f8524e3..018157f 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
@@ -264,6 +264,7 @@ public class MakeNBM extends Task {
 public /*static*/ class Signature {
 public File keystore;
 public String storepass, alias;
+public String tsaurl, tsacert;
 /** Path to the keystore (private key). */
 public void setKeystore(File f) {
 keystore = f;
@@ -279,6 +280,14 @@ public class MakeNBM extends Task {
 public void setAlias(String s) {
 alias = s;
 }
+   /** Time Stamping Authority (TSA) URL */
+   public void setTsaurl(String s) {
+   tsaurl = s;
+   }
+   /** Alias for the TSA's public key certificate */
+   public void setTsacert(String s) {
+   tsacert = s;
+   }
 }
 
 private File productDir = null;
@@ -843,6 +852,12 @@ public class MakeNBM extends Task {
 } catch (Exception x) {
 throw new BuildException(x);
 }
+if(signature.tsaurl != null && !signature.tsaurl.isEmpty()) {
+signjar.setTsaurl(signature.tsaurl);
+}
+if(signature.tsacert != null && !signature.tsacert.isEmpty()) {
+signjar.setTsacert(signature.tsacert);
+}
 signjar.setStorepass (signature.storepass);
 signjar.setAlias (signature.alias);
 signjar.setLocation(getLocation());
diff --git a/nbbuild/templates/common.xml b/nbbuild/templates/common.xml
index 5533eff..22b6738 100644
--- a/nbbuild/templates/common.xml
+++ b/nbbuild/templates/common.xml
@@ -82,6 +82,8 @@
 
 
 
+
+
 
 
 
@@ -467,7 +469,7 @@
  locales="${nbm.locales}"
  >
 
-
+
 
 
 


-
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



[netbeans] branch master updated (b370e9b -> 57105e8)

2020-10-05 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from b370e9b  Merge pull request #2420 from apache/hectorespert-patch-2
 new 35c956a  Force offline build for gradle tooling
 new 9da2c94  Ensure javaee.wildfly is offline buildable
 new 0ba86be  Ensure web.core is offline buildable
 new 57105e8  Merge pull request #2417 from matthiasblaesing/build-offline

The 4431 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:
 enterprise/javaee.wildfly/licenseinfo.xml  |  3 +++
 .../netbeans/modules/javaee/wildfly}/resources/javaee_7.xsd|  0
 .../org/netbeans/modules/javaee/wildfly/resources/javaee_8.xsd |  7 ++-
 .../modules/javaee/wildfly/resources/jboss-common_6_0_1.xsd|  7 ++-
 .../modules/javaee/wildfly/resources/jboss-common_8_1.xsd  |  7 ++-
 .../modules/javaee/wildfly/resources/jboss-web_14_1.xsd|  7 ++-
 .../modules/javaee/wildfly/resources/jboss-web_7_3_1.xsd   |  6 +-
 .../org/netbeans/modules/javaee/wildfly}/resources/jsp_2_2.xsd |  0
 .../modules/javaee/wildfly}/resources/web-common_4_0.xsd   |  0
 enterprise/web.core/build.xml  |  3 ---
 .../src/org/netbeans/modules/web/taglib/resources/j2ee_1_4.xsd |  7 ++-
 .../src/org/netbeans/modules/web/taglib/resources/javaee_5.xsd |  7 ++-
 extide/gradle/build.xml| 10 +-
 13 files changed, 45 insertions(+), 19 deletions(-)
 copy enterprise/{j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl => 
javaee.wildfly/src/org/netbeans/modules/javaee/wildfly}/resources/javaee_7.xsd 
(100%)
 copy enterprise/{j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl => 
javaee.wildfly/src/org/netbeans/modules/javaee/wildfly}/resources/jsp_2_2.xsd 
(100%)
 copy enterprise/{j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl => 
javaee.wildfly/src/org/netbeans/modules/javaee/wildfly}/resources/web-common_4_0.xsd
 (100%)


-
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



[netbeans] branch master updated (28f9eca -> b370e9b)

2020-10-05 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from 28f9eca  Change ide/core.ide arch-what response
 add df1173f  Hacktoberfest opt-in
 add b370e9b  Merge pull request #2420 from apache/hectorespert-patch-2

No new revisions were added by this update.

Summary of changes:
 .asf.yaml | 1 +
 1 file changed, 1 insertion(+)


-
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



[netbeans] branch master updated: [NETBEANS-591] Cannot debug failed test method from Test results window

2020-10-02 Thread matthiasblaesing
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 b1f6463  [NETBEANS-591] Cannot debug failed test method from Test 
results window
 new b0830bc  Merge pull request #2406 from SiddheshRane/debug-single-test
b1f6463 is described below

commit b1f646329560d00312aee1b41d2ce0e25e97ea82
Author: Siddhesh Rane 
AuthorDate: Tue Sep 29 00:32:58 2020 -0400

[NETBEANS-591] Cannot debug failed test method from Test results window

This commit adds the missing `debug-single-method` ant target which is
attached to "Debug Focused Test Method" menu item in Test files.
---
 .../src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl | 1 +
 .../src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl | 1 +
 .../src/org/netbeans/modules/web/project/resources/build-impl.xsl| 1 +
 .../src/org/netbeans/modules/java/j2semodule/resources/build-impl.xsl| 1 +
 .../src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl   | 1 +
 5 files changed, 5 insertions(+)

diff --git 
a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
 
b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
index 1bc055b..198c255 100644
--- 
a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
+++ 
b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
@@ -2429,6 +2429,7 @@ exists or setup the property manually. For example like 
this:
 
 init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method
 
+
 
 
 netbeans.home
diff --git 
a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl
 
b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl
index 64ef91a..4c2fc1c 100644
--- 
a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl
+++ 
b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl
@@ -2406,6 +2406,7 @@ exists or setup the property manually. For example like 
this:
 
 init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method
 
+
 
 
 netbeans.home
diff --git 
a/enterprise/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
 
b/enterprise/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
index 9a92e8f..3094381 100644
--- 
a/enterprise/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
+++ 
b/enterprise/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
@@ -2727,6 +2727,7 @@ exists or setup the property manually. For example like 
this:
 
 init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method
 
+
 
 
 netbeans.home
diff --git 
a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/resources/build-impl.xsl
 
b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/resources/build-impl.xsl
index 97cb56e..3eefde5 100644
--- 
a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/resources/build-impl.xsl
+++ 
b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/resources/build-impl.xsl
@@ -2576,6 +2576,7 @@ is divided into following sections:
 
 init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method
 
+
 
 
 netbeans.home
diff --git 
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
 
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
index 474263f..a911dec 100644
--- 
a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
+++ 
b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
@@ -3021,6 +3021,7 @@ is divided into following sections:
 
 init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method
 
+
 
 
 netbeans.home


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

[netbeans] branch master updated: Fix wrong classpaths

2020-10-01 Thread matthiasblaesing
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 767b8b3  Fix wrong classpaths
 new 401a6fe  Merge pull request #2405 from pepness/fix-test.unit.paths
767b8b3 is described below

commit 767b8b396ae11971daf5de33218375db36056a33
Author: Jose Contreras 
AuthorDate: Sat Sep 19 15:38:48 2020 -0500

Fix wrong classpaths
---
 enterprise/web.freeform/nbproject/project.properties  | 8 
 ide/db/nbproject/project.properties   | 2 +-
 java/java.project.ui/nbproject/project.properties | 2 +-
 .../test/qa-functional/src/projects/LibrariesTest.java| 5 ++---
 java/java.project/nbproject/project.properties| 2 +-
 nbbuild/build.xml | 6 +++---
 nbbuild/installer/jnlp/build.xml  | 2 +-
 nbbuild/templates/projectized.xml | 2 +-
 .../unit/src/org/netbeans/nbbuild/FixTestDependencies.properties  | 2 +-
 .../src/org/netbeans/nbbuild/FixTestDependenciesPass.properties   | 2 +-
 platform/core.osgi/nbproject/project.properties   | 2 +-
 websvccommon/websvc.saas.codegen/nbproject/project.properties | 2 +-
 12 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/enterprise/web.freeform/nbproject/project.properties 
b/enterprise/web.freeform/nbproject/project.properties
index 9b8180c..b31404d 100644
--- a/enterprise/web.freeform/nbproject/project.properties
+++ b/enterprise/web.freeform/nbproject/project.properties
@@ -15,13 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
-javac.source=1.6
-javac.compilerargs=-Xlint:unchecked
+javac.source=1.8
+javac.compilerargs=-Xlint -Xlint:-serial
 
 javadoc.arch=${basedir}/arch.xml
 
-test-unit-sys-prop.xtest.data=${nb_all}/ant.freeform/test/unit/data
-test.unit.data.dir=${nb_all}/ant.freeform/test/unit/data
+test-unit-sys-prop.xtest.data=${nb_all}/java/ant.freeform/test/unit/data
+test.unit.data.dir=${nb_all}/java/ant.freeform/test/unit/data
 test-unit-sys-prop.test.ant.home=${o.apache.tools.ant.module.dir}/ant
 
 test.config.stableBTD.includes=**/*Test.class
diff --git a/ide/db/nbproject/project.properties 
b/ide/db/nbproject/project.properties
index 4079ef8..e3ac0b0 100644
--- a/ide/db/nbproject/project.properties
+++ b/ide/db/nbproject/project.properties
@@ -38,7 +38,7 @@ lib.cp=\
 
 
 test.unit.cp.extra=\
-${nb_all}/db/external/derby-10.14.2.0.jar
+${nb_all}/ide/db/external/derby-10.14.2.0.jar
 
 test.config.stableBTD.includes=**/*Test.class
 test.config.stableBTD.excludes=\
diff --git a/java/java.project.ui/nbproject/project.properties 
b/java/java.project.ui/nbproject/project.properties
index 2118833..db153cb 100644
--- a/java/java.project.ui/nbproject/project.properties
+++ b/java/java.project.ui/nbproject/project.properties
@@ -29,7 +29,7 @@ test.unit.run.cp.extra=${tools.jar}
 
test-unit-sys-prop.test.bridge.jar=${o.apache.tools.ant.module.dir}/ant/nblib/bridge.jar
 # May be overridden to e.g. test against a different version of Ant:
 test-unit-sys-prop.test.ant.home=${o.apache.tools.ant.module.dir}/ant
-test-unit-sys-prop.test.junit.jar=${nb_all}/libs.junit4/external/junit-4.12.jar
+test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.12.jar
 
 test.config.stableBTD.includes=**/*Test.class
 test.config.stableBTD.excludes=\
diff --git 
a/java/java.project.ui/test/qa-functional/src/projects/LibrariesTest.java 
b/java/java.project.ui/test/qa-functional/src/projects/LibrariesTest.java
index 144eb3a..32c67e1 100644
--- a/java/java.project.ui/test/qa-functional/src/projects/LibrariesTest.java
+++ b/java/java.project.ui/test/qa-functional/src/projects/LibrariesTest.java
@@ -182,9 +182,8 @@ public class LibrariesTest extends JellyTestCase {
 
set.add("jar:nbinst://org.netbeans.modules.web.struts/modules/ext/struts/struts.jar!/");
 librariesUrls.put("struts", set);
 set = new TreeSet();
-
set.add("jar:nbinst://org.netbeans.modules.junit/docs/junit-3.8.2-api.zip!/");
-
set.add("jar:nbinst://org.netbeans.modules.junit/modules/ext/junit-3.8.2.jar!/");
-
set.add("jar:nbinst://org.netbeans.modules.junit/modules/ext/junit-4.1.jar!/");
+
set.add("jar:nbinst://org.netbeans.modules.junit/docs/junit-4.12-javadoc.jar!/");
+
set.add("jar:nbinst://org.netbeans.modules.junit/modules/ext/junit-4.12.jar!/");
 librariesUrls.put("junit", set);
 set = new TreeSet();
 
set.add("jar:nbinst://org.netbeans.modules.java.j2seproject/ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar!/");

[netbeans] branch master updated: [NETBEANS-4305] - cleanup dead hardware support

2020-09-24 Thread matthiasblaesing
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 681301e  [NETBEANS-4305] - cleanup dead hardware support
 new 5743f22  Merge pull request #2131 from 
BradWalker/remove_solaris_platform
681301e is described below

commit 681301ee4cb9c989f2fac79e28cfdd7b3b5138bd
Author: Brad Walker 
AuthorDate: Mon May 4 23:09:28 2020 -0600

[NETBEANS-4305] - cleanup dead hardware support

Sun Microsystems has not produced a 32-bit microprocessor in years. In 
addition, Solaris is
now strictly 64-bit and has been that way for a LONG time.

So cleanup the platform support to remove support for 32-bit SPARC 
processors and Solaris.

Java doesn't even run on this equipment!
---
 .../nbproject/project.properties   |  8 ---
 ide/dlight.nativeexecution/tools/Makefile  |  1 -
 .../tools/build-pty-support.sh |  1 -
 ide/dlight.nativeexecution/tools/killall/Makefile  | 13 ++---
 ide/dlight.nativeexecution/tools/pty/Makefile  |  1 -
 ide/dlight.nativeexecution/tools/unbuffer/Makefile |  2 -
 .../installer/utils/system/SolarisNativeUtils.java | 11 +
 nbi/infra/build/jvm/build.xml  |  7 ---
 .../build/jvm/tools/unzipsfx/solaris-sparc/LICENSE | 49 ---
 .../libsrc/org/netbeans/updater/UpdaterFrame.java  | 33 -
 .../common/integration/IntegrationUtils.java   | 18 ++-
 .../native/build/buildnative-solaris.sh| 57 --
 .../release/remote-pack-defs/build.xml |  9 +---
 .../remote-pack-defs/profile-solsparc-15.sh| 34 -
 .../remote-pack-defs/profile-solsparc-16.sh| 34 -
 .../profiler/attach/dialog/AttachDialog.java   |  1 -
 .../attach/spi/AbstractRemotePackExporter.java |  1 -
 17 files changed, 11 insertions(+), 269 deletions(-)

diff --git a/ide/dlight.nativeexecution/nbproject/project.properties 
b/ide/dlight.nativeexecution/nbproject/project.properties
index 41a0bd1..ec6bcf2 100644
--- a/ide/dlight.nativeexecution/nbproject/project.properties
+++ b/ide/dlight.nativeexecution/nbproject/project.properties
@@ -85,14 +85,6 @@ release.external/exechlp-1.0.zip!/MacOSX-x86_64/pty_open 
   = bin/nativeexec
 release.external/exechlp-1.0.zip!/MacOSX-x86_64/stat= 
bin/nativeexecution/MacOSX-x86_64/stat
 release.external/exechlp-1.0.zip!/MacOSX-x86_64/unbuffer.dylib  = 
bin/nativeexecution/MacOSX-x86_64/unbuffer.dylib
 release.external/exechlp-1.0.zip!/MacOSX-x86_64/killall = 
bin/nativeexecution/MacOSX-x86_64/killall
-release.external/exechlp-1.0.zip!/SunOS-sparc/privp = 
bin/nativeexecution/SunOS-sparc/privp
-release.external/exechlp-1.0.zip!/SunOS-sparc/process_start = 
bin/nativeexecution/SunOS-sparc/process_start
-release.external/exechlp-1.0.zip!/SunOS-sparc/pty   = 
bin/nativeexecution/SunOS-sparc/pty
-release.external/exechlp-1.0.zip!/SunOS-sparc/pty_open  = 
bin/nativeexecution/SunOS-sparc/pty_open
-release.external/exechlp-1.0.zip!/SunOS-sparc/sigqueue  = 
bin/nativeexecution/SunOS-sparc/sigqueue
-release.external/exechlp-1.0.zip!/SunOS-sparc/stat  = 
bin/nativeexecution/SunOS-sparc/stat
-release.external/exechlp-1.0.zip!/SunOS-sparc/unbuffer.so   = 
bin/nativeexecution/SunOS-sparc/unbuffer.so
-release.external/exechlp-1.0.zip!/SunOS-sparc/killall   = 
bin/nativeexecution/SunOS-sparc/killall
 release.external/exechlp-1.0.zip!/SunOS-sparc_64/privp  = 
bin/nativeexecution/SunOS-sparc_64/privp
 release.external/exechlp-1.0.zip!/SunOS-sparc_64/process_start  = 
bin/nativeexecution/SunOS-sparc_64/process_start
 release.external/exechlp-1.0.zip!/SunOS-sparc_64/pty= 
bin/nativeexecution/SunOS-sparc_64/pty
diff --git a/ide/dlight.nativeexecution/tools/Makefile 
b/ide/dlight.nativeexecution/tools/Makefile
index 230d945..0796cbd 100644
--- a/ide/dlight.nativeexecution/tools/Makefile
+++ b/ide/dlight.nativeexecution/tools/Makefile
@@ -33,7 +33,6 @@ CF_Linux-sparc_64   = -DLINUX   -D_GNU_SOURCE 
-D_XOPEN_SOURCE=700 -m64
 CF_Linux-arm   = -DLINUX   -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -std=c99
 CF_MacOSX-x86  = -DMAXOSX  -D_DARWIN_C_SOURCE -m32
 CF_MacOSX-x86_64= -DMAXOSX  -D_DARWIN_C_SOURCE -m64
-CF_SunOS-sparc = -DSOLARIS -D__EXTENSIONS__ -m32
 CF_SunOS-sparc_64   = -DSOLARIS -D__EXTENSIONS__ -m64
 CF_SunOS-x86   = -DSOLARIS -m32
 CF_SunOS-x86_64= -DSOLARIS -m64
diff --git a/ide/dlight.nativeexecution/tools/build-pty-support.sh 
b/ide/dlight.nativeexecution/tools/build-pty-support.sh
index ac4609d..2e4bffc 100755
--- a/ide/dlight.nativeexecution/tools/build-pty-support.sh
+++ b/ide/dlight.nativeexecution/tools/build-pty-support.sh
@@ -82,7 +82,6 @@ copy_to_release

[netbeans] branch master updated: -Update Spring license version -Simplify license naming -Rename Spring licenses to match new format -Update version inside spring4 notice.txt

2020-09-23 Thread matthiasblaesing
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 97ea55a  -Update Spring license version -Simplify license naming 
-Rename Spring licenses to match new format -Update version inside spring4 
notice.txt
 new f5291ef  Merge pull request #2382 from pepness/update-spring-license
97ea55a is described below

commit 97ea55a1ae4045053abc1b7b05a161d036749606
Author: Jose Contreras 
AuthorDate: Sun Sep 20 13:27:22 2020 -0500

-Update Spring license version
-Simplify license naming
-Rename Spring licenses to match new format
-Update version inside spring4 notice.txt
---
 .../external/spring-framework-3.2.18.RELEASE-license.txt| 2 +-
 .../external/spring-framework-4.3.29.RELEASE-license.txt| 2 +-
 .../external/spring-framework-4.3.29.RELEASE-notice.txt | 2 +-
 .../external/spring-framework-5.2.9.RELEASE-license.txt | 2 +-
 nbbuild/licenses/{Apache-2.0-spring3.2.18 => Apache-2.0-spring3}| 0
 nbbuild/licenses/{Apache-2.0-spring4.3.29 => Apache-2.0-spring4}| 0
 nbbuild/licenses/{Apache-2.0-spring5.2.9 => Apache-2.0-spring5} | 0
 nbbuild/licenses/names.properties   | 6 +++---
 8 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/java/libs.springframework/external/spring-framework-3.2.18.RELEASE-license.txt
 
b/java/libs.springframework/external/spring-framework-3.2.18.RELEASE-license.txt
index 7305309..2c488c8 100644
--- 
a/java/libs.springframework/external/spring-framework-3.2.18.RELEASE-license.txt
+++ 
b/java/libs.springframework/external/spring-framework-3.2.18.RELEASE-license.txt
@@ -2,7 +2,7 @@ Name: Spring Framework
 Description: Java/J2EE application framework
 Version: 3.2.18.RELEASE
 Origin: SpringSource
-License: Apache-2.0-spring3.2.18
+License: Apache-2.0-spring3
 Files: spring-aop-3.2.18.RELEASE.jar spring-aspects-3.2.18.RELEASE.jar 
spring-beans-3.2.18.RELEASE.jar spring-context-3.2.18.RELEASE.jar 
spring-context-support-3.2.18.RELEASE.jar spring-core-3.2.18.RELEASE.jar 
spring-expression-3.2.18.RELEASE.jar spring-instrument-3.2.18.RELEASE.jar 
spring-instrument-tomcat-3.2.18.RELEASE.jar spring-jdbc-3.2.18.RELEASE.jar 
spring-jms-3.2.18.RELEASE.jar spring-orm-3.2.18.RELEASE.jar 
spring-oxm-3.2.18.RELEASE.jar spring-struts-3.2.18.RELEASE.jar spring-tes [...]
 URL: https://spring.io/projects/spring-framework
 
diff --git 
a/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-license.txt
 
b/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-license.txt
index bf06766..ed51a3c 100644
--- 
a/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-license.txt
+++ 
b/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-license.txt
@@ -2,7 +2,7 @@ Name: Spring Framework
 Description: Java/J2EE application framework
 Version: 4.3.29.RELEASE
 Origin: Spring
-License: Apache-2.0-spring4.3.29
+License: Apache-2.0-spring4
 Files: spring-aop-4.3.29.RELEASE.jar spring-aspects-4.3.29.RELEASE.jar 
spring-beans-4.3.29.RELEASE.jar spring-context-4.3.29.RELEASE.jar 
spring-context-support-4.3.29.RELEASE.jar spring-core-4.3.29.RELEASE.jar 
spring-expression-4.3.29.RELEASE.jar spring-instrument-4.3.29.RELEASE.jar 
spring-instrument-tomcat-4.3.29.RELEASE.jar spring-jdbc-4.3.29.RELEASE.jar 
spring-jms-4.3.29.RELEASE.jar spring-messaging-4.3.29.RELEASE.jar 
spring-orm-4.3.29.RELEASE.jar spring-oxm-4.3.29.RELEASE.jar spring- [...]
 URL: https://spring.io/projects/spring-framework
 
diff --git 
a/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-notice.txt 
b/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-notice.txt
index 84e51a4..ce57456 100644
--- 
a/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-notice.txt
+++ 
b/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-notice.txt
@@ -1,2 +1,2 @@
-Spring Framework 4.3.25.RELEASE
+Spring Framework 4.3.29.RELEASE
 Copyright (c) 2002-2019 Pivotal, Inc.
diff --git 
a/java/libs.springframework/external/spring-framework-5.2.9.RELEASE-license.txt 
b/java/libs.springframework/external/spring-framework-5.2.9.RELEASE-license.txt
index d8a64e0..da57eda 100644
--- 
a/java/libs.springframework/external/spring-framework-5.2.9.RELEASE-license.txt
+++ 
b/java/libs.springframework/external/spring-framework-5.2.9.RELEASE-license.txt
@@ -2,7 +2,7 @@ Name: Spring Framework
 Description: Java/J2EE application framework
 Version: 5.2.9.RELEASE
 Origin: Spring
-License: Apache-2.0-spring5.2.9
+License: Apache-2.0-spring5
 Files: spring-instrument-5.2.9.RELEASE.jar 
spring-context-support-5.2.9.RELEASE.jar 
spring-context-indexer-5.2.9.RELEASE.jar spring-jms-5.2.9.RELEASE.jar 
spring-beans-5.2.9.RELEASE.jar spring-webmvc-5.2.9.RELEASE.ja

[netbeans] branch master updated (dd427e8 -> a04b626)

2020-09-22 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from dd427e8  Merge pull request #2359 from 
sdedic/bugfix/commit-validation/positions-codefixes
 new 0196791  General Availability for javadoc 15
 new 5ae825f  [NETBEANS-4284] - cleanup a bunch of raw type warnings..
 new a04b626  Merge pull request #2114 from BradWalker/clean_raw_types

The 4373 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:
 .../glassfish/eecommon/api/JDBCDriverDeployHelper.java   |  4 ++--
 .../payara/eecommon/api/JDBCDriverDeployHelper.java  |  2 +-
 .../modules/groovy/editor/api/PathFinderVisitor.java |  2 +-
 .../editor/api/parser/GroovyVirtualSourceProvider.java   |  7 ---
 .../src/org/netbeans/editor/ext/ExtFormatter.java|  4 ++--
 .../modules/editor/CompletionJListOperator.java  |  6 +++---
 .../parsing/impl/indexing/ClusteredIndexables.java   |  2 +-
 .../modules/parsing/lucene/SimpleDocumentIndexCache.java | 10 +-
 .../modules/debugger/ui/actions/ConnectAction.java   |  2 +-
 .../org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java |  2 +-
 ide/xml.tax/nbproject/project.properties |  2 +-
 .../xml/tax/beans/editor/TreeNodeFilterCustomEditor.java |  6 +++---
 ide/xml/src/org/netbeans/modules/xml/XMLDataLoader.java  |  8 
 .../modules/xml/actions/CollectSystemAction.java |  4 ++--
 .../org/netbeans/modules/ant/debugger/AntDebugger.java   |  2 +-
 .../netbeans/modules/beans/IdxPropertyPatternPanel.java  |  2 +-
 .../modules/dbschema/jdbcimpl/SchemaElementImpl.java |  2 +-
 .../java/freeform/ui/SourceFoldersWizardPanel.java   |  2 +-
 .../libraries/J2SELibrarySourceLevelQueryImpl.java   |  2 +-
 .../platformdefinition/FileObjectPropertyEditor.java |  2 +-
 .../platformdefinition/J2SEPlatformCustomizer.java   |  7 ---
 .../netbeans/modules/java/openjdk/jtreg/JPDAStart.java   |  4 ++--
 .../modules/maven/codegen/ExclusionGenerator.java|  4 ++--
 .../grammar/effpom/LocationAwareMavenXpp3Writer.java | 16 
 .../tools/java/generator/SAXGeneratorAbstractPanel.java  |  2 +-
 .../core/multiview/MultiViewCloneableTopComponent.java   |  2 +-
 .../src/org/netbeans/core/multiview/MultiViewPeer.java   |  2 +-
 .../netbeans/core/startup/layers/LocalFileSystemEx.java  |  6 +++---
 .../modules/openide/explorer/ExternalDragAndDrop.java|  2 +-
 .../openide/explorer/TabbedContainerBridgeImpl.java  |  2 +-
 .../src/org/openide/filesystems/MultiFileObject.java |  2 +-
 .../src/org/openide/filesystems/StreamPool.java  |  2 +-
 .../openide.nodes/src/org/openide/nodes/NodeLookup.java  |  2 +-
 .../src/org/openide/options/VetoSystemOption.java|  6 +++---
 .../openide.util/src/org/openide/util/MapFormat.java |  2 +-
 platform/openide.util/src/org/openide/util/Task.java |  2 +-
 .../src/org/openide/util/TopologicalSortException.java   |  2 +-
 .../modules/templates/actions/TemplatesAction.java   |  2 +-
 .../modules/profiler/oql/engine/api/impl/Snapshot.java   |  2 +-
 .../projectsupport/AbstractProjectLookupProvider.java|  2 +-
 .../netbeans/modules/websvc/saas/codegen/util/Util.java  |  2 +-
 41 files changed, 74 insertions(+), 72 deletions(-)


-
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



[netbeans] branch master updated: General Availability for javadoc 15

2020-09-21 Thread matthiasblaesing
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 1c15692  General Availability for javadoc 15
 new bb0e205  Merge pull request #2383 from pepness/ga-javadoc-15
1c15692 is described below

commit 1c1569221a214d83b1ac6ce04b923e4eefd13214
Author: Jose Contreras 
AuthorDate: Sun Sep 20 13:34:03 2020 -0500

General Availability for javadoc 15
---
 .../j2seplatform/platformdefinition/J2SEPlatformDefaultJavadocImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformDefaultJavadocImpl.java
 
b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformDefaultJavadocImpl.java
index b453916..5e58951 100644
--- 
a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformDefaultJavadocImpl.java
+++ 
b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformDefaultJavadocImpl.java
@@ -63,7 +63,7 @@ public final class J2SEPlatformDefaultJavadocImpl implements 
J2SEPlatformDefault
 OFFICIAL_JAVADOC.put("12", 
"https://docs.oracle.com/en/java/javase/12/docs/api/;); // NOI18N
 OFFICIAL_JAVADOC.put("13", 
"https://docs.oracle.com/en/java/javase/13/docs/api/;); // NOI18N
 OFFICIAL_JAVADOC.put("14", 
"https://docs.oracle.com/en/java/javase/14/docs/api/;); // NOI18N
-OFFICIAL_JAVADOC.put("15", 
"https://download.java.net/java/early_access/jdk15/docs/api/;); // NOI18N Early 
access
+OFFICIAL_JAVADOC.put("15", 
"https://docs.oracle.com/en/java/javase/15/docs/api/;); // NOI18N
 OFFICIAL_JAVADOC.put("16", 
"https://download.java.net/java/early_access/jdk16/docs/api/;); // NOI18N Early 
access
 }
 


-
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



[netbeans] branch master updated: [NETBEANS-4667] Fix broken npm search

2020-09-18 Thread matthiasblaesing
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 046147d  [NETBEANS-4667] Fix broken npm search
 new 8d0c986  Merge pull request #2286 from SiddheshRane/master
046147d is described below

commit 046147ddc31cf5d49d3519968fc189203983ce5e
Author: Siddhesh Rane 
AuthorDate: Fri Jul 31 19:34:07 2020 -0400

[NETBEANS-4667] Fix broken npm search

IDE npm search (Web project > properties > npm > add) is broken due to 
output format change in npm.
This commit uses npm --parseable flag to fix and simplify output parsing.
Tested with npm 6.14.4
---
 .../javascript/nodejs/exec/NpmExecutable.java  |  1 +
 .../nodejs/ui/libraries/LibraryProvider.java   | 89 +-
 2 files changed, 18 insertions(+), 72 deletions(-)

diff --git 
a/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/exec/NpmExecutable.java
 
b/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/exec/NpmExecutable.java
index a462516..31b2792 100644
--- 
a/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/exec/NpmExecutable.java
+++ 
b/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/exec/NpmExecutable.java
@@ -215,6 +215,7 @@ public class NpmExecutable {
 List params = new ArrayList<>();
 params.add("search"); // NOI18N
 params.add("--long"); // NOI18N
+params.add("--parseable"); // NOI18N
 params.add(searchTerm);
 String result = null;
 StringBuilderInputProcessorFactory factory = new 
StringBuilderInputProcessorFactory();
diff --git 
a/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/LibraryProvider.java
 
b/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/LibraryProvider.java
index fc425d4..4342f9f 100644
--- 
a/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/LibraryProvider.java
+++ 
b/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/LibraryProvider.java
@@ -23,14 +23,12 @@ import java.awt.EventQueue;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
@@ -291,6 +289,7 @@ public class LibraryProvider {
 
 /**
  * Parses the output of npm search call.
+ * Assumes output format of npm search --parseable --long.
  * 
  * @param searchResult output of the npm search call.
  * @return libraries/packages returned by the search or {@code null}
@@ -299,76 +298,22 @@ public class LibraryProvider {
 @CheckForNull
 private Library[] parseSearchResult(String searchResult) {
 String[] lines = searchResult.split("\n"); // NOI18N
-String header = lines[0];
-int descriptionIndex = header.indexOf("DESCRIPTION"); // NOI18N
-if (descriptionIndex == -1) {
-// #268060
-LOGGER.log(Level.INFO, "Unexpected search result of npm 
search: {0}", searchResult);
-return null;
+ArrayList libraries = new ArrayList<>(lines.length);
+
+for (String line : lines) {
+String[] columns = line.split("\t");
+if (columns.length < 5) continue;
+
+Library library = new Library(columns[0].trim());
+library.setDescription(columns[1].trim());
+Library.Version latestVersion = new Library.Version(library, 
columns[4].trim());
+library.setLatestVersion(latestVersion);
+if(columns.length > 5)library.setKeywords(columns[5].split(" 
")); //this can be optional
+
+libraries.add(library);
 }
-int authorIndex = header.indexOf("AUTHOR"); // NOI18N
-int dateIndex = header.indexOf("DATE"); // NOI18N
-int versionIndex = header.indexOf("VERSION"); // NOI18N
-int keywordsIndex = header.indexOf("KEYWORDS"); // NOI18N
-List libraryList = new LinkedList<>();
-String name = ""; // NOI18N
-String description = ""; // NOI18N
- 

[netbeans] branch master updated: -'Mavenize' TestNG and upgrade from 6.8.1 to 6.14.3 -Add jcommander dependency and use a working javadoc version -Fix Unit tests. By @matthiasblaesing

2020-09-17 Thread matthiasblaesing
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 c80c33b  -'Mavenize' TestNG and upgrade from 6.8.1 to 6.14.3 -Add 
jcommander dependency and use a working javadoc version -Fix Unit tests. By 
@matthiasblaesing
 new 05684bb  Merge pull request #2350 from pepness/testng-6.14.3
c80c33b is described below

commit c80c33bcf5fd6afa3f5a6cda28793f356d2fcea7
Author: Jose Contreras 
AuthorDate: Sun Aug 30 17:26:57 2020 -0500

-'Mavenize' TestNG and upgrade from 6.8.1 to 6.14.3
-Add jcommander dependency and use a working javadoc version
-Fix Unit tests. By @matthiasblaesing
---
 java/java.j2seproject/nbproject/project.properties |  5 +-
 .../modules/java/j2seproject/BuildImplTest.java|  7 ++-
 java/testng.ant/nbproject/project.properties   |  2 +-
 java/testng.maven/nbproject/project.properties |  1 +
 java/testng.ui/nbproject/project.properties|  2 +-
 .../modules/testng/ui/wizards/Bundle.properties|  2 +-
 java/testng/nbproject/project.properties   |  1 +
 .../org/netbeans/modules/testng/Bundle.properties  |  2 +-
 .../netbeans/modules/testng/resources/testng.xml   |  7 +--
 platform/libs.testng/external/binaries-list|  5 +-
 ...ist-license.txt => jcommander-1.78-license.txt} | 53 --
 ...-dist-license.txt => testng-6.14.3-license.txt} |  4 +-
 1-dist-notice.txt => testng-6.14.3-notice.txt} |  0
 platform/libs.testng/manifest.mf   |  2 +-
 platform/libs.testng/nbproject/project.properties  | 11 +++--
 platform/libs.testng/nbproject/project.xml |  8 +++-
 16 files changed, 47 insertions(+), 65 deletions(-)

diff --git a/java/java.j2seproject/nbproject/project.properties 
b/java/java.j2seproject/nbproject/project.properties
index 8761d2c..ed98910 100644
--- a/java/java.j2seproject/nbproject/project.properties
+++ b/java/java.j2seproject/nbproject/project.properties
@@ -26,8 +26,9 @@ javadoc.apichanges=${basedir}/apichanges.xml
 test.unit.run.cp.extra=${tools.jar}
 
test-unit-sys-prop.test.bridge.jar=${netbeans.dest.dir}/${nb.cluster.extide.dir}/ant/nblib/bridge.jar
 
test-unit-sys-prop.test.ant.home=${netbeans.dest.dir}/${nb.cluster.extide.dir}/ant
-test-unit-sys-prop.test.junit.jar=${nb_all}/libs.junit4/external/junit-4.12.jar
-test-unit-sys-prop.test.testng.jar=${nb_all}/libs.testng/external/testng-6.8.1-dist.jar
+test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.12.jar
+test-unit-sys-prop.test.testng.jar=${nb_all}/platform/libs.testng/external/testng-6.14.3.jar
+test-unit-sys-prop.test.jcommander.jar=${nb_all}/platform/libs.testng/external/jcommander-1.78.jar
 
extra.module.files=ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
 
jnlp.indirect.jars=ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
 
diff --git 
a/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
 
b/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
index 7ceee3e..e0e79aa 100644
--- 
a/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
+++ 
b/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
@@ -67,6 +67,7 @@ public final class BuildImplTest extends NbTestCase {
 
 private File junitJar;
 private File testNGJar;
+private File jcommanderJar;
 
 @Override protected Level logLevel() {
 return Level.FINE;
@@ -91,6 +92,10 @@ public final class BuildImplTest extends NbTestCase {
 assertNotNull("must set test.testng.jar", tngJarProp);
 testNGJar = new File(tngJarProp);
 assertTrue("file " + testNGJar + " exists", testNGJar.isFile());
+String jcommanderJarProp = System.getProperty("test.jcommander.jar");
+assertNotNull("must set test.jcommander.jar", jcommanderJarProp);
+jcommanderJar = new File(jcommanderJarProp);
+assertTrue("file " + jcommanderJar + " exists", 
jcommanderJar.isFile());
 MockLookup.setLayersAndInstances(new IOP(), new IFL());
 }
 
@@ -142,7 +147,7 @@ public final class BuildImplTest extends NbTestCase {
 
 private Properties getProperties() {
 Properties p = new Properties();
-p.setProperty("libs.junit.classpath", testNGJar.getAbsolutePath()  + 
":" + junitJar.getAbsolutePath());
+p.setProperty("libs.junit.classpath", testNGJar.getAbsolutePath()  + 
":" + junitJar.getAbsolutePath()+ ":" + jcommanderJar.getAbsolutePath());
 return p;
 }
 
diff --git a/java/testng.ant/nbproject/project.properties 
b/java/testng.ant/nbproject/pr

[netbeans] branch master updated: [NETBEANS-4718] Disallow FXML controller in default package when modular java

2020-09-17 Thread matthiasblaesing
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 61ffe62  [NETBEANS-4718] Disallow FXML controller in default package 
when modular java
 new de6c967  Merge pull request #2331 from 
errael/ValidateFxmlControllerLocation
61ffe62 is described below

commit 61ffe62dbf956ede26c86302def877d96c161092
Author: Ernie Rael 
AuthorDate: Tue Aug 25 19:26:35 2020 +0100

[NETBEANS-4718] Disallow FXML controller in default package when modular 
java
---
 .../modules/javafx2/project/JFXProjectUtils.java | 16 
 .../modules/javafx2/project/fxml/Bundle.properties   |  1 +
 .../project/fxml/ConfigureFXMLControllerPanelVisual.java |  8 
 3 files changed, 25 insertions(+)

diff --git 
a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/JFXProjectUtils.java
 
b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/JFXProjectUtils.java
index 5a84cbb..83129b5 100644
--- 
a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/JFXProjectUtils.java
+++ 
b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/JFXProjectUtils.java
@@ -31,6 +31,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
+
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.Elements;
 import javax.xml.parsers.DocumentBuilder;
@@ -41,6 +42,7 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
+
 import org.netbeans.api.annotations.common.CheckForNull;
 import org.netbeans.api.annotations.common.NonNull;
 import org.netbeans.api.java.classpath.ClassPath;
@@ -61,6 +63,8 @@ import 
org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;
 import org.netbeans.modules.javafx2.platform.api.JavaFXPlatformUtils;
 import org.netbeans.modules.javafx2.platform.api.JavaFxRuntimeInclusion;
 import 
org.netbeans.modules.javafx2.project.JavaFXProjectWizardIterator.WizardType;
+import org.netbeans.modules.javafx2.project.fxml.SourceGroupSupport;
+import 
org.netbeans.modules.javafx2.project.fxml.SourceGroupSupport.SourceGroupProxy;
 import org.netbeans.modules.javafx2.project.ui.JSEApplicationClassChooser;
 import org.netbeans.spi.project.ProjectIconAnnotator;
 import org.netbeans.spi.project.support.ant.AntProjectHelper;
@@ -1776,5 +1780,17 @@ public final class JFXProjectUtils {
 }
 }
 }
+
+private static final String MODULE_INFO = "module-info.java"; // NOI18N
+
+// as in 
org.netbeans.modules.maven.api.ModuleInfoUtils.hasModuleInfoInSource;
+public static boolean hasModuleInfo(SourceGroupSupport support) {
+for (SourceGroupProxy sourceGroup : support.getSourceGroups()) {
+if(sourceGroup.getRootFolder().getFileObject(MODULE_INFO) != null) 
{
+return true;
+}
+}
+return false;
+}
 
 }
diff --git 
a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/fxml/Bundle.properties
 
b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/fxml/Bundle.properties
index 2ed0f7d..3d94df3 100644
--- 
a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/fxml/Bundle.properties
+++ 
b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/fxml/Bundle.properties
@@ -91,6 +91,7 @@ WARN_ConfigureFXMLPanel_Provide_Java_Name=Provide valid Java 
Controller File nam
 WARN_ConfigureFXMLPanel_Provide_CSS_Name=Provide valid CSS File name
 WARN_ConfigureFXMLPanel_Provide_Package_Name=Provide valid Package name
 WARN_ConfigureFXMLPanel_Package_Invalid=The Package is not a folder
+WARN_ConfigureFXMLPanel_Default_Package_Invalid=Default Package not allowed
 
 #MSG_FXMLTemplateWizardIterator_Folder_Exists=Directory already exists: {0}
 MSG_fs_or_folder_does_not_exist=The target folder does not exist.
diff --git 
a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/fxml/ConfigureFXMLControllerPanelVisual.java
 
b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/fxml/ConfigureFXMLControllerPanelVisual.java
index e8abd19..4a136b3 100644
--- 
a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/fxml/ConfigureFXMLControllerPanelVisual.java
+++ 
b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/fxml/ConfigureFXMLControllerPanelVisual.java
@@ -22,6 +22,7 @@ import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+
 import javax.swing.ComboBoxModel;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JFileChooser;
@@ -31,6 +32,8 @@ import javax.swing.SwingUtilities;
 import javax.swing.event.Chan

[netbeans] 01/01: 'Mavenize' TestNG and upgrade from 6.8.1 to 6.14.3

2020-09-17 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a commit to branch pull/2350
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit aea4d5351b990423902c212ac49d32784752faab
Author: Jose Contreras 
AuthorDate: Sun Aug 30 17:26:57 2020 -0500

'Mavenize' TestNG and upgrade from 6.8.1 to 6.14.3
---
 java/java.j2seproject/nbproject/project.properties |  5 +-
 .../modules/java/j2seproject/BuildImplTest.java|  7 ++-
 java/testng.ant/nbproject/project.properties   |  2 +-
 java/testng.maven/nbproject/project.properties |  1 +
 java/testng.ui/nbproject/project.properties|  2 +-
 .../modules/testng/ui/wizards/Bundle.properties|  2 +-
 java/testng/nbproject/project.properties   |  1 +
 .../org/netbeans/modules/testng/Bundle.properties  |  2 +-
 .../netbeans/modules/testng/resources/testng.xml   |  7 +--
 platform/libs.testng/external/binaries-list|  5 +-
 ...ist-license.txt => jcommander-1.78-license.txt} | 53 --
 ...-dist-license.txt => testng-6.14.3-license.txt} |  4 +-
 1-dist-notice.txt => testng-6.14.3-notice.txt} |  0
 platform/libs.testng/nbproject/project.properties  | 11 +++--
 platform/libs.testng/nbproject/project.xml |  8 +++-
 15 files changed, 46 insertions(+), 64 deletions(-)

diff --git a/java/java.j2seproject/nbproject/project.properties 
b/java/java.j2seproject/nbproject/project.properties
index 537c58b..ed49f85 100644
--- a/java/java.j2seproject/nbproject/project.properties
+++ b/java/java.j2seproject/nbproject/project.properties
@@ -26,8 +26,9 @@ javadoc.apichanges=${basedir}/apichanges.xml
 test.unit.run.cp.extra=${tools.jar}
 
test-unit-sys-prop.test.bridge.jar=${netbeans.dest.dir}/${nb.cluster.extide.dir}/ant/nblib/bridge.jar
 
test-unit-sys-prop.test.ant.home=${netbeans.dest.dir}/${nb.cluster.extide.dir}/ant
-test-unit-sys-prop.test.junit.jar=${nb_all}/libs.junit4/external/junit-4.12.jar
-test-unit-sys-prop.test.testng.jar=${nb_all}/libs.testng/external/testng-6.8.1-dist.jar
+test-unit-sys-prop.test.junit.jar=${nb_all}/platform/libs.junit4/external/junit-4.12.jar
+test-unit-sys-prop.test.testng.jar=${nb_all}/platform/libs.testng/external/testng-6.14.3.jar
+test-unit-sys-prop.test.jcommander.jar=${nb_all}/platform/libs.testng/external/jcommander-1.78.jar
 
extra.module.files=ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
 
jnlp.indirect.jars=ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
 
diff --git 
a/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
 
b/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
index 7ceee3e..e0e79aa 100644
--- 
a/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
+++ 
b/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
@@ -67,6 +67,7 @@ public final class BuildImplTest extends NbTestCase {
 
 private File junitJar;
 private File testNGJar;
+private File jcommanderJar;
 
 @Override protected Level logLevel() {
 return Level.FINE;
@@ -91,6 +92,10 @@ public final class BuildImplTest extends NbTestCase {
 assertNotNull("must set test.testng.jar", tngJarProp);
 testNGJar = new File(tngJarProp);
 assertTrue("file " + testNGJar + " exists", testNGJar.isFile());
+String jcommanderJarProp = System.getProperty("test.jcommander.jar");
+assertNotNull("must set test.jcommander.jar", jcommanderJarProp);
+jcommanderJar = new File(jcommanderJarProp);
+assertTrue("file " + jcommanderJar + " exists", 
jcommanderJar.isFile());
 MockLookup.setLayersAndInstances(new IOP(), new IFL());
 }
 
@@ -142,7 +147,7 @@ public final class BuildImplTest extends NbTestCase {
 
 private Properties getProperties() {
 Properties p = new Properties();
-p.setProperty("libs.junit.classpath", testNGJar.getAbsolutePath()  + 
":" + junitJar.getAbsolutePath());
+p.setProperty("libs.junit.classpath", testNGJar.getAbsolutePath()  + 
":" + junitJar.getAbsolutePath()+ ":" + jcommanderJar.getAbsolutePath());
 return p;
 }
 
diff --git a/java/testng.ant/nbproject/project.properties 
b/java/testng.ant/nbproject/project.properties
index 8aeb9dd..8ea5f62 100644
--- a/java/testng.ant/nbproject/project.properties
+++ b/java/testng.ant/nbproject/project.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-javac.source=1.6
+javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 nbm.homepage=http://wiki.netbeans.org/TestNG
 nbm.module.author=Lukas Jungmann
diff --git a/java/testng.maven/nbproject/project.properties 
b/java/testng.maven/nbproject/projec

[netbeans] branch pull/2350 created (now aea4d53)

2020-09-17 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a change to branch pull/2350
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


  at aea4d53  'Mavenize' TestNG and upgrade from 6.8.1 to 6.14.3

This branch includes the following new commits:

 new aea4d53  'Mavenize' TestNG and upgrade from 6.8.1 to 6.14.3

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.



-
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



[netbeans] branch master updated (15e311a -> ed95b77)

2020-09-12 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from 15e311a  [NETBEANS-4770] Handle source type correctly in 
GradleSourcesImpl
 new a893571  [NETBEANS-4687] Move handling of initial and inherit from 
property definitions to java
 new 04dfe9a  [NETBEANS-4687] Support unset as a global value
 new 57d9ea9  [NETBEANS-1454] Add break-word to supported values for 
word-break
 new 49d3911  [NETBEANS-2532] Update CSS3 specification file
 new f264c78  [NETBEANS-2005] Add support for CSS Grid Layout Module Level 1
 new ed95b77  Merge pull request #2299 from 
matthiasblaesing/css-improvements

The 4300 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:
 ide/css.editor/external/binaries-list  | 2 +-
 ide/css.editor/external/css3-spec-howtocreate.txt  |69 +
 .../css/editor/module/main/Bundle.properties   | 2 +-
 .../editor/module/main/DefaultCssEditorModule.java | 2 +-
 .../main/StandardPropertiesHelpResolver.java   | 7 +-
 .../properties/backgrounds_and_borders.properties  |62 +-
 .../main/properties/basic_box_model.properties | 9 +-
 .../properties/basic_user_interface.properties |24 +-
 .../module/main/properties/colors.properties   | 2 +-
 .../main/properties/default_module.properties  |52 +-
 .../editor/module/main/properties/fonts.properties |33 +-
 .../generated_and_replaced_content.properties  | 6 +-
 .../editor/module/main/properties/grid.properties  |61 +
 .../main/properties/grid_positioning.properties|28 -
 .../editor/module/main/properties/line.properties  |36 +-
 .../main/properties/lists_and_counters.properties  | 6 +-
 .../editor/module/main/properties/ruby.properties  | 4 +-
 .../module/main/properties/speech.properties   |30 +-
 .../editor/module/main/properties/text.properties  |70 +-
 .../main/properties/writing_modes.properties   |12 +-
 .../display/display.css.testDisplay.completion | 1 +
 .../main/BackgroundsAndBordersModuleTest.java  | 2 +-
 .../module/main/ListsAndCountersModuleTest.java| 4 +-
 .../main/StandardPropertiesHelpResolverTest.java   | 9 +-
 .../module/main/properties/PropertiesATest.java|38 +
 .../src/org/netbeans/modules/css/lib/Css3.g| 1 +
 .../org/netbeans/modules/css/lib/Css3Lexer.java|  3078 ++---
 .../org/netbeans/modules/css/lib/Css3Parser.java   | 12520 ++-
 .../css/lib/api/properties/GrammarResolver.java|26 +-
 .../css/lib/api/properties/TokenAcceptor.java  |15 +
 .../properties/GrammarResolverListenerTest.java| 8 +-
 .../css/lib/api/properties/PropertyValueTest.java  |42 +-
 32 files changed, 8327 insertions(+), 7934 deletions(-)
 create mode 100644 ide/css.editor/external/css3-spec-howtocreate.txt
 create mode 100644 
ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/grid.properties
 delete mode 100644 
ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/grid_positioning.properties


-
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



[netbeans] branch cnd updated: Update the copyright in all the files in the dlight/git.remote package..

2020-09-08 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/cnd by this push:
 new 9baedc6  Update the copyright in all the files in the 
dlight/git.remote package..
 new bf55111  Merge pull request #2356 from 
BradWalker/cnd_update_git_remote_copyright
9baedc6 is described below

commit 9baedc69bc7d87a4cdd1ed38d14893c1f99ad01c
Author: Brad Walker 
AuthorDate: Tue Sep 8 13:51:46 2020 -0400

Update the copyright in all the files in the dlight/git.remote package..
---
 .../modules/git/remote/client/CommandReport.form   | 20 
 .../modules/git/remote/options/Bundle.properties   | 56 +++---
 .../git/remote/options/GitOptionsPanel.form| 20 
 .../modules/git/remote/options/LabelsPanel.form| 20 
 .../git/remote/ui/branch/CherryPickPanel.form  | 20 
 .../git/remote/ui/branch/CreateBranchPanel.form| 20 
 .../remote/ui/branch/SelectTrackedBranchPanel.form | 20 
 .../git/remote/ui/checkout/CheckoutPathsPanel.form | 20 
 .../remote/ui/checkout/CheckoutRevisionPanel.form  | 20 
 .../git/remote/ui/checkout/RevertChangesPanel.form | 20 
 .../git/remote/ui/clone/CloneDestinationPanel.form | 20 
 .../git/remote/ui/clone/RepositoryStepPanel.form   | 20 
 .../modules/git/remote/ui/commit/CommitPanel.form  | 20 
 .../ui/conflicts/ResolveTreeConflictPanel.form | 20 
 .../git/remote/ui/diff/DiffToRevisionPanel.form| 20 
 .../git/remote/ui/diff/ExportAsFilePanel.form  | 20 
 .../git/remote/ui/diff/ExportCommitPanel.form  | 20 
 .../modules/git/remote/ui/diff/MultiDiffPanel.form | 20 
 .../git/remote/ui/history/SearchCriteriaPanel.form | 20 
 .../git/remote/ui/history/SearchHistoryPanel.form  | 20 
 .../modules/git/remote/ui/init/InitPanel.form  | 20 
 .../git/remote/ui/merge/MergeRevisionPanel.form| 20 
 .../modules/git/remote/ui/rebase/BasicPanel.form   | 20 
 .../modules/git/remote/ui/rebase/RebasePanel.form  | 20 
 .../git/remote/ui/rebase/SelectDestPanel.form  | 20 
 .../git/remote/ui/repository/ControlToolbar.form   | 20 
 .../ui/repository/RepositoryBrowserPanel.form  | 20 
 .../git/remote/ui/repository/RevisionDialog.form   | 20 
 .../remote/ui/repository/RevisionInfoPanel.form| 20 
 .../remote/ui/repository/RevisionListPanel.form| 20 
 .../remote/ui/repository/RevisionPickerDialog.form | 20 
 .../remote/ui/repository/SelectBranchPanel.form| 20 
 .../repository/remote/RemoteRepositoryPanel.form   | 20 
 .../git/remote/ui/repository/remote/SSHPanel.form  | 20 
 .../ui/repository/remote/SelectUriPanel.form   | 20 
 .../ui/repository/remote/UserPasswordPanel.form| 20 
 .../modules/git/remote/ui/reset/ResetPanel.form| 20 
 .../git/remote/ui/revert/RevertCommitPanel.form| 20 
 .../git/remote/ui/selectors/Bundle.properties  | 55 +++--
 .../git/remote/ui/selectors/ItemsPanel.form| 20 
 .../git/remote/ui/stash/SaveStashPanel.form| 20 
 .../git/remote/ui/status/VersioningPanel.form  | 20 
 .../modules/git/remote/ui/tag/CreateTagPanel.form  | 20 
 .../modules/git/remote/ui/tag/ManageTagsPanel.form | 20 
 44 files changed, 872 insertions(+), 79 deletions(-)

diff --git 
a/dlight/git.remote/src/org/netbeans/modules/git/remote/client/CommandReport.form
 
b/dlight/git.remote/src/org/netbeans/modules/git/remote/client/CommandReport.form
index c594349..df18795 100644
--- 
a/dlight/git.remote/src/org/netbeans/modules/git/remote/client/CommandReport.form
+++ 
b/dlight/git.remote/src/org/netbeans/modules/git/remote/client/CommandReport.form
@@ -1,4 +1,24 @@
 
+
 
 
   
diff --git 
a/dlight/git.remote/src/org/netbeans/modules/git/remote/options/Bundle.properties
 
b/dlight/git.remote/src/org/netbeans/modules/git/remote/options/Bundle.properties
index a6ae69c..fb42c17 100644
--- 
a/dlight/git.remote/src/org/netbeans/modules/git/remote/options/Bundle.properties
+++ 
b/dlight/git.remote/src/org/netbeans/modules/git/remote/options/Bundle.properties
@@ -1,44 +1,20 @@
+# 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 

[netbeans] branch cnd updated: [NETBEANS-4744] - update RAT license exceptions

2020-09-08 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/cnd by this push:
 new 5cc62ab  [NETBEANS-4744] - update RAT license exceptions
 new d99a060  Merge pull request #2355 from BradWalker/cnd_update_RAT_report
5cc62ab is described below

commit 5cc62abe8b7a5cc89fbfc7ede234d6df720f5d56
Author: Brad Walker 
AuthorDate: Wed Aug 26 14:31:01 2020 -0600

[NETBEANS-4744] - update RAT license exceptions

Updated the copyright in the XML files.

Updated the copyright in the C,C++ files.

Updated the copyright in the .h files.
---
 .../org/netbeans/modules/cnd/discovery/layer.xml   |  1 -
 .../samples_src/freeway/arrow_left.bitmap  | 39 
 .../samples_src/freeway/arrow_over.bitmap  | 39 
 .../samples_src/freeway/arrow_right.bitmap | 39 
 .../samples_src/freeway/arrow_up.bitmap| 39 
 .../samples_src/freeway/traffic.icon   | 39 
 .../samples_src/freeway/traffic.mask   | 39 
 cnd/cnd.makeproject/samples_src/hello/bar.f| 39 
 cnd/cnd.makeproject/samples_src/hello/foo.f| 40 -
 .../samples_src/helloqt/HelloForm.cpp  | 39 
 .../samples_src/helloqt/newmain.cpp| 39 
 cnd/cnd.makeproject/samples_src/lexyacc/token.l| 39 
 cnd/cnd.makeproject/samples_src/lexyacc/token.y| 39 
 .../samples_src/sample.cookbook.txt| 41 --
 .../resources/toolchaindefinition/GNU_debugger.xml |  1 +
 .../cnd.diagnostics.clank/nbproject/project.xml|  1 -
 16 files changed, 183 insertions(+), 330 deletions(-)

diff --git a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/layer.xml 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/layer.xml
index 14ca838..8ae9dc8 100644
--- a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/layer.xml
+++ b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/layer.xml
@@ -22,7 +22,6 @@
 -->
 
 
-
 
 
 
diff --git a/cnd/cnd.makeproject/samples_src/freeway/arrow_left.bitmap 
b/cnd/cnd.makeproject/samples_src/freeway/arrow_left.bitmap
index b80495c..4923314 100644
--- a/cnd/cnd.makeproject/samples_src/freeway/arrow_left.bitmap
+++ b/cnd/cnd.makeproject/samples_src/freeway/arrow_left.bitmap
@@ -1,31 +1,20 @@
 /*
- * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * * Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- *
- * * 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.
- *
- * * Neither the name of Oracle 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 COPYRIGHT OWNER 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.
+ * 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

[netbeans] branch master updated: [NETBEANS-4777] - Fix wrong binary-origin path for slf4j-api

2020-09-08 Thread matthiasblaesing
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 e6db244  [NETBEANS-4777] - Fix wrong binary-origin path for slf4j-api
 new 121a136  Merge pull request #2349 from pepness/slf4j-api
e6db244 is described below

commit e6db2441f2cdc61ab1c94bdb91c0663bc988f7e2
Author: Jose Contreras 
AuthorDate: Sun Sep 6 18:20:40 2020 -0500

[NETBEANS-4777] - Fix wrong binary-origin path for slf4j-api
---
 ide/slf4j.api/nbproject/project.properties | 2 ++
 ide/slf4j.api/nbproject/project.xml| 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ide/slf4j.api/nbproject/project.properties 
b/ide/slf4j.api/nbproject/project.properties
index 91ae8bc..a2e73e2 100644
--- a/ide/slf4j.api/nbproject/project.properties
+++ b/ide/slf4j.api/nbproject/project.properties
@@ -14,5 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
 release.external/slf4j-api-1.7.28.jar=modules/slf4j-api.jar
 is.autoload=true
diff --git a/ide/slf4j.api/nbproject/project.xml 
b/ide/slf4j.api/nbproject/project.xml
index 6ef7453..342d20a 100644
--- a/ide/slf4j.api/nbproject/project.xml
+++ b/ide/slf4j.api/nbproject/project.xml
@@ -28,7 +28,7 @@
 
 
 slf4j-api.jar
-
external/org.slf4j.api-1.7.28.jar
+external/slf4j-api-1.7.28.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



[netbeans] branch master updated (61123c2 -> 6c58b10)

2020-08-09 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from 61123c2  Merge pull request #2304 from Akshay-Gupta-Oracle/nbjavac14
 new 56ffe7d  Fix Spring Framework 3 Library
 new 1387f10  Remove nbjavac library definition
 new 6c58b10  Merge pull request #2302 from matthiasblaesing/fix-libraries

The 4228 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:
 java/libs.javacapi/manifest.mf |  1 -
 .../org/netbeans/libs/javacapi/Bundle.properties   |  4 ---
 .../org/netbeans/libs/javacapi/javac-library.xml   | 32 --
 .../src/org/netbeans/libs/javacapi/layer.xml   | 31 -
 .../nbproject/project.properties   |  2 --
 .../libs/springframework/spring-framework300.xml   |  2 --
 6 files changed, 72 deletions(-)
 delete mode 100644 
java/libs.javacapi/src/org/netbeans/libs/javacapi/javac-library.xml
 delete mode 100644 java/libs.javacapi/src/org/netbeans/libs/javacapi/layer.xml


-
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



[netbeans] branch cnd updated: Replace Oracle license with ALv2 license header in Bundle.properties files.

2020-08-02 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/cnd by this push:
 new 201961d  Replace Oracle license with ALv2 license header in 
Bundle.properties files.
 new 6efea7d  Merge pull request #2291 from 
BradWalker/cnd_cleanup_props_file
201961d is described below

commit 201961d1b60aba2f754d30794002c3ac83c2d4a0
Author: Brad Walker 
AuthorDate: Sun Aug 2 13:22:58 2020 -0500

Replace Oracle license with ALv2 license header in Bundle.properties files.

These files were part of the Oracle Netbeans donation #4 & #5.
---
 .../cnd/api/model/resources/Bundle.properties  | 47 ++-
 .../org/netbeans/modules/cnd/apt/Bundle.properties | 47 ++-
 .../cnd/classview/actions/Bundle.properties| 47 ++-
 .../cnd/classview/resources/Bundle.properties  | 47 ++-
 .../modules/cnd/discovery/Bundle.properties| 47 ++-
 .../cnd/discovery/projectimport/Bundle.properties  | 47 ++-
 .../modules/cnd/discovery/wizard/Bundle.properties | 37 +--
 .../discovery/wizard/api/support/Bundle.properties | 47 ++-
 .../wizard/support/impl/Bundle.properties  | 49 ++--
 .../modules/cnd/dwarfdiscovery/Bundle.properties   | 47 ++-
 .../cnd/dwarfdiscovery/provider/Bundle.properties  | 47 ++-
 .../cnd/dwarfdump/resources/Bundle.properties  | 47 ++-
 .../modules/cnd/highlight/error/Bundle.properties  | 47 ++-
 .../cnd/highlight/error/includes/Bundle.properties | 49 ++--
 .../cnd/highlight/resources/Bundle.properties  | 47 ++-
 .../cnd/highlight/semantic/Bundle.properties   | 47 ++-
 .../ui/configurations/Bundle.properties| 47 ++-
 .../modules/cnd/modeldiscovery/Bundle.properties   | 47 ++-
 .../cnd/modeldiscovery/provider/Bundle.properties  | 47 ++-
 .../cnd/modelimpl/platform/Bundle.properties   | 47 ++-
 .../cnd/modelimpl/resources/Bundle.properties  | 47 ++-
 .../netbeans/modules/cnd/modelui/Bundle.properties | 47 ++-
 .../modules/cnd/modelui/actions/Bundle.properties  | 47 ++-
 .../modules/cnd/modelui/parsing/Bundle.properties  | 47 ++-
 .../modules/cnd/modelui/switcher/Bundle.properties | 47 ++-
 .../modules/cnd/modelui/trace/Bundle.properties| 47 ++-
 .../cnd/modelutil/resources/Bundle.properties  | 47 ++-
 .../modules/cnd/remote/ui/Bundle.properties| 54 ++
 .../cnd/repository/resources/Bundle.properties | 47 ++-
 .../cnd/toolchain/ui/compilerset/Bundle.properties | 47 ++-
 .../cnd/toolchain/ui/options/Bundle.properties | 47 ++-
 .../modules/cnd/api/toolchain/Bundle.properties| 49 ++--
 .../modules/cnd/spi/toolchain/Bundle.properties| 47 ++-
 .../cnd/toolchain/compilerset/Bundle.properties| 47 ++-
 .../modules/cnd/ui/options/Bundle.properties   | 47 ++-
 .../diagnostics/clank/resources/Bundle.properties  | 19 +++-
 .../netbeans/modules/odcs/cnd/ui/Bundle.properties | 17 +++
 37 files changed, 516 insertions(+), 1168 deletions(-)

diff --git 
a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties
 
b/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties
index bcc0e19..0fe31d7 100644
--- 
a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties
+++ 
b/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their res

[netbeans] branch master updated: [NETBEANS-4465] - update RAT license exceptions

2020-07-08 Thread matthiasblaesing
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 fc9edf9  [NETBEANS-4465] - update RAT license exceptions
 new a4d306b  Merge pull request #2200 from BradWalker/update-rat-exclusion
fc9edf9 is described below

commit fc9edf9e2db121661830a0f5a1feb0250f689a17
Author: Brad Walker 
AuthorDate: Wed Jun 17 13:44:37 2020 -0600

[NETBEANS-4465] - update RAT license exceptions

When running the RAT report after a build has taken place, the report
picks up hundreds of generated files. These files do not have a license
header and it's really not necessary as they are generated by the build 
process..
---
 nbbuild/rat-exclusions.txt | 23 ++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt
index eff5267..d9247f7 100644
--- a/nbbuild/rat-exclusions.txt
+++ b/nbbuild/rat-exclusions.txt
@@ -23,9 +23,30 @@ nbbuild/licenses/**
 nbbuild/netbeans/**
 nbbuild/testuserdir/**
 nbbuild/user.build.properties
-## generated build artefact
+## generated build artifacts
 nbbuild/gitinfo.properties
 nbbuild/netbeansrelease.properties
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/model_1_4/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/model_5/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/model_6/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/model_7/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/model_8/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/model_1_4/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/model_5_0/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/model_6_0/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/model_7_0/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/model_2_1/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_0/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_1/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_2/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_2_4/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_2_5/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0_frag/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1_frag/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0_frag/*
 
 ## user-specific files  
 **/nbproject/private/**


-
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



[netbeans] branch master updated: [NETBEANS-4329] Update eclipselink from 2.5.2 to 2.7.7

2020-07-03 Thread matthiasblaesing
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 cef8320  [NETBEANS-4329] Update eclipselink from 2.5.2 to 2.7.7
cef8320 is described below

commit cef83201aaffadee5aa0d21fe071062a24e0f67e
Author: Jose Contreras 
AuthorDate: Mon May 11 11:02:27 2020 -0500

[NETBEANS-4329] Update eclipselink from 2.5.2 to 2.7.7
---
 .../src/org/netbeans/modules/websvc/swdp/swdp.xml  | 12 
 java/j2ee.eclipselink/build.xml| 20 ++---
 java/j2ee.eclipselink/external/binaries-list   | 16 +-
 ...2-license.txt => eclipselink-2.7.7-license.txt} |  6 ++--
 java/j2ee.eclipselink/nbproject/project.properties | 34 --
 java/j2ee.eclipselink/nbproject/project.xml| 15 ++
 .../modules/j2ee/eclipselink/eclipselink_lib.xml   | 30 +--
 .../modules/j2ee/eclipselink/jpa20-persistence.xml |  6 ++--
 .../external/binaries-list |  2 +-
 ...2-license.txt => eclipselink-2.7.7-license.txt} |  6 ++--
 .../nbproject/project.properties   |  4 +--
 .../eclipselinkmodelgen_lib.xml|  4 +--
 .../nbproject/project.properties   | 14 -
 .../nbproject/project.properties   |  2 +-
 .../nbproject/project.properties   | 14 -
 java/j2ee.persistence/nbproject/project.properties | 12 
 .../persistence/unit/PersistenceCfgProperties.java |  4 +--
 .../nbproject/project.properties   | 12 
 nbbuild/licenses/EPL-v10-eclipselink   |  2 +-
 19 files changed, 110 insertions(+), 105 deletions(-)

diff --git 
a/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/swdp.xml 
b/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/swdp.xml
index f6654c4..f285f4e 100644
--- a/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/swdp.xml
+++ b/enterprise/websvc.restlib/src/org/netbeans/modules/websvc/swdp/swdp.xml
@@ -48,12 +48,12 @@
 
jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-container-servlet.jar!/
 
jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-container-servlet-core.jar!/
 
jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-server.jar!/
-
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar!/
-
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar!/
-
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar!/
-
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar!/
-
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar!/
-
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.moxy-2.5.2.jar!/
+
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.core-2.7.7.jar!/
+
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.asm-2.7.7.jar!/
+
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.7.7.jar!/
+
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.7.7.jar!/
+
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.7.7.jar!/
+
jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.moxy-2.7.7.jar!/
 
 
 
diff --git a/java/j2ee.eclipselink/build.xml b/java/j2ee.eclipselink/build.xml
index 7c9701f..6ef6bb7 100644
--- a/java/j2ee.eclipselink/build.xml
+++ b/java/j2ee.eclipselink/build.xml
@@ -24,22 +24,22 @@
 
 
 
-
+
 
 
 
-   
-   
-   
-   
-   
-   
+   
+   
+   
+   
+   
+   



-   
-   
+   
+   

 
 
diff --git a/java/j2ee.eclipselink/external/binaries-list 
b/java/j2ee.eclipselink/external/binaries-list
index 1d21e45..7f438e0 100644
--- a/java/j2ee.eclipselink/external/binaries-list
+++ b/java/j2ee.eclipselink/external/binaries-list
@@ -14,11 +14,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-04C4E53577658440409783942AEE0D37DA

[netbeans] branch master updated: [NETBEANS-4515] - remove use of proprietary API - ARRAYLENGTH

2020-06-29 Thread matthiasblaesing
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 8318c76  [NETBEANS-4515] - remove use of proprietary API - ARRAYLENGTH
 new 444badd  Merge pull request #2220 from 
BradWalker/remove_proprietary_api_ARRAYLENGTH
8318c76 is described below

commit 8318c76e4925e4341b53d46fe27e45c979ee9121
Author: Brad Walker 
AuthorDate: Sun Jun 28 22:46:49 2020 -0600

[NETBEANS-4515] - remove use of proprietary API - ARRAYLENGTH

The code has a test case that uses a proprietary API field - ARRAYLENGTH..

...
 [nb-javac] 
/home/travis/build/apache/netbeans/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/SeparatorTest.java:21:
 warning: ARRAYLENGTH is internal proprietary API and may be removed in a 
future release

 [nb-javac] import com.sun.org.apache.bcel.internal.generic.ARRAYLENGTH;

 [nb-javac]^

 [nb-javac] 
/home/travis/build/apache/netbeans/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/SeparatorTest.java:21:
 warning: ARRAYLENGTH is internal proprietary API and may be removed in a 
future release

 [nb-javac] import com.sun.org.apache.bcel.internal.generic.ARRAYLENGTH;

 [nb-javac]^

 [nb-javac] 
/home/travis/build/apache/netbeans/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/SeparatorTest.java:21:
 warning: ARRAYLENGTH is internal proprietary API and may be removed in a 
future release

 [nb-javac] import com.sun.org.apache.bcel.internal.generic.ARRAYLENGTH;

 [nb-javac]^
...

Remove the import of this class as it's not used and causes spurious 
warnings..
---
 .../test/unit/src/org/netbeans/api/java/source/gen/SeparatorTest.java| 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/SeparatorTest.java
 
b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/SeparatorTest.java
index ce231de..6780ccb 100644
--- 
a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/SeparatorTest.java
+++ 
b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/SeparatorTest.java
@@ -18,7 +18,6 @@
  */
 package org.netbeans.api.java.source.gen;
 
-import com.sun.org.apache.bcel.internal.generic.ARRAYLENGTH;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;


-
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



[netbeans-mavenutils-nbm-maven-plugin] branch master updated: Fixes errors when compiling with recent JDKS

2020-06-23 Thread matthiasblaesing
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-mavenutils-nbm-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new d09e2f6  Fixes errors when compiling with recent JDKS
 new a69e128  Merge pull request #11 from 
EnricoScantamburlo/made_it_work_with_recent_jdk
d09e2f6 is described below

commit d09e2f6d918e82388451522e0b14e7fb4cb3b750
Author: Enrico Scantamburlo 
AuthorDate: Sun Jun 21 01:05:58 2020 +0200

Fixes errors when compiling with recent JDKS

Maven 3.0.5 does not work because it fails to dowload thru HTTP when
HTTPS is now required
Added a forced cast to Classloader to avoid ambigous method call and
made it compile
---
 pom.xml|  8 ++---
 .../netbeans/nbm/CreateNetBeansFileStructure.java  | 39 +++---
 2 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6ef2230..9007571 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@ under the License.
 https://issues.apache.org/jira/browse/NETBEANSINFRA
 
 
-3.0.5
+3.6.3
 
 
 
@@ -62,7 +62,7 @@ under the License.
 
 org.apache.maven.plugins
 maven-plugin-plugin
-3.5
+3.6.0
 
 
true
 
@@ -118,8 +118,8 @@ under the License.
 org.apache.maven.plugins
 maven-compiler-plugin
 
-1.7
-1.7
+1.8
+1.8
 
 
 
diff --git 
a/src/main/java/org/apache/netbeans/nbm/CreateNetBeansFileStructure.java 
b/src/main/java/org/apache/netbeans/nbm/CreateNetBeansFileStructure.java
index 9d33cc6..9a3d230 100644
--- a/src/main/java/org/apache/netbeans/nbm/CreateNetBeansFileStructure.java
+++ b/src/main/java/org/apache/netbeans/nbm/CreateNetBeansFileStructure.java
@@ -21,8 +21,6 @@ package org.apache.netbeans.nbm;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.reflect.Field;
@@ -40,13 +38,11 @@ import java.util.Map;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.JarInputStream;
-import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-//import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -301,8 +297,7 @@ public abstract class CreateNetBeansFileStructure
 a.putValue( "Class-Path", classPath );
 a.remove( new Attributes.Name( "Maven-Class-Path" ) );
 
-try ( FileSystem fs = FileSystems.newFileSystem( 
moduleFile.toPath(), null ) )
-{
+try (FileSystem fs = 
FileSystems.newFileSystem(moduleFile.toPath(), (ClassLoader) null)) 
   {
 try ( BufferedOutputStream mfWriter = new 
BufferedOutputStream( Files.newOutputStream( fs.getPath( JarFile.MANIFEST_NAME 
) ) ) )
 {
 m.write( mfWriter );
@@ -354,15 +349,9 @@ public abstract class CreateNetBeansFileStructure
 {
 String name = target.getName();
 getLog().info( "Using *.external replacement for " 
+ name );
-PrintWriter external = new PrintWriter( new File( 
targetDir, name + ".external" ), "UTF-8" );
-try
-{
+try (PrintWriter external = new PrintWriter(new 
File(targetDir, name + ".external"), "UTF-8")) {
 writeExternal( external, artifact );
 }
-finally
-{
-external.close();
-}
 }
 }
 catch ( IOException ex )
@@ -488,7 +477,7 @@ public abstract class CreateNetBeansFileStructure
 "NBM resources defined in module descriptor are 
deprecated. Please configure NBM resources in plugin configuration." );
 Copy cp = (Copy) antProject.createTask( "copy" );
 cp.setTod

[netbeans] branch master updated: [NETBEANS-4459] - remove use of deprecated field in Logger

2020-06-18 Thread matthiasblaesing
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 5f3f8f5  [NETBEANS-4459] - remove use of deprecated field in Logger
 new 93483cc  Merge pull request #2195 from BradWalker/update_logger_global
5f3f8f5 is described below

commit 5f3f8f5961ce6671afff8736fb5b018615813199
Author: Brad Walker 
AuthorDate: Tue Jun 16 23:21:51 2020 -0600

[NETBEANS-4459] - remove use of deprecated field in Logger

Remove use of the deprecated Logger.global field..

   [repeat] 
/home/bwalker/src/netbeans/enterprise/web.core/src/org/netbeans/modules/web/wizards/ServletPanel.java:169:
 warning: [deprecation] global in Logger has been deprecated
   [repeat] Logger.global.log(Level.WARNING, "getServlets 
failed", e);
   [repeat]   ^
   [repeat] 
/home/bwalker/src/netbeans/enterprise/web.core/src/org/netbeans/modules/web/wizards/ServletPanel.java:172:
 warning: [deprecation] global in Logger has been deprecated
   [repeat] Logger.global.log(Level.WARNING, "getServlets 
failed", e);
   [repeat]   ^
   [repeat] Note: Some input files additionally use or override a 
deprecated API.
---
 .../j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.java   | 2 +-
 .../j2ee/ddloaders/web/multiview/RelativeOrderingPanel.java   | 2 +-
 .../netbeans/modules/web/core/jsploader/TagLibParseSupport.java   | 2 +-
 .../src/org/netbeans/modules/web/wizards/ServletPanel.java| 8 
 .../src/org/netbeans/modules/websvc/core/JaxWsUtils.java  | 2 +-
 .../websvc/core/jaxws/saas/RestWrapperForSoapGenerator.java   | 2 +-
 .../org/netbeans/modules/websvc/manager/WebServiceManager.java| 2 +-
 .../modules/websvc/manager/WebServicePersistenceManager.java  | 2 +-
 .../modules/websvc/manager/model/WebServiceListModel.java | 2 +-
 .../org/netbeans/modules/refactoring/api/AbstractRefactoring.java | 2 +-
 .../websvc/saas/codegen/model/SoapClientOperationInfo.java| 2 +-
 .../src/org/netbeans/modules/websvc/saas/codegen/util/Util.java   | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git 
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.java
 
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.java
index d2be3d0..4d9c84d 100644
--- 
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.java
+++ 
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.java
@@ -254,7 +254,7 @@ public class AbsoluteOrderingPanel extends 
SectionInnerPanel implements java.awt
 dObj.modelUpdatedFromUI();
 }
 catch (VersionNotSupportedException e) {
-Logger.global.log(Level.SEVERE, "refresh of DD model failed", e);
+Logger.getGlobal().log(Level.SEVERE, "refresh of DD model failed", 
e);
 }
 }
 
diff --git 
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.java
 
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.java
index 743289a..95264f8 100644
--- 
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.java
+++ 
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.java
@@ -421,7 +421,7 @@ public class RelativeOrderingPanel extends 
SectionInnerPanel implements java.awt
 
 private void refreshDdModel() {
 if (!(webApp instanceof WebFragment)) {
-Logger.global.log(Level.SEVERE, "refreshDdModel failed, not a 
WebFragment instance of DD passed!");
+Logger.getGlobal().log(Level.SEVERE, "refreshDdModel failed, not a 
WebFragment instance of DD passed!");
 return;
 }
 WebFragment webFrag = (WebFragment)webApp;
diff --git 
a/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/TagLibParseSupport.java
 
b/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/TagLibParseSupport.java
index 51b4f5a..870072e 100644
--- 
a/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/TagLibParseSupport.java
+++ 
b/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/TagLibParseSupport.java
@@ -411,7 +411,7 @@ public class TagLibParseSupport implements 
org.openide.nodes.Node.Cookie, TagLib
 
 private boolean checkError(JspParserAPI.ErrorDescriptor err) {
 if(err.getErrorMessage() == null) {
-Logger.global.log(Level.INFO, nul

[netbeans] branch release120 updated: [NETBEANS-4341] Disable maven global cache

2020-06-11 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/release120 by this push:
 new e6145be  [NETBEANS-4341] Disable maven global cache
 new 497a0e7  Merge pull request #2181 from 
matthiasblaesing/NETBEANS-4341-12.0
e6145be is described below

commit e6145be91a154a38a1a956871806e4063648bbd3
Author: Matthias Bläsing 
AuthorDate: Tue Jun 9 18:01:14 2020 +0200

[NETBEANS-4341] Disable maven global cache

With the cache enabled updates to the pom or the dependencies are not
picked up correctly.

Diagnosis and work-around was provided by Christian Oyarzun.
---
 java/maven/manifest.mf |  2 +-
 .../netbeans/modules/maven/MavenCacheDisabler.java | 42 ++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/java/maven/manifest.mf b/java/maven/manifest.mf
index a845bde..713a3c4 100644
--- a/java/maven/manifest.mf
+++ b/java/maven/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.maven/2
-OpenIDE-Module-Specification-Version: 2.138
+OpenIDE-Module-Specification-Version: 2.138.1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/maven/layer.xml
 AutoUpdate-Show-In-Client: false
diff --git a/java/maven/src/org/netbeans/modules/maven/MavenCacheDisabler.java 
b/java/maven/src/org/netbeans/modules/maven/MavenCacheDisabler.java
new file mode 100644
index 000..856630d
--- /dev/null
+++ b/java/maven/src/org/netbeans/modules/maven/MavenCacheDisabler.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+package org.netbeans.modules.maven;
+
+import org.openide.modules.OnStart;
+
+import static 
org.apache.maven.project.DefaultProjectBuilder.DISABLE_GLOBAL_MODEL_CACHE_SYSTEM_PROPERTY;
+
+/**
+ * Disable the maven global cache. With the cache enabled updates to the pom or
+ * the dependencies are not picked up correctly.
+ *
+ * @see
+ * https://issues.apache.org/jira/browse/NETBEANS-4341;>NETBEANS-4341
+ * @see https://issues.apache.org/jira/browse/MNG-6530;>MNG-6530
+ */
+@OnStart
+public class MavenCacheDisabler implements Runnable {
+
+@Override
+public void run() {
+if(System.getProperty(DISABLE_GLOBAL_MODEL_CACHE_SYSTEM_PROPERTY) == 
null) {
+System.setProperty(DISABLE_GLOBAL_MODEL_CACHE_SYSTEM_PROPERTY, 
"true");
+}
+}
+}


-
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



[netbeans] branch master updated: [NETBEANS-4341] Disable maven global cache

2020-06-11 Thread matthiasblaesing
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 8b1d9e8  [NETBEANS-4341] Disable maven global cache
 new 866c00f  Merge pull request #2177 from matthiasblaesing/NETBEANS-4341
8b1d9e8 is described below

commit 8b1d9e8530bd50d925142e7d919376ee8339ad2d
Author: Matthias Bläsing 
AuthorDate: Tue Jun 9 18:01:14 2020 +0200

[NETBEANS-4341] Disable maven global cache

With the cache enabled updates to the pom or the dependencies are not
picked up correctly.

Diagnosis and work-around was provided by Christian Oyarzun.
---
 java/maven/manifest.mf |  2 +-
 .../netbeans/modules/maven/MavenCacheDisabler.java | 42 ++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/java/maven/manifest.mf b/java/maven/manifest.mf
index 815c69a..eef29b4 100644
--- a/java/maven/manifest.mf
+++ b/java/maven/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.maven/2
-OpenIDE-Module-Specification-Version: 2.139
+OpenIDE-Module-Specification-Version: 2.139.1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/maven/layer.xml
 AutoUpdate-Show-In-Client: false
diff --git a/java/maven/src/org/netbeans/modules/maven/MavenCacheDisabler.java 
b/java/maven/src/org/netbeans/modules/maven/MavenCacheDisabler.java
new file mode 100644
index 000..856630d
--- /dev/null
+++ b/java/maven/src/org/netbeans/modules/maven/MavenCacheDisabler.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+package org.netbeans.modules.maven;
+
+import org.openide.modules.OnStart;
+
+import static 
org.apache.maven.project.DefaultProjectBuilder.DISABLE_GLOBAL_MODEL_CACHE_SYSTEM_PROPERTY;
+
+/**
+ * Disable the maven global cache. With the cache enabled updates to the pom or
+ * the dependencies are not picked up correctly.
+ *
+ * @see
+ * https://issues.apache.org/jira/browse/NETBEANS-4341;>NETBEANS-4341
+ * @see https://issues.apache.org/jira/browse/MNG-6530;>MNG-6530
+ */
+@OnStart
+public class MavenCacheDisabler implements Runnable {
+
+@Override
+public void run() {
+if(System.getProperty(DISABLE_GLOBAL_MODEL_CACHE_SYSTEM_PROPERTY) == 
null) {
+System.setProperty(DISABLE_GLOBAL_MODEL_CACHE_SYSTEM_PROPERTY, 
"true");
+}
+}
+}


-
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



[netbeans] branch master updated: [NETBEANS-4050] - cleanup uses of EMPTY_LIST, EMPTY_SET, EMPTY_MAP

2020-06-11 Thread matthiasblaesing
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 f5f3c9f  [NETBEANS-4050] - cleanup uses of EMPTY_LIST, EMPTY_SET, 
EMPTY_MAP
 new 36cfe28  Merge pull request #2075 from BradWalker/cleanup_EMPTY_LIST
f5f3c9f is described below

commit f5f3c9f07816a29a7fddc64d8cbd6eaddb933c6c
Author: Brad Walker 
AuthorDate: Mon Apr 13 09:43:26 2020 -0600

[NETBEANS-4050] - cleanup uses of EMPTY_LIST, EMPTY_SET, EMPTY_MAP

 Clean up a bunch of compiler warning messages related to the use of 
Collections.[EMPTY_LIST, EMPTY_SET, EMPTY_MAP]..

 [repeat] 
/home/bwalker/src/netbeans/java/ant.debugger/src/org/netbeans/modules/ant/debugger/RunTargetsAction.java:145:
 warning: [unchecked] unchecked conversion
 [repeat] allTargets = Collections.EMPTY_SET;
 [repeat] ^
 [repeat] required: Set
 [repeat] found: Set
---
 .../modules/maven/apisupport/ExamineManifest.java|  2 +-
 .../eecommon/dd/wizard/PayaraDDWizardIterator.java   |  2 +-
 .../modules/web/core/syntax/JspHyperlinkProvider.java|  2 +-
 .../netbeans/modules/web/jsf/editor/HtmlSourceTask.java  |  2 +-
 .../org/netbeans/modules/web/jsf/JSFConfigUtilities.java |  2 +-
 .../netbeans/modules/web/project/ui/EjbsNodeFactory.java |  2 +-
 .../modules/web/struts/StrutsConfigUtilities.java|  2 +-
 .../modules/websvc/rest/nodes/RestServiceChildren.java   |  2 +-
 .../completion/ConstructorGenerationCompletion.java  |  2 +-
 .../modules/bugtracking/issuetable/IssueTable.java   |  4 ++--
 .../modules/docker/api/DockerContainerDetail.java|  2 +-
 .../modules/editor/completion/CompletionJList.java   |  2 +-
 .../org/netbeans/modules/versioning/hooks/VCSHooks.java  |  2 +-
 .../web/webkit/debugging/api/css/MatchedStyles.java  |  2 +-
 .../web/webkit/debugging/api/css/PropertyInfo.java   |  4 ++--
 .../modules/web/webkit/debugging/api/css/Rule.java   |  2 +-
 .../web/webkit/debugging/api/css/StyleSheetBody.java |  2 +-
 .../netbeans/modules/ant/debugger/RunTargetsAction.java  |  2 +-
 .../modules/dbschema/jdbcimpl/SchemaElementImpl.java |  4 ++--
 .../modules/debugger/jpda/ui/focus/AWTGrabHandler.java   | 16 
 .../modules/debugger/jpda/expr/EvaluatorVisitor.java | 16 
 .../debugger/jpda/models/VariableMirrorTranslator.java   |  8 
 .../modules/debugger/jpda/remote/RemoteServices.java |  6 +++---
 .../queries/DefaultSourceLevelQueryImpl.java |  4 ++--
 .../modules/maven/indexer/spi/NullResultImpl.java|  2 +-
 .../maven/model/settings/impl/SettingsComponentImpl.java |  2 +-
 .../src/org/netbeans/modules/maven/DependencyType.java   |  2 +-
 .../modules/spring/beans/refactoring/Modifications.java  |  2 +-
 .../testng/ui/wizards/TestNGSuiteHyperlingProvider.java  |  2 +-
 .../editor/codegen/AddJavaFXPropertyCodeGenerator.java   |  2 +-
 .../javafx2/editor/codegen/AddJavaFXPropertyMaker.java   | 14 +++---
 .../src/org/openide/windows/DelegateActionMap.java   |  2 +-
 .../netbeans/modules/javascript2/model/ModelVisitor.java |  2 +-
 .../nodejs/editor/model/NodeJsObjectInterceptor.java |  2 +-
 .../source/query/SourceElementsQueryImpl.java|  2 +-
 .../src/org/netbeans/lib/v8debug/JSONReader.java |  2 +-
 .../src/org/netbeans/lib/v8debug/commands/Flags.java |  2 +-
 .../websvc/saas/ui/nodes/WadlSaasNodeChildren.java   |  2 +-
 .../websvc/saas/ui/nodes/WsdlSaasNodeChildren.java   |  2 +-
 39 files changed, 68 insertions(+), 68 deletions(-)

diff --git 
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExamineManifest.java
 
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExamineManifest.java
index 07f7257..b794656 100644
--- 
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExamineManifest.java
+++ 
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/ExamineManifest.java
@@ -51,7 +51,7 @@ public class ExamineManifest  {
 private String locBundle;
 private boolean publicPackages;
 private boolean populateDependencies = false;
-private List dependencyTokens = Collections.EMPTY_LIST;
+private List dependencyTokens = Collections.emptyList();

 
 public void checkFile() throws MojoExecutionException {
diff --git 
a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/wizard/PayaraDDWizardIterator.java
 
b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/wizard/PayaraDDWizardIterator.java
index bc6c6f1..81f6f13 100644
--- 
a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/wizard/PayaraDDWizardIterator.java
+++ 
b/enterprise/payara.eecommon/src/org/netbeans/modules/payara

[netbeans-website] branch master updated: Move dev uc to 12.0

2020-06-09 Thread matthiasblaesing
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-website.git


The following commit(s) were added to refs/heads/master by this push:
 new f8b38cf  Move dev uc to 12.0
 new 959ee1c  Merge pull request #473 from matthiasblaesing/dev-uc-12
f8b38cf is described below

commit f8b38cf1915c99f981a97d5c45b6e7ee803614b7
Author: Matthias Bläsing 
AuthorDate: Sat May 23 11:55:12 2020 +0200

Move dev uc to 12.0
---
 netbeans.apache.org/src/content/.htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbeans.apache.org/src/content/.htaccess 
b/netbeans.apache.org/src/content/.htaccess
index bfbbc9c..2ac8b31 100644
--- a/netbeans.apache.org/src/content/.htaccess
+++ b/netbeans.apache.org/src/content/.htaccess
@@ -14,7 +14,7 @@ Redirect 302 /nb/plugins/11.3/ 
https://netbeans-vm.apache.org/pluginportal2/upda
 Redirect 302 /nb/updates/12.0/ https://netbeans-vm.apache.org/uc/12.0/
 Redirect 302 /nb/plugins/12.0/ https://plugins.netbeans.apache.org/data/12.0/
 Redirect 302 /nb/updates/dev/ https://netbeans-vm.apache.org/uc/11.3/
-Redirect 302 /nb/plugins/dev/ 
https://netbeans-vm.apache.org/pluginportal2/updates/11.0/
+Redirect 302 /nb/plugins/dev/ https://plugins.netbeans.apache.org/data/12.0/
 Redirect 302 /nb/issues_redirect.html 
https://issues.apache.org/jira/projects/NETBEANS/issues
 Redirect 302 /nb/report-issue 
https://issues.apache.org/jira/projects/NETBEANS/issues
 #cgi mirror script


-
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



[netbeans-tools] branch master updated: Configuration contains core application logic so realign it with implementation

2020-06-05 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 41a6277  Configuration contains core application logic so realign it 
with implementation
41a6277 is described below

commit 41a627787bfa8c5c23aef9e5807b86cd8f2a5410
Author: Matthias Bläsing 
AuthorDate: Fri Jun 5 22:54:24 2020 +0200

Configuration contains core application logic so realign it with 
implementation
---
 pp3/module/Application/config/module.config.php.dist | 20 +---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pp3/module/Application/config/module.config.php.dist 
b/pp3/module/Application/config/module.config.php.dist
index b7bd6bd..33eb0be 100755
--- a/pp3/module/Application/config/module.config.php.dist
+++ b/pp3/module/Application/config/module.config.php.dist
@@ -80,7 +80,7 @@ return array(
 'catalogue' => array(
 'type' => 'segment',
 'options' => array(
-'route' => '/catalogue[/][:action]',
+'route' => 
'/catalogue[/][:action][/:pathParam][/:pathParam2]',
 'constraints' => array(
 'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
 ),
@@ -171,10 +171,24 @@ return array(
 'defaults' => array(
 '__NAMESPACE__' => 'Application\Controller',
 'controller' => 'Login',
-'action' => 'request',
+'action' => 'index',
 ),
 ),
-),   
+),
+'verification-log' => array(
+'type' => 'segment',
+'options' => array(
+'route' => '/verification-log[/][:action]',
+'constraints' => array(
+'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+),
+'defaults' => array(
+'__NAMESPACE__' => 'Application\Controller',
+'controller' => 'Index',
+'action' => 'verification-log',
+),
+),
+),
 ),
 ),
 'service_manager' => array(


-
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



[netbeans-tools] branch master updated (fc403a8 -> 8f55b5a)

2020-06-05 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git.


from fc403a8  Merge pull request #31 from matthiasblaesing/pp3-updatecatalog
 new 620c6ab  Remove return type as it collides with PHP 7
 new db0caa0  Stream into file and don't hold download in memory
 new 6970b53  If we don't yet have an SHA-1 checksum update now
 new 8f55b5a  Merge pull request #32 from matthiasblaesing/hotfix

The 138 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:
 .../src/Application/Entity/Base/PluginVersion.php  |  2 +-
 pp3/module/Application/src/Application/Pp/Catalog.php  | 18 +-
 2 files changed, 10 insertions(+), 10 deletions(-)


-
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



[netbeans-tools] branch master updated (873140d -> fc403a8)

2020-06-02 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git.


from 873140d  Merge pull request #30 from matthiasblaesing/icon-plugincenter
 new da78980  [NETBEANS-4378] Ensure module info in catalog and module info 
is aligned
 new d1309a5  [NETBEANS-4378] Extract data for OSGI jars and downloadsize
 new 45bd970  [NETBEANS-4378] Autoupdate code expects URLs to end with .jar 
for OSGI jars and .nbm for NetBeans modules
 new da43068  Fix warnings observed while testing update center catalog 
generation
 new fc403a8  Merge pull request #31 from matthiasblaesing/pp3-updatecatalog

The 134 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:
 .gitignore |   1 +
 pp3/config/pp3.sql |   3 +
 .../Application/external/osgi-jar-parser.jar   | Bin 0 -> 8955 bytes
 .../Application/external/osgi-jar-parser/pom.xml   |  58 
 .../helper/osgi/jar/parser/MakeUpdateDesc.java | 307 +
 .../src/Application/Controller/AdminController.php |  14 +-
 .../src/Application/Controller/BaseController.php  |   4 +
 .../src/Application/Controller/IndexController.php |  18 +-
 .../Application/Controller/PluginController.php|   8 +-
 .../Controller/PluginVersionController.php |  15 +-
 .../Controller/VerificationController.php  |  17 +-
 .../src/Application/Entity/Base/PluginVersion.php  |  29 ++
 .../Entity/Base/VerificationRequest.php|   2 +-
 .../src/Application/Entity/PluginVersion.php   |   8 +
 .../Application/src/Application/Pp/Catalog.php | 247 ++---
 .../view/application/index/catalogue.phtml |   5 +-
 .../view/partials/_nbVersion-select.phtml  |   1 +
 17 files changed, 651 insertions(+), 86 deletions(-)
 create mode 100644 pp3/module/Application/external/osgi-jar-parser.jar
 create mode 100644 pp3/module/Application/external/osgi-jar-parser/pom.xml
 create mode 100644 
pp3/module/Application/external/osgi-jar-parser/src/main/java/org/apache/netbeans/website/helper/osgi/jar/parser/MakeUpdateDesc.java


-
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



[netbeans-tools] branch master updated: Add favicon to plugin portal

2020-05-26 Thread matthiasblaesing
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-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 470b235  Add favicon to plugin portal
 new 873140d  Merge pull request #30 from matthiasblaesing/icon-plugincenter
470b235 is described below

commit 470b23546a0b4aaddee83d427b8e302eac38b0c5
Author: Matthias Bläsing 
AuthorDate: Fri May 22 22:10:29 2020 +0200

Add favicon to plugin portal

Icon integration follows the sample set by the main apache netbeans
website. The icons and manifest files are copied from the source code
of that website.
---
 pp3/module/Application/view/layout/layout.phtml |  11 +++
 pp3/public/android-chrome-192x192.png   | Bin 0 -> 9488 bytes
 pp3/public/android-chrome-512x512.png   | Bin 0 -> 26768 bytes
 pp3/public/apple-touch-icon.png | Bin 0 -> 8922 bytes
 pp3/public/browserconfig.xml|   9 +
 pp3/public/favicon-16x16.png| Bin 0 -> 1306 bytes
 pp3/public/favicon-32x32.png| Bin 0 -> 1755 bytes
 pp3/public/favicon.ico  | Bin 0 -> 15086 bytes
 pp3/public/mstile-150x150.png   | Bin 0 -> 6756 bytes
 pp3/public/safari-pinned-tab.svg|  19 +++
 pp3/public/site.webmanifest |  19 +++
 11 files changed, 58 insertions(+)

diff --git a/pp3/module/Application/view/layout/layout.phtml 
b/pp3/module/Application/view/layout/layout.phtml
index 7096bab..d63f7f0 100755
--- a/pp3/module/Application/view/layout/layout.phtml
+++ b/pp3/module/Application/view/layout/layout.phtml
@@ -30,6 +30,17 @@
 ->appendName('viewport', 'width=device-width, 
initial-scale=1.0')
 ->appendHttpEquiv('X-UA-Compatible', 'IE=edge')
 ?>
+
+
+
+
+
+
+
+
+
+
+
 
 headLink()
diff --git a/pp3/public/android-chrome-192x192.png 
b/pp3/public/android-chrome-192x192.png
new file mode 100644
index 000..42bcc7a
Binary files /dev/null and b/pp3/public/android-chrome-192x192.png differ
diff --git a/pp3/public/android-chrome-512x512.png 
b/pp3/public/android-chrome-512x512.png
new file mode 100644
index 000..29a672a
Binary files /dev/null and b/pp3/public/android-chrome-512x512.png differ
diff --git a/pp3/public/apple-touch-icon.png b/pp3/public/apple-touch-icon.png
new file mode 100644
index 000..a1d64cb
Binary files /dev/null and b/pp3/public/apple-touch-icon.png differ
diff --git a/pp3/public/browserconfig.xml b/pp3/public/browserconfig.xml
new file mode 100644
index 000..a23b68c
--- /dev/null
+++ b/pp3/public/browserconfig.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+#ffc40d
+
+
+
diff --git a/pp3/public/favicon-16x16.png b/pp3/public/favicon-16x16.png
new file mode 100644
index 000..c8d1cc2
Binary files /dev/null and b/pp3/public/favicon-16x16.png differ
diff --git a/pp3/public/favicon-32x32.png b/pp3/public/favicon-32x32.png
new file mode 100644
index 000..1e71b95
Binary files /dev/null and b/pp3/public/favicon-32x32.png differ
diff --git a/pp3/public/favicon.ico b/pp3/public/favicon.ico
new file mode 100644
index 000..a74d6c8
Binary files /dev/null and b/pp3/public/favicon.ico differ
diff --git a/pp3/public/mstile-150x150.png b/pp3/public/mstile-150x150.png
new file mode 100644
index 000..b4c97c7
Binary files /dev/null and b/pp3/public/mstile-150x150.png differ
diff --git a/pp3/public/safari-pinned-tab.svg b/pp3/public/safari-pinned-tab.svg
new file mode 100644
index 000..7cf68e5
--- /dev/null
+++ b/pp3/public/safari-pinned-tab.svg
@@ -0,0 +1,19 @@
+
+http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd;>
+http://www.w3.org/2000/svg;
+ width="512.00pt" height="512.00pt" viewBox="0 0 512.00 512.00"
+ preserveAspectRatio="xMidYMid meet">
+
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+
+
+
+
+
diff --git a/pp3/public/site.webmanifest b/pp3/public/site.webmanifest
new file mode 100644
index 000..1edcfef
--- /dev/null
+++ b/pp3/public/site.webmanifest
@@ -0,0 +1,19 @@
+{
+"name": "",
+"short_name": "",
+"icons": [
+{
+"src": "android-chrome-192x192.png",
+"sizes": "192x192",
+"type": "image/png"
+},
+{
+"src": "android-chrome-512x512.png",
+"sizes": "512x512",
+"type": "image/png"
+}
+],
+"theme_color": "#ff",
+  

[netbeans] branch master updated: [NETBEANS-3961] Save project location for reuse for native maven projects.

2020-03-12 Thread matthiasblaesing
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 6594b1f  [NETBEANS-3961] Save project location for reuse for native 
maven projects.
 new 47500cb  Merge pull request #2002 from 
errael/SaveDefaultProjectLocationByMaven
6594b1f is described below

commit 6594b1f0630b60d25f123314bfdb86b9044654bb
Author: Ernie Rael 
AuthorDate: Wed Mar 4 00:41:43 2020 +

[NETBEANS-3961] Save project location for reuse for native maven projects.
---
 .../maven/newproject/idenative/IDENativeMavenWizardIterator.java | 5 +
 1 file changed, 5 insertions(+)

diff --git 
a/java/maven/src/org/netbeans/modules/maven/newproject/idenative/IDENativeMavenWizardIterator.java
 
b/java/maven/src/org/netbeans/modules/maven/newproject/idenative/IDENativeMavenWizardIterator.java
index 5b475e9..515bfbc 100644
--- 
a/java/maven/src/org/netbeans/modules/maven/newproject/idenative/IDENativeMavenWizardIterator.java
+++ 
b/java/maven/src/org/netbeans/modules/maven/newproject/idenative/IDENativeMavenWizardIterator.java
@@ -39,6 +39,7 @@ import static 
org.netbeans.modules.maven.newproject.idenative.Bundle.LBL_CreateP
 import static 
org.netbeans.modules.maven.newproject.idenative.Bundle.NameFormat;
 
 import org.netbeans.spi.project.ui.support.CommonProjectActions;
+import org.netbeans.spi.project.ui.support.ProjectChooser;
 import org.netbeans.validation.api.ui.ValidationGroup;
 import org.openide.WizardDescriptor;
 import org.openide.filesystems.FileObject;
@@ -82,6 +83,10 @@ public abstract class IDENativeMavenWizardIterator 
implements WizardDescriptor.I
 String[] splitlog = StringUtils.split(log, ":");
 ArchetypeWizardUtils.logUsage(splitlog[0], splitlog[1], 
splitlog[2]);
 File projFile = FileUtil.normalizeFile((File) 
wiz.getProperty(CommonProjectActions.PROJECT_PARENT_FOLDER)); // NOI18N
+final File parent = projFile.getParentFile();
+if (parent != null && parent.exists()) {
+ProjectChooser.setProjectsFolder(parent);
+}
 CreateProjectBuilder builder = createBuilder(projFile, vi, handle);
 builder.create();
 handle.progress(Bundle.PRG_FINISH());


-
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



[netbeans] branch master updated: [NETBEANS-2446] Use *parent* of saved projectFolder as projectLocation

2020-03-12 Thread matthiasblaesing
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 7172e2b  [NETBEANS-2446] Use *parent* of saved projectFolder as 
projectLocation
 new e803be8  Merge pull request #1980 from errael/WrongProjectParentFolder
7172e2b is described below

commit 7172e2b73cdb5bee33a1da0b6d714bc9c104e3d8
Author: Ernie Rael 
AuthorDate: Mon Feb 24 06:31:17 2020 +

[NETBEANS-2446] Use *parent* of saved projectFolder as projectLocation
---
 .../modules/maven/newproject/BasicPanelVisual.java| 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git 
a/java/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java 
b/java/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java
index 16cfec2..01c02fb 100644
--- a/java/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java
+++ b/java/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java
@@ -509,13 +509,14 @@ public class BasicPanelVisual extends JPanel implements 
DocumentListener, Window
 }
 String name = projectNameTextField.getText().trim();
 String folder = createdFolderTextField.getText().trim();
-final File parentFolder = new File(folder);
+final File projectFolder = new File(folder);
 
-d.putProperty(CommonProjectActions.PROJECT_PARENT_FOLDER, 
parentFolder);
+// PROJECT_PARENT_FOLDER confusing, better name is PROJECT_BASE_FOLDER
+d.putProperty(CommonProjectActions.PROJECT_PARENT_FOLDER, 
projectFolder);
 if (d instanceof TemplateWizard) {
 ((TemplateWizard) d).setTargetFolderLazy(() -> {
-parentFolder.mkdirs();
-return 
DataFolder.findFolder(FileUtil.toFileObject(parentFolder));
+projectFolder.mkdirs();
+return 
DataFolder.findFolder(FileUtil.toFileObject(projectFolder));
 });
 }
 d.putProperty("name", name); //NOI18N
@@ -561,10 +562,14 @@ public class BasicPanelVisual extends JPanel implements 
DocumentListener, Window
 handle = null;
 }
 }
-File projectLocation = (File) 
settings.getProperty(CommonProjectActions.PROJECT_PARENT_FOLDER); //NOI18N
-if (projectLocation == null || projectLocation.getParentFile() == null 
|| !projectLocation.getParentFile().isDirectory()) {
+// PROJECT_PARENT_FOLDER confusing, better name is PROJECT_BASE_FOLDER
+File projectFolder = (File) 
settings.getProperty(CommonProjectActions.PROJECT_PARENT_FOLDER); //NOI18N
+File projectLocation;
+if (projectFolder == null || projectFolder.getParentFile() == null || 
!projectFolder.getParentFile().isDirectory()) {
 projectLocation = ProjectChooser.getProjectsFolder();
-} 
+} else {
+projectLocation = projectFolder.getParentFile();
+}
 
this.projectLocationTextField.setText(projectLocation.getAbsolutePath());
 
 String projectName = (String) settings.getProperty("name"); //NOI18N


-
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



[netbeans] branch master updated (5594d85 -> 3e92db7)

2020-03-12 Thread matthiasblaesing
This is an automated email from the ASF dual-hosted git repository.

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


from 5594d85  Merge pull request #2005 from junichi11/netbeans-3968
 new b277e2c  [NETBEANS-445] Update CSS display property to CSS display 
module level 3
 new c19a134  [NETBEANS-2634] Support unicode-range property in parser and 
urange in lexer
 new 3d57563  Fix multiplicity parsing and handling of optional 
multiplicity in ALL group
 new cd61bab  [NETBEANS-445] Unittests to verify code completion for 
display property
 new 3e92db7  Merge pull request #2006 from matthiasblaesing/netbeans-445

The 3735 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:
 .../main/properties/basic_box_model.properties |   19 +-
 .../editor/module/main/properties/fonts.properties |3 +
 .../data/testfiles/completion/display/display.css  |   94 +
 .../display/display.css.testDisplay.completion |   35 +
 .../display.css.testDisplayBlock.completion|   11 +
 .../display.css.testDisplayBlockFlow.completion|5 +
 ...display.css.testDisplayBlockFlowRoot.completion |5 +
 .../display/display.css.testDisplayFlow.completion |8 +
 .../display.css.testDisplayFlowListItem.completion |7 +
 ...display.css.testDisplayFlowRootBlock.completion |5 +
 .../display.css.testDisplayInline.completion   |   11 +
 .../display.css.testDisplayInlineFlow.completion   |5 +
 ...isplay.css.testDisplayInlineFlowRoot.completion |5 +
 .../display.css.testDisplayListItem.completion |9 +
 ...display.css.testDisplayListItemBlock.completion |6 +
 .../display.css.testDisplayListItemFlow.completion |7 +
 ...play.css.testDisplayListItemFlowRoot.completion |7 +
 ...isplay.css.testDisplayListItemInline.completion |6 +
 ...display.css.testDisplayListItemRunIn.completion |6 +
 .../display.css.testDisplayRunIn.completion|   11 +
 ...display.css.testDisplayRunInFlowRoot.completion |5 +
 .../modules/css/editor/csl/CssCompletionTest.java  |   74 +-
 .../module/main/BasicBoxModelModuleTest.java   |2 +-
 .../module/main/properties/PropertiesATest.java|   18 +
 .../src/org/netbeans/modules/css/lib/Css3.g|5 +
 .../org/netbeans/modules/css/lib/Css3Lexer.java| 7838 +
 .../org/netbeans/modules/css/lib/Css3Parser.java   | 9231 ++--
 .../netbeans/modules/css/lib/api/CssTokenId.java   |2 +
 .../css/lib/api/properties/GrammarResolver.java|8 +-
 .../css/lib/api/properties/TokenAcceptor.java  |   25 +-
 .../modules/css/lib/properties/GrammarParser.java  |   25 +-
 ide/css.lib/test/unit/data/testfiles/urange.css|3 +
 .../test/unit/data/testfiles/urange.css.tokens.txt |   20 +
 .../lib/api/properties/GrammarResolverTest.java|6 +
 .../modules/css/lib/nblexer/NbCss3LexerTest.java   |6 +-
 .../css/lib/properties/GrammarParserTest.java  |   38 +-
 36 files changed, 9150 insertions(+), 8421 deletions(-)
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplay.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayBlock.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayBlockFlow.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayBlockFlowRoot.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayFlow.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayFlowListItem.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayFlowRootBlock.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayInline.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayInlineFlow.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayInlineFlowRoot.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayListItem.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayListItemBlock.completion
 create mode 100644 
ide/css.editor/test/unit/data/testfiles/completion/display/display.css.testDisplayListItemFlow.completion
 cre

[netbeans] branch master updated: Fix typo (anonymous fix from github)

2020-03-06 Thread matthiasblaesing
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 ebdfc3e  Fix typo (anonymous fix from github)
ebdfc3e is described below

commit ebdfc3ecb3eaba9f3e92484dac4e6191c39645de
Author: Matthias Bläsing 
AuthorDate: Fri Mar 6 22:11:36 2020 +0100

Fix typo (anonymous fix from github)

Closes: #1998
---
 .../gradle/src/org/netbeans/modules/gradle/customizer/Bundle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/Bundle.properties 
b/groovy/gradle/src/org/netbeans/modules/gradle/customizer/Bundle.properties
index eab5097..be85fc4 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/customizer/Bundle.properties
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/customizer/Bundle.properties
@@ -39,7 +39,7 @@ BuildActionsCustomizer.lbTitle.text=Override IDE Default 
Action Binding and Cust
 LicenseHeadersPanel.jLabel1.text=License Header
 LicenseHeadersPanel.rbGlobalLicense.text=Use Global License:
 LicenseHeadersPanel.rbCustomFile.text=Use Gradle Defined License:
-LicenseHeadersPanel.jLabel2.text=Use the value of 
netbeans.license or in its absence license\nproperty of the 
project (or it's parent). It is recommended to set this property on the\nroot 
project only. The value of the license property can be:\n\n  Short name 
of a NetBeans Global license(e.g.: apache20)\n  Project directory 
relative path to a file.\n  Root project directory relative path to a 
file.\n  Absolute path to a file.Use the value of 
netbeans.license or in its absence license\nproperty of the 
project (or its parent). It is recommended to set this property on the\nroot 
project only. The value of the license property can be:\n\n  Short name 
of a NetBeans Global license(e.g.: apache20)\n  Project directory 
relative path to a file.\n  Root project directory relative path to a 
file.\n  Absolute path to a file.https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists



[netbeans] branch master updated: [NETBEANS-2559] Avoid NPE when openjfx

2020-03-06 Thread matthiasblaesing
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 1ef6c46  [NETBEANS-2559] Avoid NPE when openjfx
 new 02421e2  Merge pull request #2003 from errael/DebugOpenjfxWithoutNPE
1ef6c46 is described below

commit 1ef6c4665fa4b9b5da9a542937acdd9174188f24
Author: Ernie Rael 
AuthorDate: Fri Mar 6 01:21:42 2020 +

[NETBEANS-2559] Avoid NPE when openjfx
---
 .../modules/debugger/jpda/visual/VisualDebuggerListener.java| 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/VisualDebuggerListener.java
 
b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/VisualDebuggerListener.java
index 1aacc61..ed33601 100644
--- 
a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/VisualDebuggerListener.java
+++ 
b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/VisualDebuggerListener.java
@@ -459,6 +459,10 @@ public class VisualDebuggerListener extends 
DebuggerManagerAdapter {
  */
 private static void setFxDebug(VirtualMachine vm, ThreadReference tr) {
 ClassType sysPropClass = getClass(vm, tr, 
"com.sun.javafx.runtime.SystemProperties");
+if(sysPropClass == null) {
+// openjfx doesn't have runtime.SystemProperties.isDebug
+return;
+}
 try {
 Field debugFld = ReferenceTypeWrapper.fieldByName(sysPropClass, 
"isDebug"); // NOI18N
 sysPropClass.setValue(debugFld, VirtualMachineWrapper.mirrorOf(vm, 
true));
@@ -474,7 +478,7 @@ public class VisualDebuggerListener extends 
DebuggerManagerAdapter {
 if (t instanceof ClassType) {
 return (ClassType)t;
 }
-logger.log(Level.WARNING, "{0} is not a class but {1}", new 
Object[]{name, t}); // NOI18N
+// logger.log(Level.WARNING, "{0} is not a class but {1}", new 
Object[]{name, t}); // NOI18N
 return null;
 }
 


-
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



[netbeans] branch master updated: [NETBEANS-3929] Add option to gitclient to push tag deletes

2020-03-06 Thread matthiasblaesing
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 7d17072  [NETBEANS-3929] Add option to gitclient to push tag deletes
7d17072 is described below

commit 7d17072e22ca45228e57ef2399ecfd7ac37c53e2
Author: Dmitry Mochalov 
AuthorDate: Sun Mar 1 19:27:49 2020 +0300

[NETBEANS-3929] Add option to gitclient to push tag deletes

Adding the ability to delete a tag from a remote repository using
integrated GitClient. Before a user could delete a branch but could not
delete a tag. Now, when performing git push... a user can select locally
deleted tag and GitClient will perform git push 
:refs/tags/{tag_name_to_delete}
---
 .../netbeans/modules/git/ui/push/PushAction.java   | 25 +---
 .../modules/git/ui/push/PushBranchesStep.java  | 24 ++-
 .../netbeans/modules/git/ui/push/PushMapping.java  | 46 --
 .../org/netbeans/modules/git/utils/GitUtils.java   |  5 +++
 .../org/netbeans/libs/git/GitClassFactoryImpl.java |  4 +-
 .../org/netbeans/libs/git/GitTransportUpdate.java  | 19 +++--
 .../netbeans/libs/git/jgit/GitClassFactory.java|  2 +-
 .../libs/git/jgit/commands/PushCommand.java|  3 +-
 8 files changed, 110 insertions(+), 18 deletions(-)

diff --git a/ide/git/src/org/netbeans/modules/git/ui/push/PushAction.java 
b/ide/git/src/org/netbeans/modules/git/ui/push/PushAction.java
index 0facca4..03302a8 100644
--- a/ide/git/src/org/netbeans/modules/git/ui/push/PushAction.java
+++ b/ide/git/src/org/netbeans/modules/git/ui/push/PushAction.java
@@ -159,8 +159,11 @@ public class PushAction extends SingleRepositoryAction {
 "# {0} - branch name", "MSG_PushAction.branchDeleted=Branch {0} 
deleted in the local repository.",
 "# {0} - branch name", "# {1} - branch head id", "# {2} - result of 
the update",
 "MSG_PushAction.updates.deleteBranch=Branch Delete : {0}\n"
-+ "Id: {1}\n"
-+ "Result: {2}\n",
++ "Id: {1}\n"
++ "Result: {2}\n",
+"MSG_PushAction.updates.deleteTag=Tag Delete: {0}\n"
++ "Id: {1}\n"
++ "Result: {2}\n",
 "# {0} - branch name", "# {1} - branch head id", "# {2} - result of 
the update",
 "MSG_PushAction.updates.addBranch=Branch Add : {0}\n"
 + "Id : {1}\n"
@@ -341,10 +344,20 @@ public class PushAction extends SingleRepositoryAction {
 }
 }
 } else {
-
logger.outputLine(NbBundle.getMessage(PushAction.class, 
"MSG_PushAction.updates.updateTag", new Object[] { //NOI18N
-update.getLocalName(), 
-update.getResult(),
-}));
+//tag deleting or updating
+if (update.getNewObjectId() == null && 
update.getOldObjectId() != null) {
+//deleting tag from remote
+
logger.outputLine(NbBundle.getMessage(PushAction.class, 
"MSG_PushAction.updates.deleteTag", new Object[]{ //NOI18N
+update.getRemoteName(),
+update.getOldObjectId(),
+update.getResult(),}));
+} else {
+//updating or adding tag to the remote
+
logger.outputLine(NbBundle.getMessage(PushAction.class, 
"MSG_PushAction.updates.updateTag", new Object[]{ //NOI18N
+update.getLocalName(),
+update.getResult(),}));
+}
+
 }
 }
 }
diff --git a/ide/git/src/org/netbeans/modules/git/ui/push/PushBranchesStep.java 
b/ide/git/src/org/netbeans/modules/git/ui/push/PushBranchesStep.java
index 63722b6..42c0320 100644
--- a/ide/git/src/org/netbeans/modules/git/ui/push/PushBranchesStep.java
+++ b/ide/git/src/org/netbeans/modules/git/ui/push/PushBranchesStep.java
@@ -98,6 +98,12 @@ public class PushBranchesStep extends AbstractWizardPanel 
implements WizardDescr
 return new HelpCtx(PushBranchesStep.class);
 }
 
+/**
+ *
+ * @param cfg configuration of the remote repository including URLs of 
remote
+ * @param branches list of all branches in the remote repo
+ * @param tags list of all tags in the rem

[netbeans] branch master updated: Upgrade javaee6.api binaries

2020-03-06 Thread matthiasblaesing
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 c05d42e  Upgrade javaee6.api binaries
c05d42e is described below

commit c05d42e2420fc77f57d80cf6e26399cc8667468c
Author: Jose Contreras 
AuthorDate: Tue Dec 17 18:29:30 2019 -0600

Upgrade javaee6.api binaries
---
 enterprise/javaee.api/external/binaries-list   | 4 ++--
 ...xb-api-osgi-2.2-license.txt => jaxb-api-osgi-2.2.7-license.txt} | 4 ++--
 ...osgi-2.0-license.txt => webservices-api-osgi-2.0.1-license.txt} | 6 +++---
 enterprise/javaee.api/nbproject/project.properties | 7 ---
 .../org/netbeans/modules/javaee/api/javaee-endorsed-api-6.0.xml| 4 ++--
 nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps   | 3 +++
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/enterprise/javaee.api/external/binaries-list 
b/enterprise/javaee.api/external/binaries-list
index 87ca549..1da5ff5 100644
--- a/enterprise/javaee.api/external/binaries-list
+++ b/enterprise/javaee.api/external/binaries-list
@@ -17,5 +17,5 @@
 D6F416983EA13C334D5C599A9045414ECAF5D66D javax:javaee-api:6.0
 EBEC44255251E6D3B8DDBAF701F732DAF0238CBF javax:javaee-web-api:6.0
 479C1E06DB31C432330183F5CAE684163F186146 
javax.annotation:javax.annotation-api:1.2
-ACDC6E43595B4EF739D7B3CBB6A8D36832DA6DDD javax.xml.bind:jaxb-api-osgi:2.2
-36C9E426AB6BDBE656316E3706FCD8878E8639AE javax.xml:webservices-api-osgi:2.0
+45EBA8B0520A70787D5DD2EA154ACE152F817C0D javax.xml.bind:jaxb-api-osgi:2.2.7
+203E8BEEA41131255439441068C3FD1FE9EFC190 javax.xml:webservices-api-osgi:2.0.1
diff --git a/enterprise/javaee.api/external/jaxb-api-osgi-2.2-license.txt 
b/enterprise/javaee.api/external/jaxb-api-osgi-2.2.7-license.txt
similarity index 99%
rename from enterprise/javaee.api/external/jaxb-api-osgi-2.2-license.txt
rename to enterprise/javaee.api/external/jaxb-api-osgi-2.2.7-license.txt
index d877b55..e442487 100644
--- a/enterprise/javaee.api/external/jaxb-api-osgi-2.2-license.txt
+++ b/enterprise/javaee.api/external/jaxb-api-osgi-2.2.7-license.txt
@@ -1,8 +1,8 @@
 Name: Java Architecture for XML Binding
-Version: 2.2
+Version: 2.2.7
 License: CDDL-1.1
 Description: JAXB (JSR 222) API bundled for OSGi distribution
-Origin: Oracle 
(https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api-osgi/2.2)
+Origin: Oracle 
(https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api-osgi/2.2.7)
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
 
diff --git 
a/enterprise/javaee.api/external/webservices-api-osgi-2.0-license.txt 
b/enterprise/javaee.api/external/webservices-api-osgi-2.0.1-license.txt
similarity index 99%
rename from enterprise/javaee.api/external/webservices-api-osgi-2.0-license.txt
rename to enterprise/javaee.api/external/webservices-api-osgi-2.0.1-license.txt
index bc12f0e..fc1232b 100644
--- a/enterprise/javaee.api/external/webservices-api-osgi-2.0-license.txt
+++ b/enterprise/javaee.api/external/webservices-api-osgi-2.0.1-license.txt
@@ -1,8 +1,8 @@
-Name: Metro Web Services API OSGi Bundle 2.0
-Version: 2.0
+Name: Metro Web Services API OSGi Bundle 2.0.1
+Version: 2.0.1
 License: CDDL-1.1
 Description: Metro Web Services API OSGi Bundle
-Origin: GlassFish Community 
(https://mvnrepository.com/artifact/javax.xml/webservices-api-osgi/2.0)
+Origin: GlassFish Community 
(https://mvnrepository.com/artifact/javax.xml/webservices-api-osgi/2.0.1)
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
 
diff --git a/enterprise/javaee.api/nbproject/project.properties 
b/enterprise/javaee.api/nbproject/project.properties
index 6e84492..a5828ab 100644
--- a/enterprise/javaee.api/nbproject/project.properties
+++ b/enterprise/javaee.api/nbproject/project.properties
@@ -15,9 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
 release.external/javaee-api-6.0.jar=modules/ext/javaee-api-6.0.jar
 release.external/javaee-web-api-6.0.jar=modules/ext/javaee-web-api-6.0.jar
 
release.external/javax.annotation-api-1.2.jar=modules/ext/javaee6-endorsed/javax.annotation.jar
-release.external/jaxb-api-osgi-2.2.jar=modules/ext/javaee6-endorsed/jaxb-api-osgi.jar
-release.external/webservices-api-osgi-2.0.jar=modules/ext/javaee6-endorsed/webservices-api-osgi.jar
\ No newline at end of file
+release.external/jaxb-api-osgi-2.2.7.jar=modules/ext/javaee6-endorsed/jaxb-api-osgi.jar
+release.external/webservices-api-osgi-2.0.1.jar=modules/ext/javaee6-endorsed/webservices-api-osgi.jar
\ No newline at end of file
diff --git 
a/enterprise/javaee.api/src/org/netbeans/modules/javaee/api/javaee-endorsed-api-6.0.xml
 
b/enterprise/javaee.api/src/org/netbeans/modules/javaee/api/javaee-endorsed-api-6.0.xml
index 1202aab..3

[netbeans] branch master updated: Update JDBC PostgreSQL from 42.2.8 to 42.2.10

2020-03-06 Thread matthiasblaesing
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 3d97afd  Update JDBC PostgreSQL from 42.2.8 to 42.2.10
 new 5d167c8  Merge pull request #1960 from pepness/postgresql-42.2.10
3d97afd is described below

commit 3d97afd01258c0fe379acc9d277696ddadeb0a55
Author: Jose Contreras 
AuthorDate: Wed Feb 19 13:54:53 2020 -0600

Update JDBC PostgreSQL from 42.2.8 to 42.2.10
---
 ide/db.drivers/external/binaries-list | 2 +-
 .../{postgresql-42.2.8-license.txt => postgresql-42.2.10-license.txt} | 4 ++--
 ide/db.drivers/manifest.mf| 2 +-
 ide/db.drivers/nbproject/project.properties   | 4 ++--
 ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties  | 2 +-
 .../src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml  | 4 ++--
 ide/db.drivers/src/org/netbeans/modules/db/drivers/postgresql.xml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ide/db.drivers/external/binaries-list 
b/ide/db.drivers/external/binaries-list
index 544d18e..3fdc822 100644
--- a/ide/db.drivers/external/binaries-list
+++ b/ide/db.drivers/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.
-6F394C7DF5600D11B221F356FF020440D2ECE44F org.postgresql:postgresql:42.2.8
\ No newline at end of file
+338AF492789FD198DBD52735A22B1946030ECC96 org.postgresql:postgresql:42.2.10
\ No newline at end of file
diff --git a/ide/db.drivers/external/postgresql-42.2.8-license.txt 
b/ide/db.drivers/external/postgresql-42.2.10-license.txt
similarity index 97%
rename from ide/db.drivers/external/postgresql-42.2.8-license.txt
rename to ide/db.drivers/external/postgresql-42.2.10-license.txt
index 98910e8..cd15a01 100644
--- a/ide/db.drivers/external/postgresql-42.2.8-license.txt
+++ b/ide/db.drivers/external/postgresql-42.2.10-license.txt
@@ -1,9 +1,9 @@
 Name: PostgreSQL JDBC Driver
-Version: 42.2.8
+Version: 42.2.10
 Description: Allows Java programs to interact with a PostgreSQL database
 License: BSD-postgresql
 Origin: https://jdbc.postgresql.org/about/license.html
-Files: postgresql-42.2.8.jar
+Files: postgresql-42.2.10.jar
 Comment: Out-of-the-box support for Postgres Java database applications
 
 Copyright (c) 1997, PostgreSQL Global Development Group
diff --git a/ide/db.drivers/manifest.mf b/ide/db.drivers/manifest.mf
index 2210d52..e428197 100644
--- a/ide/db.drivers/manifest.mf
+++ b/ide/db.drivers/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.db.drivers
 OpenIDE-Module-Layer: org/netbeans/modules/db/drivers/layer.xml
 OpenIDE-Module-Localizing-Bundle: 
org/netbeans/modules/db/drivers/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.37
+OpenIDE-Module-Specification-Version: 1.38
 AutoUpdate-Show-In-Client: false
diff --git a/ide/db.drivers/nbproject/project.properties 
b/ide/db.drivers/nbproject/project.properties
index 4888caf..341c05e 100644
--- a/ide/db.drivers/nbproject/project.properties
+++ b/ide/db.drivers/nbproject/project.properties
@@ -17,6 +17,6 @@
 
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.8
-release.external/postgresql-42.2.8.jar=modules/ext/postgresql-42.2.8.jar
+release.external/postgresql-42.2.10.jar=modules/ext/postgresql-42.2.10.jar
 jnlp.indirect.jars=\
-modules/ext/postgresql-42.2.8.jar
+modules/ext/postgresql-42.2.10.jar
diff --git 
a/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties 
b/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties
index 112a9fe..d735f47 100644
--- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties
+++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/Bundle.properties
@@ -20,6 +20,6 @@ OpenIDE-Module-Display-Category=Database
 OpenIDE-Module-Short-Description=JDBC database drivers
 OpenIDE-Module-Long-Description=\
 This plugin provides JDBC database drivers for an improved 
out-of-the-box experience when developing database applications. \
-The following driver is included in this plugin:  PostgreSQL 
JDBC 4.2 Driver Version: 42.2.8  
+The following driver is included in this plugin:  PostgreSQL 
JDBC 4.2 Driver Version: 42.2.10  
 PostgreSQLDriver=PostgreSQL JDBC Driver
 MySQLDriver=MySQL JDBC Driver
diff --git 
a/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml 
b/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml
index a5843d4..c8f4c5c 100644
--- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml
+++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/PostgreSQLDriver.xml
@@ -25,7 +2

[netbeans] branch master updated: [TRAVIS] Run tests for PHP modules

2020-03-05 Thread matthiasblaesing
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 2164d62  [TRAVIS] Run tests for PHP modules
 new 2d2f9ff  Merge pull request #1988 from blackleg/travis_php_modules
2164d62 is described below

commit 2164d62e4edeafa9d125e2e8be07b5a4c639a78a
Author: Hector Espert 
AuthorDate: Tue Feb 25 22:12:44 2020 +0100

[TRAVIS] Run tests for PHP modules
---
 .travis.yml | 13 +
 1 file changed, 13 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a50dd8a..6586635 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -548,6 +548,19 @@ matrix:
 - ant $OPTS -f php/php.composer test
 #- ant $OPTS -f php/php.dbgp test
 - ant $OPTS -f php/php.doctrine2 test
+#- ant $OPTS -f php/php.editor test
+#- ant $OPTS -f php/php.latte test
+#- ant $OPTS -f php/php.nette.tester test
+- ant $OPTS -f php/php.phpunit test
+- ant $OPTS -f php/php.project test
+- ant $OPTS -f php/php.refactoring test
+#- ant $OPTS -f php/php.smarty test
+#- ant $OPTS -f php/php.symfony test
+#- ant $OPTS -f php/php.symfony2 test
+- ant $OPTS -f php/php.twig test
+- ant $OPTS -f php/php.zend test
+- ant $OPTS -f php/php.zend2 test
+- ant $OPTS -f php/spellchecker.bindings.php test
 
 - name: Build the Visual Studio Code extension for Java
   jdk: openjdk8


-
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



[netbeans] branch master updated: [TRAVIS] Add ide modules in Travis config

2020-03-05 Thread matthiasblaesing
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 3c98da5  [TRAVIS] Add ide modules in Travis config
 new e46c6d7  Merge pull request #1989 from blackleg/travis_ide_xml
3c98da5 is described below

commit 3c98da5b231e96ff7816452bbc07127e2037603c
Author: Hector Espert 
AuthorDate: Fri Feb 28 19:29:45 2020 +0100

[TRAVIS] Add ide modules in Travis config
---
 .travis.yml | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cf6b231..0879399 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -215,7 +215,7 @@ matrix:
 - ant $OPTS -f ide/csl.types test
 - ant $OPTS -f ide/css.editor test
 - ant $OPTS -f ide/css.lib test
-- ant $OPTS -f ide/css.model test
+- hide-logs.sh ant $OPTS -f ide/css.model test
 - travis_retry ant $OPTS -f ide/db test
 - ant $OPTS -f ide/db.dataview test
 - ant $OPTS -f ide/db.sql.editor test
@@ -224,14 +224,14 @@ matrix:
 - ant $OPTS -f ide/editor.bookmarks test
 #- ant $OPTS -f ide/editor.bracesmatching test
 - ant $OPTS -f ide/editor.document test
-- ant $OPTS -f ide/editor.fold test
+- hide-logs.sh ant $OPTS -f ide/editor.fold test
 - ant $OPTS -f ide/editor.fold.nbui test
 - ant $OPTS -f ide/editor.guards test
 - ant $OPTS -f ide/editor.indent test
 - ant $OPTS -f ide/editor.indent.project test
 - ant $OPTS -f ide/editor.macros test
-- ant $OPTS -f ide/editor.search test
-- ant $OPTS -f ide/editor.settings test
+- hide-logs.sh ant $OPTS -f ide/editor.search test
+- hide-logs.sh ant $OPTS -f ide/editor.settings test
 - ant $OPTS -f ide/editor.settings.storage test
 - ant $OPTS -f ide/editor.structure test
 - ant $OPTS -f ide/editor.tools.storage test
@@ -292,9 +292,13 @@ matrix:
 - ant $OPTS -f ide/web.webkit.debugging test
 - ant $OPTS -f ide/xml test
 - ant $OPTS -f ide/xml.axi test
+- ant $OPTS -f ide/xml.catalog test-unit
 - ant $OPTS -f ide/xml.core test
 - ant $OPTS -f ide/xml.lexer test
 - ant $OPTS -f ide/xml.multiview test
+- ant $OPTS -f ide/xml.retriever test
+#- ant $OPTS -f ide/xml.schema.completion test
+- ant $OPTS -f ide/xml.schema.model test
 - ant $OPTS -f ide/xml.text test
 - ant $OPTS -f ide/xml.text.obsolete90 test
 - travis_retry ant $OPTS -f ide/xml.wsdl.model test


-
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



[netbeans] branch master updated: Only register LSP based formatting if MimePath has language server

2020-03-05 Thread matthiasblaesing
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 952f6a9  Only register LSP based formatting if MimePath has language 
server
 new 8da7ae9  Merge pull request #1996 from 
matthiasblaesing/lsp_formatting_fix
952f6a9 is described below

commit 952f6a909b77ab5a7dfd253b988b81c912e2869a
Author: Matthias Bläsing 
AuthorDate: Sun Mar 1 21:05:04 2020 +0100

Only register LSP based formatting if MimePath has language server

It was observed that XML formatting did not work after enabling LSP
formatting. The problem was caused by the MimeLookup for application/xml
that returned two ReformatTask.Factory implementations. One was the
right factory, the other the Formatter provided by the LSP Client
module.

Instead of registering the ReformatTask.Factory of the LSP client module
on the empty mime path, it is now dynamically registered by a
MimeDataProvider (LspMimeDataProvider). That MimeDataProvider ensures
that the lsp based formatter is only registered if a
LanguageServerProvider is present on the targetted mime path.

As an implementation note the LspMimeDataProvider is registered with a
position, which ensures, that it is registered with higher priority than
LegacyFormattersProvider which unconditionally registers a formatter.
Having a higher priority (any position has higher priority than no
position) ensures LspMimeDataProvider is queried first.
---
 .../modules/lsp/client/bindings/Formatter.java | 16 ++--
 .../lsp/client/bindings/LspMimeDataProvider.java   | 86 ++
 2 files changed, 96 insertions(+), 6 deletions(-)

diff --git 
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/Formatter.java 
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/Formatter.java
index f399461..045e490 100644
--- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/Formatter.java
+++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/Formatter.java
@@ -19,7 +19,6 @@
 package org.netbeans.modules.lsp.client.bindings;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
@@ -32,7 +31,6 @@ import org.eclipse.lsp4j.FormattingOptions;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.TextEdit;
-import org.netbeans.api.editor.mimelookup.MimeRegistration;
 import org.netbeans.modules.editor.NbEditorUtilities;
 import org.netbeans.modules.editor.indent.api.IndentUtils;
 import org.netbeans.modules.editor.indent.spi.Context;
@@ -47,12 +45,18 @@ public class Formatter implements ReformatTask {
 
 private static final Logger LOG = 
Logger.getLogger(Formatter.class.getName());
 
-@MimeRegistration(mimeType = "", service = ReformatTask.Factory.class)
 public static class Factory implements ReformatTask.Factory {
 
 @Override
 public ReformatTask createTask(Context context) {
-return new Formatter(context);
+FileObject file = 
NbEditorUtilities.getFileObject(context.document());
+if (file != null) {
+LSPBindings bindings = LSPBindings.getBindings(file);
+if (bindings != null) {
+return new Formatter(context);
+}
+}
+return null;
 }
 
 }
@@ -66,7 +70,7 @@ public class Formatter implements ReformatTask {
 @Override
 public void reformat() throws BadLocationException {
 FileObject file = NbEditorUtilities.getFileObject(ctx.document());
-if(file != null) {
+if (file != null) {
 LSPBindings bindings = LSPBindings.getBindings(file);
 if (bindings != null) {
 Boolean documentFormatting = 
bindings.getInitResult().getCapabilities().getDocumentFormattingProvider();
@@ -120,7 +124,7 @@ public class Formatter implements ReformatTask {
 }
 
 private void applyTextEdits(List edits) {
-if(ctx.document() instanceof StyledDocument) {
+if (ctx.document() instanceof StyledDocument) {
 NbDocument.runAtomic((StyledDocument) ctx.document(), () -> {
 Utils.applyEditsNoLock(ctx.document(), edits, 
ctx.startOffset(), ctx.endOffset());
 });
diff --git 
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/LspMimeDataProvider.java
 
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/LspMimeDataProvider.java
new file mode 100644
index 000..9f97b1a
--- /dev/null
+++ 
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/LspMimeDataProvider.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundatio

[netbeans] branch master updated: [NETBEANS-3345] - cleanup fallthrough warnings..

2020-03-04 Thread matthiasblaesing
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 f794972  [NETBEANS-3345] - cleanup fallthrough warnings..
 new 1816264  Merge pull request #1618 from 
BradWalker/cleanup_fallthrough_warnings
f794972 is described below

commit f794972ebc2ef7b3a5fd72505b084c38efb3f1bf
Author: Brad Walker 
AuthorDate: Tue Nov 5 11:10:29 2019 -0700

[NETBEANS-3345] - cleanup fallthrough warnings..

There are numerous places in the code where the following warning is issued.

   [repeat] 
/home/bwalker/src/netbeans/ide/css.editor/src/org/netbeans/modules/css/editor/csl/CssCompletion.java:718:
 warning: [fallthrough] possible fall-through into case
   [repeat] case WS: //@import |
   [repeat] ^
   [repeat] 
/home/bwalker/src/netbeans/ide/css.editor/src/org/netbeans/modules/css/editor/csl/CssCompletion.java:824:
 warning: [fallthrough] possible fall-through into case
   [repeat] default:
   [repeat] ^
   [repeat] 
/home/bwalker/src/netbeans/ide/css.editor/src/org/netbeans/modules/css/editor/csl/CssCompletion.java:1015:
 warning: [fallthrough] possible fall-through into case
   [repeat] case mediaBody:
   [repeat] ^

I've looked over each and every place where this warning is emitted. The 
vast majority of these
warnings are due to lexer spaghetti. Which happens often when dealing w/ 
look-ahead parsers..

The simple fix is to add a "@SuppressWarnings("fallthrough")" to the 
method. as the code looks
like the designer intended this behavior.

There is one place where I did find a bug..


platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxyReloader.java

It's missing a break statement in this file.
---
 .../java/hints/errors/SearchModuleDependency.java  |  1 +
 .../glassfish/tooling/admin/ProcessIOParser.java   |  1 +
 .../payara/tooling/admin/ProcessIOParser.java  |  1 +
 .../groovy/refactoring/RefactoringTask.java|  1 +
 .../modules/css/editor/csl/CssCompletion.java  | 45 +++-
 .../css/editor/module/main/MediaQueriesModule.java |  1 +
 .../css/editor/module/main/NamespacesModule.java   |  1 +
 .../css/editor/module/main/SelectorsModule.java| 49 +++---
 .../modules/css/lib/properties/GrammarParser.java  |  3 +-
 .../modules/css/prep/editor/CPCssEditorModule.java |  1 +
 .../editor/refactoring/CPWhereUsedQueryPlugin.java |  3 +-
 .../docker/editor/lexer/DockerfileLexer.java   |  1 +
 .../parsing/impl/indexing/ClusteredIndexables.java |  1 +
 .../parsing/impl/indexing/FileObjectCrawler.java   |  1 +
 .../java/completion/JavaCompletionTask.java|  9 
 .../editor/base/fold/JavaElementFoldVisitor.java   |  1 +
 .../base/javadoc/JavadocCompletionUtils.java   |  1 +
 .../modules/java/source/ui/FastTypeProvider.java   |  1 +
 .../modules/junit/ant/JUnitOutputReader.java   |  1 +
 .../spi/java/hints/ErrorDescriptionFactory.java|  1 +
 .../completion/SpringXMLConfigCompletionItem.java  |  1 +
 .../languages/neon/lexer/NeonColoringLexer.java|  1 +
 .../php/latte/lexer/LatteMarkupColoringLexer.java  | 29 +++--
 .../php/latte/lexer/LatteTopColoringLexer.java |  1 +
 .../twig/editor/lexer/TwigBlockColoringLexer.java  |  1 +
 .../twig/editor/lexer/TwigTopColoringLexer.java|  1 +
 .../editor/lexer/TwigVariableColoringLexer.java|  1 +
 .../core/network/proxy/NetworkProxyReloader.java   |  2 +
 .../html/angular/model/AngularWhenInterceptor.java |  1 +
 .../html/knockout/KODataBindLanguageHierarchy.java |  1 +
 .../modules/html/knockout/KOTemplateContext.java   |  1 +
 .../jade/editor/JadeCodeCompletion.java|  1 +
 .../jade/editor/lexer/JadeColoringLexer.java   |  1 +
 .../jquery/editor/JQueryCodeCompletion.java|  3 +-
 .../modules/javascript2/lexer/JsColoringLexer.java |  1 +
 .../lexer/JsDocumentationColoringLexer.java|  1 +
 .../apacheconf/lexer/ApacheConfColoringLexer.java  |  1 +
 .../languages/ini/lexer/IniColoringLexer.java  |  1 +
 38 files changed, 111 insertions(+), 62 deletions(-)

diff --git 
a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java
 
b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java
index 222ed1d..5062878 100644
--- 
a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java
+++ 
b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java
@@ -113,6 +113,7 @@ public class SearchModuleD

[netbeans] branch master updated: Update maven-dependency-tree & maven-archetype-plugin

2020-03-02 Thread matthiasblaesing
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 21ee047  Update maven-dependency-tree & maven-archetype-plugin
21ee047 is described below

commit 21ee047321638132b495fc8dd46be3aeeb39a4c1
Author: Jose Contreras 
AuthorDate: Tue Feb 25 19:31:30 2020 -0600

Update maven-dependency-tree & maven-archetype-plugin
---
 java/maven.embedder/external/binaries-list| 2 +-
 ...ncy-tree-2.0-license.txt => maven-dependency-tree-2.2-license.txt} | 4 ++--
 java/maven.embedder/nbproject/project.properties  | 4 ++--
 java/maven.embedder/nbproject/project.xml | 4 ++--
 .../src/org/netbeans/modules/maven/options/MavenCommandSettings.java  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/maven.embedder/external/binaries-list 
b/java/maven.embedder/external/binaries-list
index ecfe937..61d832c 100644
--- a/java/maven.embedder/external/binaries-list
+++ b/java/maven.embedder/external/binaries-list
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom:jdom:1.0
-BF206C4AA93C74A739FBAF1F1C78E3AD5F167245 
org.apache.maven.shared:maven-dependency-tree:2.0
+5D9CE6ADD7B714B8095F0E3E396C5E9F8C5DCFEF 
org.apache.maven.shared:maven-dependency-tree:2.2
 2DDF9BB8C3B41BC2891832A6D6FC25F8BF41D77F 
org.apache.maven:apache-maven:3.3.9:bin@zip
diff --git a/java/maven.embedder/external/maven-dependency-tree-2.0-license.txt 
b/java/maven.embedder/external/maven-dependency-tree-2.2-license.txt
similarity index 99%
rename from java/maven.embedder/external/maven-dependency-tree-2.0-license.txt
rename to java/maven.embedder/external/maven-dependency-tree-2.2-license.txt
index 35d4152..586232b 100644
--- a/java/maven.embedder/external/maven-dependency-tree-2.0-license.txt
+++ b/java/maven.embedder/external/maven-dependency-tree-2.2-license.txt
@@ -1,9 +1,9 @@
 Name: Maven Dependency Tree
-Version: 2.0
+Version: 2.2
 Description: Maven Dependency Tree
 License: Apache-2.0
 Origin: Apache Software Foundation
-URL: http://maven.apache.org/
+URL: https://maven.apache.org/
 
  Apache License
Version 2.0, January 2004
diff --git a/java/maven.embedder/nbproject/project.properties 
b/java/maven.embedder/nbproject/project.properties
index 0c128e2..7e47a09 100644
--- a/java/maven.embedder/nbproject/project.properties
+++ b/java/maven.embedder/nbproject/project.properties
@@ -16,10 +16,10 @@
 # under the License.
 
 is.autoload=true
-javac.source=1.7
+javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 release.external/jdom-1.0.jar=modules/ext/maven/jdom-1.0.jar
-release.external/maven-dependency-tree-2.0.jar=modules/ext/maven/maven-dependency-tree-2.0.jar
+release.external/maven-dependency-tree-2.2.jar=modules/ext/maven/maven-dependency-tree-2.2.jar
 bundled.maven=apache-maven-3.3.9
 extra.module.files=maven/
 nbm.executable.files=maven/bin/mvn,maven/bin/mvnDebug,maven/bin/mvnyjp
diff --git a/java/maven.embedder/nbproject/project.xml 
b/java/maven.embedder/nbproject/project.xml
index b897a77..e4bcf40 100644
--- a/java/maven.embedder/nbproject/project.xml
+++ b/java/maven.embedder/nbproject/project.xml
@@ -265,8 +265,8 @@
 org.apache.maven.wagon.shared.http4
 
 
-
ext/maven/maven-dependency-tree-2.0.jar
-
external/maven-dependency-tree-2.0.jar
+
ext/maven/maven-dependency-tree-2.2.jar
+
external/maven-dependency-tree-2.2.jar
 
 
 
ext/maven/jdom-1.0.jar
diff --git 
a/java/maven/src/org/netbeans/modules/maven/options/MavenCommandSettings.java 
b/java/maven/src/org/netbeans/modules/maven/options/MavenCommandSettings.java
index ce99fb0..12508db 100644
--- 
a/java/maven/src/org/netbeans/modules/maven/options/MavenCommandSettings.java
+++ 
b/java/maven/src/org/netbeans/modules/maven/options/MavenCommandSettings.java
@@ -65,7 +65,7 @@ public final class MavenCommandSettings {
 toRet = "install:install-file";//NOI18N
 }
 else if (COMMAND_CREATE_ARCHETYPENG.equals(command)) {
-toRet = 
"org.apache.maven.plugins:maven-archetype-plugin:2.4:generate"; // NOI18N
+toRet = 
"org.apache.maven.plugins:maven-archetype-plugin:3.1.2:generate"; // NOI18N
 }
 else if (COMMAND_SCM_CHECKOUT.equals(command)) {
 toRet = "scm:checkout";//NOI18N


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

  1   2   3   4   5   6   >