Skip to content

Commit

Permalink
Upgrade all plugins to latest version (#740)
Browse files Browse the repository at this point in the history 
* Upgrade all plugins to latest version, add enforcer, remove prerequisistes
* Update sshd
  • Loading branch information
@gnodet
gnodet committed Jan 16, 2023
1 parent d6e84da commit 87f7e57
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 36 deletions.
1 change: 0 additions & 1 deletion jline/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.12</version>
<executions>
<execution>
<id>add-source</id>
Expand Down
144 changes: 111 additions & 33 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<connection>scm:git:git://github.com/jline/jline3.git</connection>
<developerConnection>scm:git:ssh://git@github.com/jline/jline3.git</developerConnection>
<url>http://github.com/jline/jline3</url>
<tag>jline-parent-3.21.0</tag>
</scm>

<issueManagement>
Expand Down Expand Up @@ -76,34 +75,31 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.outputTimestamp>2021-10-19T06:22:24Z</project.build.outputTimestamp>

<maven.version>3.5.0</maven.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

<native.image.skip>true</native.image.skip>
<automatic.module.name />

<jna.version>5.9.0</jna.version>
<jna.version>5.13.0</jna.version>
<jansi.version>2.4.0</jansi.version>
<juniversalchardet.version>1.0.3</juniversalchardet.version>
<sshd.version>2.7.0</sshd.version>
<easymock.version>3.3.1</easymock.version>
<junit.version>4.13.1</junit.version>
<gogo.runtime.version>1.1.4</gogo.runtime.version>
<sshd.version>2.9.2</sshd.version>
<easymock.version>5.1.0</easymock.version>
<junit.version>4.13.2</junit.version>
<gogo.runtime.version>1.1.6</gogo.runtime.version>
<gogo.jline.version>1.1.8</gogo.jline.version>
<slf4j.version>1.7.21</slf4j.version>
<slf4j.version>2.0.6</slf4j.version>
<findbugs.version>3.0.2</findbugs.version>
<groovy.version>4.0.7</groovy.version>
<ivy.version>2.5.1</ivy.version>
<graal.version>22.1.0</graal.version>
<graal-maven-plugin.version>20.3.6.1</graal-maven-plugin.version>
<graal.version>22.3.0</graal.version>
<graal.plugin.version>21.2.0</graal.plugin.version>

<surefire.argLine />
</properties>

<prerequisites>
<maven>3.5.0</maven>
</prerequisites>

<repositories>
<repository>
<id>apache-snapshots</id>
Expand Down Expand Up @@ -307,6 +303,71 @@

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.9.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M8</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.8</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>native-image-maven-plugin</artifactId>
<version>${graal.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand All @@ -326,7 +387,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.0.0</version>
<configuration>
<deployAtEnd>true</deployAtEnd>
</configuration>
Expand All @@ -335,7 +396,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>3.0</version>
<version>4.2.rc3</version>
<configuration>
<encoding>UTF-8</encoding>
<strictCheck>true</strictCheck>
Expand Down Expand Up @@ -396,7 +457,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -416,6 +477,24 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.13.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-wrapper-plugin</artifactId>
<version>3.1.1</version>
</plugin>
</plugins>
</pluginManagement>

Expand All @@ -424,12 +503,26 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>${maven.version}</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.1</version>
<configuration>
<instructions>
<Export-Package>*;-noimport:=true</Export-Package>
Expand All @@ -450,25 +543,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>

<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.8.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
Expand All @@ -482,7 +566,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<argLine>${surefire.argLine}</argLine>
Expand All @@ -493,7 +576,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<configuration>
<archive>
<manifestEntries>
Expand All @@ -517,15 +599,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
<plugin>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>native-image-maven-plugin</artifactId>
<version>${graal-maven-plugin.version}</version>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -555,7 +635,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<doclint>none</doclint>
<notimestamp>true</notimestamp>
Expand All @@ -574,7 +653,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
<version>3.12.0</version>
</dependency>
</dependencies>
</plugin>
Expand All @@ -595,7 +674,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<release>8</release>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions remote-ssh/src/main/java/org/jline/builtins/ssh/Ssh.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import org.apache.sshd.common.channel.PtyMode;
import org.apache.sshd.common.config.keys.FilePasswordProvider;
import org.apache.sshd.common.session.SessionContext;
import org.apache.sshd.common.util.io.NoCloseInputStream;
import org.apache.sshd.common.util.io.NoCloseOutputStream;
import org.apache.sshd.common.util.io.input.NoCloseInputStream;
import org.apache.sshd.common.util.io.output.NoCloseOutputStream;
import org.apache.sshd.scp.server.ScpCommandFactory;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
Expand Down

0 comments on commit 87f7e57

Please sign in to comment.