Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PAYARA-3492-Upgrade-JLine-version-to-v3.x #3739

Merged
merged 13 commits into from Jun 11, 2019
Merged

PAYARA-3492-Upgrade-JLine-version-to-v3.x #3739

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
899e9ec
PAYARA-3492-Upgrade-JLine-version-to-v3.x
Apr 11, 2019
e646a9f
Merge branch 'master' of https://github.com/payara/Payara into PAYARA…
MeroRai May 1, 2019
7dc28d0
Fixed QuickLook error
MeroRai May 2, 2019
0c7bf76
Autocompletion now works in multimode
MeroRai May 8, 2019
347b3d0
Resloved the issue with password echoing on the terminal
MeroRai May 13, 2019
e4fd6e6
Removed duplicate class-path form admin-cli pom file
MeroRai May 13, 2019
e626dd2
Catching errors
MeroRai May 13, 2019
a8703b7
jLine3 now works in windows
MeroRai May 24, 2019
1cdb332
Removed unwanted pom file
MeroRai May 24, 2019
80a0653
Fixed the Quicklook test
MeroRai May 31, 2019
4a61f13
Fixed conflicts
MeroRai May 31, 2019
1d0852d
Password doesn't print out * anymore
MeroRai Jun 7, 2019
e008ab6
Resloved the Conflicts
MeroRai Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions appserver/admin/cli/pom.xml
View file
Open in desktop
Expand Up @@ -39,9 +39,8 @@
only if the new code is made subject to such option by the copyright
holder.

Portions Copyright [2019] [Payara Foundation and/or its affiliates]
-->
<!-- Portions Copyright [2018] [Payara Foundation and/or its affiliates] -->
<!-- Portions Copyright [2018-2019] [Payara Foundation and/or its affiliates] -->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -78,7 +77,7 @@
<mainClass>org.glassfish.admin.cli.AsadminMain</mainClass>
</manifest>
<manifestEntries>
<Class-Path>../../modules/admin-cli.jar ../../modules/jaxb-osgi.jar ../../modules/istack-commons-runtime.jar</Class-Path>
<Class-Path>../../modules/admin-cli.jar ../../modules/jaxb-osgi.jar ../../modules/istack-commons-runtime.jar jna.jar jline-terminal-jna.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Expand Down
10 changes: 10 additions & 0 deletions appserver/packager/glassfish-common-web/pom.xml
View file
Open in desktop
Expand Up @@ -176,6 +176,16 @@
<artifactId>appserver-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>${jna.version}</version>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline-terminal-jna</artifactId>
<version>${jline-terminal-jna}</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.admin</groupId>
<artifactId>admin-core</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions appserver/packager/glassfish-common-web/src/main/assembly/glassfish-common-web.xml
View file
Open in desktop
Expand Up @@ -40,6 +40,7 @@
holder.

-->
<!-- Portions Copyright [2019] [Payara Foundation and/or its affiliates] -->

<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
Expand All @@ -57,6 +58,8 @@
<excludes>
<exclude>modules/cli-optional.jar</exclude>
<exclude>modules/appserver-cli.jar</exclude>
<exclude>modules/jna.jar</exclude>
<exclude>modules/jline-terminal-jna.jar</exclude>
<exclude>bin/*</exclude>
<exclude>pkg_proto.py</exclude>
</excludes>
Expand All @@ -81,6 +84,8 @@
<outputDirectory>${install.dir.name}/glassfish/lib/client</outputDirectory>
<includes>
<include>appserver-cli.jar</include>
<include>jna.jar</include>
<include>jline-terminal-jna.jar</include>
</includes>
</fileSet>
<fileSet>
Expand Down
4 changes: 4 additions & 0 deletions appserver/pom.xml
View file
Open in desktop
Expand Up @@ -138,6 +138,10 @@
<!-- JMS -->
<jms-api.version>2.0.1</jms-api.version>

<jna.version>5.2.0</jna.version>

<jline-terminal-jna>3.11.0</jline-terminal-jna>

<!-- 5.1.1-b02.payara-p1 -->
<mq.version>5.1.1.final.payara-p4</mq.version>

Expand Down
1 change: 1 addition & 0 deletions appserver/tests/quicklook/ejb/mdb/create_resources.asadmin
View file
Open in desktop
Expand Up @@ -42,3 +42,4 @@ create-jmsdest --desttype queue ejb_ejb30_hello_mdb_InQueue
create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_ejb30_hello_mdb_InQueue jms/ejb_ejb30_hello_mdb_InQueue
create-jmsdest --desttype queue ejb_ejb30_hello_mdb_OutQueue
create-jms-resource --restype javax.jms.Queue --property imqDestinationName=ejb_ejb30_hello_mdb_OutQueue jms/ejb_ejb30_hello_mdb_OutQueue

2 changes: 1 addition & 1 deletion nucleus/admin/cli/pom.xml
View file
Open in desktop
Expand Up @@ -166,7 +166,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jline</groupId>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
</dependency>
<dependency>
Expand Down