Skip to content

Commit ec5bf9c

Browse files
committed
Use fine-grained JLine 3.x components
The org.jline:jline component is an uber-JAR, which conflicts with the org.scala-lang:scala3-compiler_3 component's use of org.jline:jline-reader, org.jline:jline-terminal, and org.jline:jline-terminal-jna.
1 parent 78fca48 commit ec5bf9c

1 file changed

Lines changed: 77 additions & 5 deletions

File tree

pom.xml

Lines changed: 77 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<artifactId>pom-scijava</artifactId>
13-
<version>34.1.1-SNAPSHOT</version>
13+
<version>35.0.0-SNAPSHOT</version>
1414
<packaging>pom</packaging>
1515

1616
<name>SciJava Parent POM</name>
@@ -1940,11 +1940,34 @@
19401940
<org.jheaps.jheaps.version>${jheaps.version}</org.jheaps.jheaps.version>
19411941

19421942
<!-- JLine - https://jline.github.io/ -->
1943+
19431944
<jline2.version>2.14.6</jline2.version>
1944-
<jline3.version>3.23.0</jline3.version>
19451945
<jline.version>${jline2.version}</jline.version>
19461946
<jline.jline.version>${jline.version}</jline.jline.version>
1947-
<org.jline.jline.version>${jline3.version}</org.jline.jline.version>
1947+
1948+
<jline3.version>3.23.0</jline3.version>
1949+
<jline-builtins.version>${jline3.version}</jline-builtins.version>
1950+
<jline-console.version>${jline3.version}</jline-console.version>
1951+
<!-- NB: No jline-groovy, because it depends on Groovy v4, but we currently use Groovy v3. -->
1952+
<!-- <jline-groovy.version>${jline3.version}</jline-groovy.version> -->
1953+
<jline-reader.version>${jline3.version}</jline-reader.version>
1954+
<jline-remote-ssh.version>${jline3.version}</jline-remote-ssh.version>
1955+
<jline-remote-telnet.version>${jline3.version}</jline-remote-telnet.version>
1956+
<jline-style.version>${jline3.version}</jline-style.version>
1957+
<jline-terminal.version>${jline3.version}</jline-terminal.version>
1958+
<!-- NB: No jline-terminal-jansi, because jline:jline (JLine v2) overlaps with it. -->
1959+
<!-- <jline-terminal-jansi.version>${jline3.version}</jline-terminal-jansi.version> -->
1960+
<jline-terminal-jna.version>${jline3.version}</jline-terminal-jna.version>
1961+
<org.jline.jline-builtins.version>${jline-builtins.version}</org.jline.jline-builtins.version>
1962+
<org.jline.jline-console.version>${jline-console.version}</org.jline.jline-console.version>
1963+
<!-- <org.jline.jline-groovy.version>${jline-groovy.version}</org.jline.jline-groovy.version> -->
1964+
<org.jline.jline-reader.version>${jline-reader.version}</org.jline.jline-reader.version>
1965+
<org.jline.jline-remote-ssh.version>${jline-remote-ssh.version}</org.jline.jline-remote-ssh.version>
1966+
<org.jline.jline-remote-telnet.version>${jline-remote-telnet.version}</org.jline.jline-remote-telnet.version>
1967+
<org.jline.jline-style.version>${jline-style.version}</org.jline.jline-style.version>
1968+
<org.jline.jline-terminal.version>${jline-terminal.version}</org.jline.jline-terminal.version>
1969+
<!-- <org.jline.jline-terminal-jansi.version>${jline-terminal-jansi.version}</org.jline.jline-terminal-jansi.version> -->
1970+
<org.jline.jline-terminal-jna.version>${jline-terminal-jna.version}</org.jline.jline-terminal-jna.version>
19481971

19491972
<!-- JMH - https://openjdk.java.net/projects/code-tools/jmh/ -->
19501973
<jmh.version>1.36</jmh.version>
@@ -5533,8 +5556,57 @@
55335556
</dependency>
55345557
<dependency>
55355558
<groupId>org.jline</groupId>
5536-
<artifactId>jline</artifactId>
5537-
<version>${org.jline.jline.version}</version>
5559+
<artifactId>jline-builtins</artifactId>
5560+
<version>${org.jline.jline-builtins.version}</version>
5561+
</dependency>
5562+
<dependency>
5563+
<groupId>org.jline</groupId>
5564+
<artifactId>jline-console</artifactId>
5565+
<version>${org.jline.jline-console.version}</version>
5566+
</dependency>
5567+
<!--
5568+
<dependency>
5569+
<groupId>org.jline</groupId>
5570+
<artifactId>jline-groovy</artifactId>
5571+
<version>${org.jline.jline-groovy.version}</version>
5572+
</dependency>
5573+
-->
5574+
<dependency>
5575+
<groupId>org.jline</groupId>
5576+
<artifactId>jline-reader</artifactId>
5577+
<version>${org.jline.jline-reader.version}</version>
5578+
</dependency>
5579+
<dependency>
5580+
<groupId>org.jline</groupId>
5581+
<artifactId>jline-remote-ssh</artifactId>
5582+
<version>${org.jline.jline-remote-ssh.version}</version>
5583+
</dependency>
5584+
<dependency>
5585+
<groupId>org.jline</groupId>
5586+
<artifactId>jline-remote-telnet</artifactId>
5587+
<version>${org.jline.jline-remote-telnet.version}</version>
5588+
</dependency>
5589+
<dependency>
5590+
<groupId>org.jline</groupId>
5591+
<artifactId>jline-style</artifactId>
5592+
<version>${org.jline.jline-style.version}</version>
5593+
</dependency>
5594+
<dependency>
5595+
<groupId>org.jline</groupId>
5596+
<artifactId>jline-terminal</artifactId>
5597+
<version>${org.jline.jline-terminal.version}</version>
5598+
</dependency>
5599+
<!--
5600+
<dependency>
5601+
<groupId>org.jline</groupId>
5602+
<artifactId>jline-terminal-jansi</artifactId>
5603+
<version>${org.jline.jline-terminal-jansi.version}</version>
5604+
</dependency>
5605+
-->
5606+
<dependency>
5607+
<groupId>org.jline</groupId>
5608+
<artifactId>jline-terminal-jna</artifactId>
5609+
<version>${org.jline.jline-terminal-jna.version}</version>
55385610
</dependency>
55395611

55405612
<!-- JNA - https://github.com/java-native-access/jna -->

0 commit comments

Comments
 (0)