Skip to content

Commit 5ea7851

Browse files
committed
jooby-cli: stop shading cli content for better console support
- fix #3182 - fix #2056
1 parent 2a43d0e commit 5ea7851

File tree

2 files changed

+18
-35
lines changed

2 files changed

+18
-35
lines changed

modules/jooby-cli/pom.xml

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
<properties>
1616
<Module-Name>io.jooby.cli</Module-Name>
17+
<jline.version>3.23.0</jline.version>
18+
<picocli.version>4.7.5</picocli.version>
1719
</properties>
1820

1921
<dependencies>
@@ -34,7 +36,7 @@
3436
<dependency>
3537
<groupId>info.picocli</groupId>
3638
<artifactId>picocli</artifactId>
37-
<version>4.7.5</version>
39+
<version>${picocli.version}</version>
3840
</dependency>
3941

4042
<dependency>
@@ -53,7 +55,13 @@
5355
<dependency>
5456
<groupId>org.jline</groupId>
5557
<artifactId>jline</artifactId>
56-
<version>3.23.0</version>
58+
<version>${jline.version}</version>
59+
</dependency>
60+
61+
<dependency>
62+
<groupId>org.jline</groupId>
63+
<artifactId>jline-terminal-jna</artifactId>
64+
<version>${jline.version}</version>
5765
</dependency>
5866

5967
<dependency>
@@ -109,38 +117,14 @@
109117
<path>
110118
<groupId>info.picocli</groupId>
111119
<artifactId>picocli-codegen</artifactId>
112-
<version>4.7.5</version>
120+
<version>${picocli.version}</version>
113121
</path>
114122
</annotationProcessorPaths>
115123
<compilerArgs>
116124
<arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
117125
</compilerArgs>
118126
</configuration>
119127
</plugin>
120-
<plugin>
121-
<artifactId>maven-shade-plugin</artifactId>
122-
<executions>
123-
<execution>
124-
<id>fat-jar</id>
125-
<phase>package</phase>
126-
<goals>
127-
<goal>shade</goal>
128-
</goals>
129-
<configuration>
130-
<minimizeJar>true</minimizeJar>
131-
<createDependencyReducedPom>false</createDependencyReducedPom>
132-
<transformers>
133-
<transformer
134-
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
135-
<transformer
136-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
137-
<mainClass>io.jooby.cli.Cli</mainClass>
138-
</transformer>
139-
</transformers>
140-
</configuration>
141-
</execution>
142-
</executions>
143-
</plugin>
144128
<plugin>
145129
<groupId>com.fizzed</groupId>
146130
<artifactId>stork-maven-plugin</artifactId>

modules/jooby-cli/src/assembly/cli.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@
1919
<include>**/*</include>
2020
</includes>
2121
</fileSet>
22-
<fileSet>
23-
<directory>${project.build.directory}</directory>
24-
<outputDirectory>lib</outputDirectory>
25-
<filtered>false</filtered>
26-
<includes>
27-
<include>${project.artifactId}-${project.version}.jar</include>
28-
</includes>
29-
</fileSet>
3022
</fileSets>
23+
24+
<dependencySets>
25+
<dependencySet>
26+
<outputDirectory>lib</outputDirectory>
27+
<scope>runtime</scope>
28+
</dependencySet>
29+
</dependencySets>
3130
</assembly>

0 commit comments

Comments
 (0)