This is an automated email from the ASF dual-hosted git repository.
sdedic 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 42e7c1c1c85 Fixed copypaste leftovers.
new 0bb99de04f0 Merge pull request #5406 from sdedic/maven/copypaste-typo
42e7c1c1c85 is described below
commit 42e7c1c1c85b5d0a143ad1be15ec481890daba8a
Author: Svata Dedic <[email protected]>
AuthorDate: Wed Feb 1 19:55:22 2023 +0100
Fixed copypaste leftovers.
---
.../org/netbeans/modules/maven/execute/MavenProxySupport.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/java/maven/src/org/netbeans/modules/maven/execute/MavenProxySupport.java
b/java/maven/src/org/netbeans/modules/maven/execute/MavenProxySupport.java
index adcd4489daf..48074dd7c45 100644
--- a/java/maven/src/org/netbeans/modules/maven/execute/MavenProxySupport.java
+++ b/java/maven/src/org/netbeans/modules/maven/execute/MavenProxySupport.java
@@ -589,13 +589,13 @@ public class MavenProxySupport {
@NbBundle.Messages({
"TITLE_MavenProxyMismatch=Possible Network Proxy Issue",
- "# {0} - gradle proxy",
- "MSG_ProxyMisconfiguredDirect=Maven is configured for a proxy {0}, but
the system does not require a proxy for network connections. Proxy settings
should be removed from user gradle.properties.",
+ "# {0} - maven proxy",
+ "MSG_ProxyMisconfiguredDirect=Maven is configured for a proxy {0}, but
the system does not require a proxy for network connections. Proxy settings
should be removed from maven settings.xml.",
"# {0} - system proxy",
- "MSG_ProxyMisconfiguredMissing=Maven is not configured to use a
network proxy, but the proxy {0} seems to be required for network
communication. User gradle.properties should be updated to specify a proxy.",
+ "MSG_ProxyMisconfiguredMissing=Maven is not configured to use a
network proxy, but the proxy {0} seems to be required for network
communication. Maven settings.xml should be updated to specify a proxy.",
"# {0} - system proxy",
- "# {1} - gradle proxy",
- "MSG_ProxyMisconfiguredOther=Maven is configured to use a network
proxy {1}, but the proxy {0} seems to be required for network communication.
Proxy settings should be updated in user gradle.properties.",
+ "# {1} - maven proxy",
+ "MSG_ProxyMisconfiguredOther=Maven is configured to use a network
proxy {1}, but the proxy {0} seems to be required for network communication.
Proxy settings should be updated in maven settings.xml.",
"MSG_AppendAskUpdate=\nUpdate Maven configuration ? Choose
\"Override\" to apply detected proxy only to IDE operations.",
"MSG_AppendAskUpdate2=\nUpdate Maven configuration ?",
"ACTION_Override=Override",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
