diff --git a/bundles/org.eclipse.remote.console/pom.xml b/bundles/org.eclipse.remote.console/pom.xml index fd240fbc7af..06e7a2bc9a7 100644 --- a/bundles/org.eclipse.remote.console/pom.xml +++ b/bundles/org.eclipse.remote.console/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.core/pom.xml b/bundles/org.eclipse.remote.core/pom.xml index b2ce59e61c3..db4ceb42f28 100644 --- a/bundles/org.eclipse.remote.core/pom.xml +++ b/bundles/org.eclipse.remote.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.doc.isv/pom.xml b/bundles/org.eclipse.remote.doc.isv/pom.xml index 1f25247d10d..b67845b8600 100644 --- a/bundles/org.eclipse.remote.doc.isv/pom.xml +++ b/bundles/org.eclipse.remote.doc.isv/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.jsch.core/pom.xml b/bundles/org.eclipse.remote.jsch.core/pom.xml index 0ed3d880e5a..81ff40817db 100644 --- a/bundles/org.eclipse.remote.jsch.core/pom.xml +++ b/bundles/org.eclipse.remote.jsch.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java index ae5a0f36578..7388c46edf4 100644 --- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java +++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java @@ -74,6 +74,7 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC public static final boolean DEFAULT_IS_PASSWORD = false; public static final boolean DEFAULT_USE_LOGIN_SHELL = true; public static final String DEFAULT_LOGIN_SHELL_COMMAND = "/bin/bash -l -c '{0}'"; //$NON-NLS-1$ + public static final String DEFAULT_ENCODING = "UTF-8"; //$NON-NLS-1$ public static final String EMPTY_STRING = ""; //$NON-NLS-1$ private String fWorkingDir; @@ -693,14 +694,18 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC String osVersion; String osArch; - String encoding; + String encoding = DEFAULT_ENCODING; String osName = executeCommand("uname", subMon.newChild(10)); //$NON-NLS-1$ switch (osName.toLowerCase()) { case "linux": //$NON-NLS-1$ osArch = executeCommand("uname -m", subMon.newChild(10)); //$NON-NLS-1$ osVersion = executeCommand("uname -r", subMon.newChild(10)); //$NON-NLS-1$ - encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$ + try { + encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$ + } catch (RemoteConnectionException e) { + // Use default + } break; case "darwin": //$NON-NLS-1$ @@ -713,7 +718,11 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC osArch = "x86_64"; //$NON-NLS-1$ } } - encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$ + try { + encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$ + } catch (RemoteConnectionException e) { + // Use default + } break; case "aix": //$NON-NLS-1$ @@ -728,13 +737,16 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC osArch += "64"; //$NON-NLS-1$ } } - encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$ + try { + encoding = executeCommand("locale charmap", subMon.newChild(10)); //$NON-NLS-1$ + } catch (RemoteConnectionException e) { + // Use default + } break; case "qnx": //$NON-NLS-1$ osArch = executeCommand("uname -p", subMon.newChild(10)); //$NON-NLS-1$ osVersion = executeCommand("uname -r", subMon.newChild(10)); //$NON-NLS-1$ - encoding = "UTF-8"; //$NON-NLS-1$ break; default: diff --git a/bundles/org.eclipse.remote.jsch.ui/pom.xml b/bundles/org.eclipse.remote.jsch.ui/pom.xml index 01e932ae361..763a6b3ee03 100644 --- a/bundles/org.eclipse.remote.jsch.ui/pom.xml +++ b/bundles/org.eclipse.remote.jsch.ui/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.proxy.core/pom.xml b/bundles/org.eclipse.remote.proxy.core/pom.xml index 04cd0a618b4..532fe002397 100644 --- a/bundles/org.eclipse.remote.proxy.core/pom.xml +++ b/bundles/org.eclipse.remote.proxy.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.proxy.protocol.core/pom.xml b/bundles/org.eclipse.remote.proxy.protocol.core/pom.xml index ac47f7a1cda..dc22a04505a 100644 --- a/bundles/org.eclipse.remote.proxy.protocol.core/pom.xml +++ b/bundles/org.eclipse.remote.proxy.protocol.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.proxy.server.core/pom.xml b/bundles/org.eclipse.remote.proxy.server.core/pom.xml index 12d51837818..36c61e0c6f9 100644 --- a/bundles/org.eclipse.remote.proxy.server.core/pom.xml +++ b/bundles/org.eclipse.remote.proxy.server.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.proxy.ui/pom.xml b/bundles/org.eclipse.remote.proxy.ui/pom.xml index 5d8898e045d..f8b970d69c1 100644 --- a/bundles/org.eclipse.remote.proxy.ui/pom.xml +++ b/bundles/org.eclipse.remote.proxy.ui/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.serial.core/pom.xml b/bundles/org.eclipse.remote.serial.core/pom.xml index c2f606df50d..34c601db81e 100644 --- a/bundles/org.eclipse.remote.serial.core/pom.xml +++ b/bundles/org.eclipse.remote.serial.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.serial.ui/pom.xml b/bundles/org.eclipse.remote.serial.ui/pom.xml index 8fde0d1f82c..5dc9417a8ea 100644 --- a/bundles/org.eclipse.remote.serial.ui/pom.xml +++ b/bundles/org.eclipse.remote.serial.ui/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.telnet.core/pom.xml b/bundles/org.eclipse.remote.telnet.core/pom.xml index c96080f21af..bde7f485721 100644 --- a/bundles/org.eclipse.remote.telnet.core/pom.xml +++ b/bundles/org.eclipse.remote.telnet.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.telnet.ui/pom.xml b/bundles/org.eclipse.remote.telnet.ui/pom.xml index e853e5292da..cbf9864f243 100644 --- a/bundles/org.eclipse.remote.telnet.ui/pom.xml +++ b/bundles/org.eclipse.remote.telnet.ui/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/bundles/org.eclipse.remote.ui/pom.xml b/bundles/org.eclipse.remote.ui/pom.xml index 9699fe9d5a9..f271c245e65 100644 --- a/bundles/org.eclipse.remote.ui/pom.xml +++ b/bundles/org.eclipse.remote.ui/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/features/org.eclipse.remote-feature/feature.xml b/features/org.eclipse.remote-feature/feature.xml index f551016d33e..4c35e73b3f5 100644 --- a/features/org.eclipse.remote-feature/feature.xml +++ b/features/org.eclipse.remote-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.remote-feature/pom.xml b/features/org.eclipse.remote-feature/pom.xml index ac46a39bbf1..678cb680176 100644 --- a/features/org.eclipse.remote-feature/pom.xml +++ b/features/org.eclipse.remote-feature/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/features/org.eclipse.remote.console-feature/feature.xml b/features/org.eclipse.remote.console-feature/feature.xml index 58708522d4d..d671ade1e73 100644 --- a/features/org.eclipse.remote.console-feature/feature.xml +++ b/features/org.eclipse.remote.console-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.remote.console-feature/pom.xml b/features/org.eclipse.remote.console-feature/pom.xml index a6bf2225f3f..62518e11c91 100644 --- a/features/org.eclipse.remote.console-feature/pom.xml +++ b/features/org.eclipse.remote.console-feature/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/features/org.eclipse.remote.proxy-feature/feature.xml b/features/org.eclipse.remote.proxy-feature/feature.xml index 526bd557e39..6c35c4c1a0f 100644 --- a/features/org.eclipse.remote.proxy-feature/feature.xml +++ b/features/org.eclipse.remote.proxy-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.remote.proxy-feature/pom.xml b/features/org.eclipse.remote.proxy-feature/pom.xml index 5de7d331850..d19fc272eba 100644 --- a/features/org.eclipse.remote.proxy-feature/pom.xml +++ b/features/org.eclipse.remote.proxy-feature/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/features/org.eclipse.remote.serial-feature/feature.xml b/features/org.eclipse.remote.serial-feature/feature.xml index d9824639efe..5ed6f5099b7 100644 --- a/features/org.eclipse.remote.serial-feature/feature.xml +++ b/features/org.eclipse.remote.serial-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.remote.serial-feature/pom.xml b/features/org.eclipse.remote.serial-feature/pom.xml index b7e675cb05f..feafc5a6917 100644 --- a/features/org.eclipse.remote.serial-feature/pom.xml +++ b/features/org.eclipse.remote.serial-feature/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/features/org.eclipse.remote.telnet-feature/feature.xml b/features/org.eclipse.remote.telnet-feature/feature.xml index 49bfac6b516..e427006ccc8 100644 --- a/features/org.eclipse.remote.telnet-feature/feature.xml +++ b/features/org.eclipse.remote.telnet-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.eclipse.remote.telnet-feature/pom.xml b/features/org.eclipse.remote.telnet-feature/pom.xml index 4305e87394e..f94f9c88eb9 100644 --- a/features/org.eclipse.remote.telnet-feature/pom.xml +++ b/features/org.eclipse.remote.telnet-feature/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml index db69131ad2d..36a8fd3d04e 100644 --- a/releng/org.eclipse.remote.build/pom.xml +++ b/releng/org.eclipse.remote.build/pom.xml @@ -10,7 +10,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT pom Remote Parent @@ -151,7 +151,7 @@ org.eclipse.remote org.eclipse.remote.target - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT photon diff --git a/releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml b/releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml index d1df30c7c82..2e0a07fa2b3 100644 --- a/releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml +++ b/releng/org.eclipse.remote.proxy.server.linux.ppc64le/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml b/releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml index 2cc2434ebb6..b8bdd705a07 100644 --- a/releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml +++ b/releng/org.eclipse.remote.proxy.server.linux.x86_64/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml b/releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml index 9a05a5b1f90..a58d1104219 100644 --- a/releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml +++ b/releng/org.eclipse.remote.proxy.server.macosx.x86_64/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/releng/org.eclipse.remote.proxy.server.product/pom.xml b/releng/org.eclipse.remote.proxy.server.product/pom.xml index 457342f378e..c8821f129d7 100644 --- a/releng/org.eclipse.remote.proxy.server.product/pom.xml +++ b/releng/org.eclipse.remote.proxy.server.product/pom.xml @@ -6,7 +6,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/releng/org.eclipse.remote.repo/pom.xml b/releng/org.eclipse.remote.repo/pom.xml index 1657b8439c4..3fa927fad2d 100644 --- a/releng/org.eclipse.remote.repo/pom.xml +++ b/releng/org.eclipse.remote.repo/pom.xml @@ -7,7 +7,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../../releng/org.eclipse.remote.build/pom.xml diff --git a/releng/org.eclipse.remote.target/pom.xml b/releng/org.eclipse.remote.target/pom.xml index 7b7421c4409..9ea59643f29 100644 --- a/releng/org.eclipse.remote.target/pom.xml +++ b/releng/org.eclipse.remote.target/pom.xml @@ -7,7 +7,7 @@ org.eclipse.remote remote-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT ../org.eclipse.remote.build/pom.xml