[netbeans] branch master updated: Fixing typo in db env command
This is an automated email from the ASF dual-hosted git repository.
jhorvath 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 7c3288a Fixing typo in db env command
new c62182d Merge pull request #3880 from jhorvath/fix-db-env
7c3288a is described below
commit 7c3288ae01bd67748ef660327a7fc07bbf4e03a9
Author: Jan Horvath
AuthorDate: Mon Mar 28 15:26:04 2022 +0200
Fixing typo in db env command
---
.../org/netbeans/modules/java/lsp/server/db/DBSetEnvCommand.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBSetEnvCommand.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBSetEnvCommand.java
index 6a94a08..f77f06b 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBSetEnvCommand.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBSetEnvCommand.java
@@ -62,10 +62,10 @@ public class DBSetEnvCommand extends CodeActionsProvider {
}
DatabaseConnection conn =
ConnectionManager.getDefault().getPreferredConnection(true);
Map props = new HashMap<>();
-props.put("DATASOURCE_DEFAULT_URL", conn.getDatabaseURL()); //NOI18N
-props.put("DATASOURCE_DEFAULT_USERNAME", conn.getUser()); //NOI18N
-props.put("DATASOURCE_DEFAULT_PASSWORD", conn.getPassword()); //NOI18N
-props.put("DATASOURCE_DEFAULT_DRIVER_CLASS_NAME",
conn.getDriverClass()); //NOI18N
+props.put("DATASOURCES_DEFAULT_URL", conn.getDatabaseURL()); //NOI18N
+props.put("DATASOURCES_DEFAULT_USERNAME", conn.getUser()); //NOI18N
+props.put("DATASOURCES_DEFAULT_PASSWORD", conn.getPassword()); //NOI18N
+props.put("DATASOURCES_DEFAULT_DRIVER_CLASS_NAME",
conn.getDriverClass()); //NOI18N
String values = props.entrySet().stream()
.map(e -> e.getKey() + "=" + e.getValue()) //NOI18N
.collect(Collectors.joining(",")); //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
[jira] [Updated] (NETBEANS-6493) Support for external Snippets in Netbeans IDC
[ https://issues.apache.org/jira/browse/NETBEANS-6493?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sandeep Mishra updated NETBEANS-6493: - Description: The IDE documentation should show the External Snippet in Javadoc Snippet Code that has been added as a preview feature in JDK 18. https://openjdk.java.net/jeps/413 > Support for external Snippets in Netbeans IDC > - > > Key: NETBEANS-6493 > URL: https://issues.apache.org/jira/browse/NETBEANS-6493 > Project: NetBeans > Issue Type: New Feature > Components: java - Editor, java - Source >Reporter: Sandeep Mishra >Assignee: Sandeep Mishra >Priority: Major > > The IDE documentation should show the External Snippet in Javadoc Snippet > Code that has been added as a preview feature in JDK 18. > https://openjdk.java.net/jeps/413 -- This message was sent by Atlassian Jira (v8.20.1#820001) - 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
[jira] [Created] (NETBEANS-6493) Support for external Snippets in Netbeans IDC
Sandeep Mishra created NETBEANS-6493: Summary: Support for external Snippets in Netbeans IDC Key: NETBEANS-6493 URL: https://issues.apache.org/jira/browse/NETBEANS-6493 Project: NetBeans Issue Type: New Feature Components: java - Editor, java - Source Reporter: Sandeep Mishra Assignee: Sandeep Mishra -- This message was sent by Atlassian Jira (v8.20.1#820001) - 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-nb-repository-plugin] branch dependabot/maven/master/org.apache.ant-ant-1.10.12 created (now 6e9c139)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/org.apache.ant-ant-1.10.12 in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nb-repository-plugin.git. at 6e9c139 Bump ant from 1.8.2 to 1.10.12 No new revisions were added by this update. - 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 Commons-Net from 3.6 to 3.8.0 (#3775)
This is an automated email from the ASF dual-hosted git repository.
pepness 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 d2f6617 Upgrade Commons-Net from 3.6 to 3.8.0 (#3775)
d2f6617 is described below
commit d2f661743f157b32c172994dce694e1a42319490
Author: José Contreras
AuthorDate: Mon Mar 28 22:12:31 2022 +
Upgrade Commons-Net from 3.6 to 3.8.0 (#3775)
- Remove usage of commons.net.util.Base64 in favor of JDK java.util.Base64
in module ide/hudson.ui
---
ide/hudson.ui/nbproject/project.properties | 2 +-
ide/hudson.ui/nbproject/project.xml | 9 -
.../modules/hudson/ui/APITokenConnectionAuthenticator.java | 4 ++--
.../org/netbeans/modules/hudson/ui/actions/CreateJobTest.java| 1 +
ide/libs.commons_net/external/binaries-list | 2 +-
...commons-net-3.6-license.txt => commons-net-3.8.0-license.txt} | 4 ++--
.../{commons-net-3.6-notice.txt => commons-net-3.8.0-notice.txt} | 0
ide/libs.commons_net/nbproject/project.properties| 4 +---
ide/libs.commons_net/nbproject/project.xml | 4 ++--
.../src/org/netbeans/libs/commons_net/Bundle.properties | 2 +-
.../src/org/netbeans/libs/commons_net/mf-layer.xml | 2 +-
11 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/ide/hudson.ui/nbproject/project.properties
b/ide/hudson.ui/nbproject/project.properties
index c0af75f..0f4ec98 100644
--- a/ide/hudson.ui/nbproject/project.properties
+++ b/ide/hudson.ui/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/ide/hudson.ui/nbproject/project.xml
b/ide/hudson.ui/nbproject/project.xml
index d606d4b..7c2c259 100644
--- a/ide/hudson.ui/nbproject/project.xml
+++ b/ide/hudson.ui/nbproject/project.xml
@@ -70,15 +70,6 @@
-
org.netbeans.libs.commons_net
-
-
-
-2
-2.11
-
-
-
org.netbeans.modules.diff
diff --git
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
index 71cf127..2eed744 100644
---
a/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
+++
b/ide/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
@@ -23,12 +23,12 @@ import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
+import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JPanel;
-import org.apache.commons.net.util.Base64;
import org.netbeans.api.keyring.Keyring;
import org.netbeans.modules.hudson.api.HudsonManager;
import org.netbeans.modules.hudson.api.HudsonVersion;
@@ -108,7 +108,7 @@ public class APITokenConnectionAuthenticator extends JPanel
{
String token = new String(panel.tokField.getPassword());
panel.tokField.setText("");
Keyring.save(key, token.toCharArray(),
Bundle.APITokenConnectionAuthenticator_password_description(home, username));
-BASIC_AUTH.put(home.toString(), new
Base64(0).encodeToString((username + ':' + token).getBytes()).trim());
+BASIC_AUTH.put(home.toString(),
Base64.getEncoder().encodeToString((username + ':' + token).getBytes()).trim());
try {
return conn.getURL().openConnection();
} catch (IOException x) {
diff --git
a/ide/hudson.ui/test/unit/src/org/netbeans/modules/hudson/ui/actions/CreateJobTest.java
b/ide/hudson.ui/test/unit/src/org/netbeans/modules/hudson/ui/actions/CreateJobTest.java
index 4f1a8d1..379fe98 100644
---
a/ide/hudson.ui/test/unit/src/org/netbeans/modules/hudson/ui/actions/CreateJobTest.java
+++
b/ide/hudson.ui/test/unit/src/org/netbeans/modules/hudson/ui/actions/CreateJobTest.java
@@ -53,4 +53,5 @@ public class CreateJobTest {
assertTrue(withCustomAction.runCustomActionIfAvailable(null));
HudsonManager.removeInstance(hi);
}
+
}
diff --git a/ide/libs.commons_net/external/binaries-list
b/ide/libs.commons_net/external/binaries-list
index b044a5b..ee1a9c1 100644
--- a/ide/libs.commons_net/external/binaries-list
+++ b/ide/libs.commons_net/external/binaries-list
@@ -14,4 +14,4 @@
[netbeans-mavenutils-archetype-netbeans-platform-app-archetype] branch master updated (2be5da3 -> ad04ac3)
This is an automated email from the ASF dual-hosted git repository. skygo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-archetype-netbeans-platform-app-archetype.git. from 2be5da3 Merge pull request #5 from apache/dependabot/maven/master/org.apache.maven.archetype-archetype-packaging-3.2.1 add 0e6fbbf Bump maven-archetype-plugin from 3.1.1 to 3.2.1 new ad04ac3 Merge pull request #4 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-archetype-plugin-3.2.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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-archetype-netbeans-platform-app-archetype] 01/01: Merge pull request #5 from apache/dependabot/maven/master/org.apache.maven.archetype-archetype-packaging-3.2.1
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-archetype-netbeans-platform-app-archetype.git commit 2be5da3dc0635009cbb903aae0d4f9eefa6308cd Merge: c215c9c ad7944f Author: Eric Barboni AuthorDate: Mon Mar 28 15:12:42 2022 +0200 Merge pull request #5 from apache/dependabot/maven/master/org.apache.maven.archetype-archetype-packaging-3.2.1 Bump archetype-packaging from 3.1.1 to 3.2.1 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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-archetype-netbeans-platform-app-archetype] branch master updated (c215c9c -> 2be5da3)
This is an automated email from the ASF dual-hosted git repository. skygo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-archetype-netbeans-platform-app-archetype.git. from c215c9c detect for archetype pom add ad7944f Bump archetype-packaging from 3.1.1 to 3.2.1 new 2be5da3 Merge pull request #5 from apache/dependabot/maven/master/org.apache.maven.archetype-archetype-packaging-3.2.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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-archetype-netbeans-platform-app-archetype] 01/01: Merge pull request #4 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-archetype-plugin-3.2.1
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-archetype-netbeans-platform-app-archetype.git commit ad04ac3522c6edf2aedef96b177139b9d5a2a4f8 Merge: 2be5da3 0e6fbbf Author: Eric Barboni AuthorDate: Mon Mar 28 15:12:50 2022 +0200 Merge pull request #4 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-archetype-plugin-3.2.1 Bump maven-archetype-plugin from 3.1.1 to 3.2.1 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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
[jira] [Comment Edited] (NETBEANS-5829) Incorrect "Text blocks aren't supported"
[
https://issues.apache.org/jira/browse/NETBEANS-5829?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17513226#comment-17513226
]
Jaroslav Tulach edited comment on NETBEANS-5829 at 3/28/22, 8:17 AM:
-
With [PR-3715|https://github.com/apache/netbeans/pull/3715] the behavior is
sufficiently acceptable.
was (Author: jtulach):
With [PR-3715](https://github.com/apache/netbeans/pull/3715) the behavior is
sufficiently acceptable.
> Incorrect "Text blocks aren't supported"
>
>
> Key: NETBEANS-5829
> URL: https://issues.apache.org/jira/browse/NETBEANS-5829
> Project: NetBeans
> Issue Type: Bug
> Components: java - Source
>Reporter: Jaroslav Tulach
>Assignee: Jaroslav Tulach
>Priority: Major
> Labels: pull-request-available
> Fix For: 14
>
> Attachments: image-2021-07-02-08-47-25-560.png
>
> Time Spent: 3h
> Remaining Estimate: 0h
>
> Get
> [https://github.com/apache/netbeans-html4j/blob/release-1.7.2/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaScriptAction.java#L36],
> open it in most recent NetBeans IDE running on JDK8 (with nbjavac@16.0.0.0
> installed) and try to convince the editor to not show errors about text
> blocks:
> !image-2021-07-02-08-47-25-560.png!
> Is there some way to do so? It is very annoying to have the source tree full
> of useless errors related to text blocks, when everything compiles and runs
> fine. The project's source level is set to 15 and Maven support shall report
> that to {{java.source}}. Any help welcomed.
--
This message was sent by Atlassian Jira
(v8.20.1#820001)
-
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
[jira] [Resolved] (NETBEANS-5829) Incorrect "Text blocks aren't supported"
[
https://issues.apache.org/jira/browse/NETBEANS-5829?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Jaroslav Tulach resolved NETBEANS-5829.
---
Fix Version/s: 14
Resolution: Fixed
With [PR-3715](https://github.com/apache/netbeans/pull/3715) the behavior is
sufficiently acceptable.
> Incorrect "Text blocks aren't supported"
>
>
> Key: NETBEANS-5829
> URL: https://issues.apache.org/jira/browse/NETBEANS-5829
> Project: NetBeans
> Issue Type: Bug
> Components: java - Source
>Reporter: Jaroslav Tulach
>Assignee: Jaroslav Tulach
>Priority: Major
> Labels: pull-request-available
> Fix For: 14
>
> Attachments: image-2021-07-02-08-47-25-560.png
>
> Time Spent: 3h
> Remaining Estimate: 0h
>
> Get
> [https://github.com/apache/netbeans-html4j/blob/release-1.7.2/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaScriptAction.java#L36],
> open it in most recent NetBeans IDE running on JDK8 (with nbjavac@16.0.0.0
> installed) and try to convince the editor to not show errors about text
> blocks:
> !image-2021-07-02-08-47-25-560.png!
> Is there some way to do so? It is very annoying to have the source tree full
> of useless errors related to text blocks, when everything compiles and runs
> fine. The project's source level is set to 15 and Maven support shall report
> that to {{java.source}}. Any help welcomed.
--
This message was sent by Atlassian Jira
(v8.20.1#820001)
-
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
[jira] [Assigned] (NETBEANS-5829) Incorrect "Text blocks aren't supported"
[
https://issues.apache.org/jira/browse/NETBEANS-5829?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Jaroslav Tulach reassigned NETBEANS-5829:
-
Assignee: Jaroslav Tulach (was: Jan Lahoda)
> Incorrect "Text blocks aren't supported"
>
>
> Key: NETBEANS-5829
> URL: https://issues.apache.org/jira/browse/NETBEANS-5829
> Project: NetBeans
> Issue Type: Bug
> Components: java - Source
>Reporter: Jaroslav Tulach
>Assignee: Jaroslav Tulach
>Priority: Major
> Labels: pull-request-available
> Attachments: image-2021-07-02-08-47-25-560.png
>
> Time Spent: 3h
> Remaining Estimate: 0h
>
> Get
> [https://github.com/apache/netbeans-html4j/blob/release-1.7.2/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaScriptAction.java#L36],
> open it in most recent NetBeans IDE running on JDK8 (with nbjavac@16.0.0.0
> installed) and try to convince the editor to not show errors about text
> blocks:
> !image-2021-07-02-08-47-25-560.png!
> Is there some way to do so? It is very annoying to have the source tree full
> of useless errors related to text blocks, when everything compiles and runs
> fine. The project's source level is set to 15 and Maven support shall report
> that to {{java.source}}. Any help welcomed.
--
This message was sent by Atlassian Jira
(v8.20.1#820001)
-
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 (93db1c4 -> 097bb23)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 93db1c4 GroovyVirtualSourceProvider should run GroovyParser in 'indexing' mode. (#3859) new ff6fb43 Source level 15 and text blocks shall be supported regardless of the JDK NetBeans run on new 2a988bb Enable testing of java.source module new fc1e300 Use --release instead of downgrading the source level new 0cb94f1 Minimum support release is 7 new 814d02d Use com.sun.tools.javac.code.Source to compare source levels new b5c21d0 Bringing the fix and the test together new a4fdca2 Keep the warning about missing classes, but remove the change level notice new fdea3e5 Being more conservative when computing useRelease new 2a26dc1 Merging with nb-javac@18 new 097bb23 Merge pull request #3715 from jtulach/jtulach/UseReleaseInsteadOfDowngrading The 6830 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| 3 +- .../modules/java/source/parsing/JavacParser.java | 48 ++ .../api/java/source/MockSourceLevelQuery.java | 69 .../api/java/source/TextBlocksOnAnyJavaTest.java | 76 ++ 4 files changed, 181 insertions(+), 15 deletions(-) create mode 100644 java/java.source/test/unit/src/org/netbeans/api/java/source/MockSourceLevelQuery.java create mode 100644 java/java.source/test/unit/src/org/netbeans/api/java/source/TextBlocksOnAnyJavaTest.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
