Skip to content

Commit 2042763

Browse files
committed
update examples to the latest version of æsh
1 parent f47737d commit 2042763

File tree

29 files changed

+91
-125
lines changed

29 files changed

+91
-125
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ target/
2525
hs_err_pid*
2626

2727
.idea
28+
*.iml

aesh/extend-context/pom.xml

+1-9
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
<version>0.1</version>
2929

3030
<properties>
31-
<aesh.version>2.3</aesh.version>
32-
<readline.version>1.17</readline.version>
31+
<aesh.version>2.4</aesh.version>
3332

3433
<!-- maven plugin versions -->
3534
<compiler-plugin.version>3.8.0</compiler-plugin.version>
@@ -49,13 +48,6 @@
4948
<artifactId>aesh</artifactId>
5049
<version>${aesh.version}</version>
5150
</dependency>
52-
<!--
53-
<dependency>
54-
<groupId>org.aesh</groupId>
55-
<artifactId>aesh-readline</artifactId>
56-
<version>${readline.version}</version>
57-
</dependency>
58-
-->
5951
</dependencies>
6052

6153
<build>

aesh/getting-started-input/dependency-reduced-pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@
5353
</plugins>
5454
</build>
5555
<properties>
56-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
57-
<shade-plugin.version>3.2.1</shade-plugin.version>
58-
<readline.version>1.17</readline.version>
59-
<aesh.version>2.3</aesh.version>
60-
<jar-plugin.version>3.1.1</jar-plugin.version>
56+
<aesh.version>2.4</aesh.version>
6157
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6258
<compiler-plugin.version>3.8.0</compiler-plugin.version>
59+
<shade-plugin.version>3.2.1</shade-plugin.version>
60+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
61+
<jar-plugin.version>3.1.1</jar-plugin.version>
6362
</properties>
6463
</project>

aesh/getting-started-input/pom.xml

+1-9
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
<version>0.1</version>
2929

3030
<properties>
31-
<aesh.version>2.3</aesh.version>
32-
<readline.version>1.17</readline.version>
31+
<aesh.version>2.4</aesh.version>
3332

3433
<!-- maven plugin versions -->
3534
<compiler-plugin.version>3.8.0</compiler-plugin.version>
@@ -47,13 +46,6 @@
4746
<artifactId>aesh</artifactId>
4847
<version>${aesh.version}</version>
4948
</dependency>
50-
<!--
51-
<dependency>
52-
<groupId>org.aesh</groupId>
53-
<artifactId>aesh-readline</artifactId>
54-
<version>${readline.version}</version>
55-
</dependency>
56-
-->
5749
</dependencies>
5850

5951
<build>

aesh/getting-started-runtime/dependency-reduced-pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@
5353
</plugins>
5454
</build>
5555
<properties>
56-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
57-
<shade-plugin.version>3.2.1</shade-plugin.version>
58-
<readline.version>1.17</readline.version>
59-
<aesh.version>2.3</aesh.version>
60-
<jar-plugin.version>3.1.1</jar-plugin.version>
56+
<aesh.version>2.4</aesh.version>
6157
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6258
<compiler-plugin.version>3.8.0</compiler-plugin.version>
59+
<shade-plugin.version>3.2.1</shade-plugin.version>
60+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
61+
<jar-plugin.version>3.1.1</jar-plugin.version>
6362
</properties>
6463
</project>

aesh/getting-started-runtime/pom.xml

+1-9
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
<version>0.1</version>
2929

3030
<properties>
31-
<aesh.version>2.3</aesh.version>
32-
<readline.version>1.17</readline.version>
31+
<aesh.version>2.4</aesh.version>
3332

3433
<!-- maven plugin versions -->
3534
<compiler-plugin.version>3.8.0</compiler-plugin.version>
@@ -47,13 +46,6 @@
4746
<artifactId>aesh</artifactId>
4847
<version>${aesh.version}</version>
4948
</dependency>
50-
<!--
51-
<dependency>
52-
<groupId>org.aesh</groupId>
53-
<artifactId>aesh-readline</artifactId>
54-
<version>${readline.version}</version>
55-
</dependency>
56-
-->
5749
</dependencies>
5850

5951
<build>

aesh/getting-started-runtime/src/main/java/org/acme/runtime/RuntimeExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static class RuntimeCommand implements Command {
4242
private boolean input;
4343

4444
@Override
45-
public CommandResult execute(CommandInvocation commandInvocation) {
45+
public CommandResult execute(CommandInvocation commandInvocation) throws InterruptedException {
4646
if(input) {
4747
String answer = commandInvocation.getShell().readLine("What is the answer? ");
4848
commandInvocation.println("The answer is: "+answer);

aesh/getting-started/dependency-reduced-pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
</plugins>
5454
</build>
5555
<properties>
56-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
57-
<shade-plugin.version>3.2.1</shade-plugin.version>
58-
<readline.version>1.17</readline.version>
59-
<aesh.version>2.3</aesh.version>
60-
<jar-plugin.version>3.1.1</jar-plugin.version>
56+
<readline.version>2.0</readline.version>
57+
<aesh.version>2.4</aesh.version>
6158
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6259
<compiler-plugin.version>3.8.0</compiler-plugin.version>
60+
<shade-plugin.version>3.2.1</shade-plugin.version>
61+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
62+
<jar-plugin.version>3.1.1</jar-plugin.version>
6363
</properties>
6464
</project>

aesh/getting-started/pom.xml

+2-9
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<version>0.1</version>
2929

3030
<properties>
31-
<aesh.version>2.3</aesh.version>
32-
<readline.version>1.17</readline.version>
31+
<aesh.version>2.4</aesh.version>
32+
<readline.version>2.0</readline.version>
3333

3434
<!-- maven plugin versions -->
3535
<compiler-plugin.version>3.8.0</compiler-plugin.version>
@@ -47,13 +47,6 @@
4747
<artifactId>aesh</artifactId>
4848
<version>${aesh.version}</version>
4949
</dependency>
50-
<!--
51-
<dependency>
52-
<groupId>org.aesh</groupId>
53-
<artifactId>aesh-readline</artifactId>
54-
<version>${readline.version}</version>
55-
</dependency>
56-
-->
5750
</dependencies>
5851

5952
<build>

aesh/native-runtime/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
<version>0.1</version>
2929

3030
<properties>
31-
<aesh.version>2.4-SNAPSHOT</aesh.version>
32-
<readline.version>1.17</readline.version>
31+
<aesh.version>2.4</aesh.version>
3332

3433
<!-- maven plugin versions -->
3534
<compiler-plugin.version>3.8.0</compiler-plugin.version>

readline/cmd-mirror-ssh/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<version>0.1</version>
2929

3030
<properties>
31-
<readline.version>1.17</readline.version>
31+
<readline.version>2.0</readline.version>
3232

3333
<!-- maven plugin versions -->
3434
<compiler-plugin.version>3.8.0</compiler-plugin.version>
@@ -45,12 +45,12 @@
4545
<dependencies>
4646
<dependency>
4747
<groupId>org.aesh</groupId>
48-
<artifactId>aesh-readline</artifactId>
48+
<artifactId>readline</artifactId>
4949
<version>${readline.version}</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.aesh</groupId>
53-
<artifactId>aesh-terminal-ssh</artifactId>
53+
<artifactId>terminal-ssh</artifactId>
5454
<version>${readline.version}</version>
5555
</dependency>
5656
<dependency>

readline/getting-started-ext/dependency-reduced-pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@
5353
</plugins>
5454
</build>
5555
<properties>
56-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
57-
<shade-plugin.version>3.2.1</shade-plugin.version>
58-
<readline.version>1.17</readline.version>
59-
<jar-plugin.version>3.1.1</jar-plugin.version>
60-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
56+
<readline.version>2.0</readline.version>
57+
<maven.compiler.target>1.8</maven.compiler.target>
6158
<maven.compiler.source>1.8</maven.compiler.source>
59+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6260
<compiler-plugin.version>3.8.0</compiler-plugin.version>
63-
<maven.compiler.target>1.8</maven.compiler.target>
61+
<shade-plugin.version>3.2.1</shade-plugin.version>
62+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
63+
<jar-plugin.version>3.1.1</jar-plugin.version>
6464
</properties>
6565
</project>

readline/getting-started-ext/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<version>0.1</version>
2929

3030
<properties>
31-
<readline.version>1.17</readline.version>
31+
<readline.version>2.0</readline.version>
3232

3333
<!-- maven plugin versions -->
3434
<compiler-plugin.version>3.8.0</compiler-plugin.version>
@@ -45,7 +45,7 @@
4545
<dependencies>
4646
<dependency>
4747
<groupId>org.aesh</groupId>
48-
<artifactId>aesh-readline</artifactId>
48+
<artifactId>readline</artifactId>
4949
<version>${readline.version}</version>
5050
</dependency>
5151

readline/getting-started-ext/src/main/java/org/acme/quickstart/Example.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
import org.aesh.readline.terminal.formatting.TerminalCharacter;
3131
import org.aesh.readline.terminal.formatting.TerminalColor;
3232
import org.aesh.readline.tty.terminal.TerminalConnection;
33+
import org.aesh.readline.util.LoggerUtil;
3334
import org.aesh.terminal.Connection;
3435
import org.aesh.terminal.tty.Signal;
35-
import org.aesh.utils.ANSI;
36-
import org.aesh.utils.Config;
37-
import org.aesh.readline.util.LoggerUtil;
36+
import org.aesh.terminal.utils.ANSI;
37+
import org.aesh.terminal.utils.Config;
3838

3939
import java.io.IOException;
4040
import java.util.ArrayList;

readline/getting-started/dependency-reduced-pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@
5353
</plugins>
5454
</build>
5555
<properties>
56-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
57-
<shade-plugin.version>3.2.1</shade-plugin.version>
58-
<readline.version>1.17</readline.version>
59-
<jar-plugin.version>3.1.1</jar-plugin.version>
60-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
56+
<readline.version>2.0</readline.version>
57+
<maven.compiler.target>1.8</maven.compiler.target>
6158
<maven.compiler.source>1.8</maven.compiler.source>
59+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6260
<compiler-plugin.version>3.8.0</compiler-plugin.version>
63-
<maven.compiler.target>1.8</maven.compiler.target>
61+
<shade-plugin.version>3.2.1</shade-plugin.version>
62+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
63+
<jar-plugin.version>3.1.1</jar-plugin.version>
6464
</properties>
6565
</project>

readline/getting-started/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<version>0.1</version>
2929

3030
<properties>
31-
<readline.version>1.17</readline.version>
31+
<readline.version>2.0</readline.version>
3232

3333
<!-- maven plugin versions -->
3434
<compiler-plugin.version>3.8.0</compiler-plugin.version>
@@ -45,7 +45,7 @@
4545
<dependencies>
4646
<dependency>
4747
<groupId>org.aesh</groupId>
48-
<artifactId>aesh-readline</artifactId>
48+
<artifactId>readline</artifactId>
4949
<version>${readline.version}</version>
5050
</dependency>
5151

readline/getting-started/src/main/java/org/acme/quickstart/SimpleExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.aesh.readline.tty.terminal.TerminalConnection;
2525
import org.aesh.terminal.Connection;
2626
import org.aesh.terminal.tty.Signal;
27-
import org.aesh.utils.Config;
27+
import org.aesh.terminal.utils.Config;
2828

2929
import java.io.IOException;
3030
import java.util.function.Consumer;

readline/shell-ssh/dependency-reduced-pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@
5353
</plugins>
5454
</build>
5555
<properties>
56-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
57-
<shade-plugin.version>3.2.1</shade-plugin.version>
58-
<readline.version>1.17</readline.version>
59-
<jar-plugin.version>3.1.1</jar-plugin.version>
60-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
56+
<readline.version>2.0</readline.version>
57+
<maven.compiler.target>1.8</maven.compiler.target>
6158
<maven.compiler.source>1.8</maven.compiler.source>
59+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6260
<compiler-plugin.version>3.8.0</compiler-plugin.version>
63-
<maven.compiler.target>1.8</maven.compiler.target>
61+
<shade-plugin.version>3.2.1</shade-plugin.version>
62+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
63+
<jar-plugin.version>3.1.1</jar-plugin.version>
6464
</properties>
6565
</project>

readline/shell-ssh/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<version>0.1</version>
2929

3030
<properties>
31-
<readline.version>1.17</readline.version>
31+
<readline.version>2.0</readline.version>
3232

3333
<!-- maven plugin versions -->
3434
<compiler-plugin.version>3.8.0</compiler-plugin.version>
@@ -45,12 +45,12 @@
4545
<dependencies>
4646
<dependency>
4747
<groupId>org.aesh</groupId>
48-
<artifactId>aesh-readline</artifactId>
48+
<artifactId>readline</artifactId>
4949
<version>${readline.version}</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.aesh</groupId>
53-
<artifactId>aesh-terminal-ssh</artifactId>
53+
<artifactId>terminal-ssh</artifactId>
5454
<version>${readline.version}</version>
5555
</dependency>
5656
<dependency>

readline/shell-telnet/dependency-reduced-pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
</plugins>
5454
</build>
5555
<properties>
56-
<shade-plugin.version>3.2.1</shade-plugin.version>
56+
<readline.version>2.0</readline.version>
5757
<netty.version>4.0.31.Final</netty.version>
58-
<jar-plugin.version>3.1.1</jar-plugin.version>
59-
<compiler-plugin.version>3.8.0</compiler-plugin.version>
60-
<readline.version>1.17</readline.version>
6158
<maven.compiler.target>1.8</maven.compiler.target>
62-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
63-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6459
<maven.compiler.source>1.8</maven.compiler.source>
60+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
61+
<compiler-plugin.version>3.8.0</compiler-plugin.version>
62+
<shade-plugin.version>3.2.1</shade-plugin.version>
63+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
64+
<jar-plugin.version>3.1.1</jar-plugin.version>
6565
</properties>
6666
</project>

readline/shell-telnet/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<version>0.1</version>
2929

3030
<properties>
31-
<readline.version>1.17</readline.version>
31+
<readline.version>2.0</readline.version>
3232

3333
<!-- maven plugin versions -->
3434
<compiler-plugin.version>3.8.0</compiler-plugin.version>
@@ -46,12 +46,12 @@
4646
<dependencies>
4747
<dependency>
4848
<groupId>org.aesh</groupId>
49-
<artifactId>aesh-readline</artifactId>
49+
<artifactId>readline</artifactId>
5050
<version>${readline.version}</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.aesh</groupId>
54-
<artifactId>aesh-terminal-telnet</artifactId>
54+
<artifactId>terminal-telnet</artifactId>
5555
<version>${readline.version}</version>
5656
</dependency>
5757
<dependency>

0 commit comments

Comments
 (0)