You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2023/03/24 06:32:32 UTC
[mina-sshd] branch master updated (77fde8c47 -> 4f5f79cbf)
This is an automated email from the ASF dual-hosted git repository.
lgoldstein pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
from 77fde8c47 Must override dependency to build on Maven 3.9.x
new 57d2a6ce2 Replaced jdk15on Bouncycastle artifacts with jdk18on ones
new 63b9770fc Added warning about slf4j version upgrade
new 4f5f79cbf Clarified POM comments regarding versions limitations
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
assembly/pom.xml | 4 ++--
assembly/src/main/components/modules.xml | 2 ++
assembly/src/main/legal/notices.xml | 2 +-
pom.xml | 18 +++++++++++-------
sshd-common/pom.xml | 4 ++--
sshd-core/pom.xml | 4 ++--
sshd-git/pom.xml | 4 ++--
sshd-openpgp/pom.xml | 11 +++++++++--
sshd-osgi/pom.xml | 4 ++--
sshd-putty/pom.xml | 4 ++--
10 files changed, 35 insertions(+), 22 deletions(-)
[mina-sshd] 03/03: Clarified POM comments regarding versions limitations
Posted by lg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lgoldstein pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 4f5f79cbf737eef4a417503641117bcf50a2d6fc
Author: Lyor Goldstein <lg...@apache.org>
AuthorDate: Fri Mar 24 06:54:21 2023 +0300
Clarified POM comments regarding versions limitations
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index e3a0b855e..ddeba36b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.outputTimestamp>2022-11-09T14:17:46Z</project.build.outputTimestamp>
- <!-- NOTE: actual value updated by gmavenplus-plugin on initialization phase -->
+ <!-- NOTE: actual workspace root dir value updated by gmavenplus-plugin on initialization phase -->
<!-- workspace.root.dir>${project.basedir}</workspace.root.dir -->
<java.major.version>1</java.major.version>
@@ -106,7 +106,7 @@
<min.required.maven.version>3.5.0</min.required.maven.version>
<groovy.version>3.0.11</groovy.version>
<bouncycastle.version>1.72</bouncycastle.version>
- <!-- NOTE: upgrading beyond this version causes
+ <!-- NOTE: upgrading slf4j beyond this version causes
Execution verify-style of goal org.apache.maven.plugins:maven-checkstyle-plugin:3.1.2:check failed.: NullPointerException
-->
@@ -114,7 +114,7 @@
<slf4j.upper.bound>3</slf4j.upper.bound>
<logback.version>1.2.11</logback.version>
<spring.version>5.3.20</spring.version>
- <!-- NOTE: upgrading to 6.x requires Java 11 -->
+ <!-- NOTE: upgrading jGit to 6.x requires Java 11 -->
<jgit.version>5.13.0.202109080827-r</jgit.version>
<junit.version>4.13.2</junit.version>
<bytebuddy.version>1.12.6</bytebuddy.version>
[mina-sshd] 02/03: Added warning about slf4j version upgrade
Posted by lg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lgoldstein pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 63b9770fc99078af061f70a4a6d6a12cf17e9d26
Author: Lyor Goldstein <lg...@apache.org>
AuthorDate: Tue Mar 21 20:15:33 2023 +0200
Added warning about slf4j version upgrade
---
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pom.xml b/pom.xml
index f622b8736..e3a0b855e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,10 @@
<min.required.maven.version>3.5.0</min.required.maven.version>
<groovy.version>3.0.11</groovy.version>
<bouncycastle.version>1.72</bouncycastle.version>
+ <!-- NOTE: upgrading beyond this version causes
+
+ Execution verify-style of goal org.apache.maven.plugins:maven-checkstyle-plugin:3.1.2:check failed.: NullPointerException
+ -->
<slf4j.version>1.7.32</slf4j.version>
<slf4j.upper.bound>3</slf4j.upper.bound>
<logback.version>1.2.11</logback.version>
[mina-sshd] 01/03: Replaced jdk15on Bouncycastle artifacts with jdk18on ones
Posted by lg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lgoldstein pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 57d2a6ce22cbab73e7d1aebdf8b1ed570368f82c
Author: Lyor Goldstein <lg...@apache.org>
AuthorDate: Sun Mar 19 20:34:01 2023 +0200
Replaced jdk15on Bouncycastle artifacts with jdk18on ones
---
assembly/pom.xml | 4 ++--
assembly/src/main/components/modules.xml | 2 ++
assembly/src/main/legal/notices.xml | 2 +-
pom.xml | 10 +++++-----
sshd-common/pom.xml | 4 ++--
sshd-core/pom.xml | 4 ++--
sshd-git/pom.xml | 4 ++--
sshd-openpgp/pom.xml | 11 +++++++++--
sshd-osgi/pom.xml | 4 ++--
sshd-putty/pom.xml | 4 ++--
10 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 796550137..ee8f931d0 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -114,11 +114,11 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk15on</artifactId>
+ <artifactId>bcpg-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
</dependency>
<!-- For ed25519 support -->
<dependency>
diff --git a/assembly/src/main/components/modules.xml b/assembly/src/main/components/modules.xml
index 471aed76a..e7cd907c9 100644
--- a/assembly/src/main/components/modules.xml
+++ b/assembly/src/main/components/modules.xml
@@ -31,6 +31,7 @@
<exclude>io.projectreactor:*</exclude>
<exclude>org.reactivestreams:*</exclude>
<exclude>commons-io:commons-io</exclude>
+ <exclude>org.bouncycastle:*</exclude>
<exclude>org.springframework.integration:*</exclude>
<exclude>org.eclipse.jgit:*</exclude>
<exclude>com.googlecode.javaewah:JavaEWAH</exclude>
@@ -62,6 +63,7 @@
<include>org.reactivestreams:*</include>
<include>commons-io:commons-io</include>
<include>com.googlecode.javaewah:JavaEWAH</include>
+ <include>org.bouncycastle:*</include>
<include>org.c02e.jpgpj:jpgpj</include>
</includes>
<outputDirectory>dependencies</outputDirectory>
diff --git a/assembly/src/main/legal/notices.xml b/assembly/src/main/legal/notices.xml
index f6c3fba46..56a566664 100644
--- a/assembly/src/main/legal/notices.xml
+++ b/assembly/src/main/legal/notices.xml
@@ -21,7 +21,7 @@
<supplement>
<project>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<name>Bouncy Castle Crypto APIs for Java</name>
<organization>
<name>The Legion of the Bouncy Castle</name>
diff --git a/pom.xml b/pom.xml
index 8b32f1006..f622b8736 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
<min.required.maven.version>3.5.0</min.required.maven.version>
<groovy.version>3.0.11</groovy.version>
- <bouncycastle.version>1.70</bouncycastle.version>
+ <bouncycastle.version>1.72</bouncycastle.version>
<slf4j.version>1.7.32</slf4j.version>
<slf4j.upper.bound>3</slf4j.upper.bound>
<logback.version>1.2.11</logback.version>
@@ -443,22 +443,22 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk15on</artifactId>
+ <artifactId>bcpg-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcutil-jdk15on</artifactId>
+ <artifactId>bcutil-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
diff --git a/sshd-common/pom.xml b/sshd-common/pom.xml
index 0c20efb69..3d8c5cac5 100644
--- a/sshd-common/pom.xml
+++ b/sshd-common/pom.xml
@@ -38,12 +38,12 @@
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk15on</artifactId>
+ <artifactId>bcpg-jdk18on</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<optional>true</optional>
</dependency>
diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
index c607f783f..e12dff06a 100644
--- a/sshd-core/pom.xml
+++ b/sshd-core/pom.xml
@@ -50,12 +50,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk15on</artifactId>
+ <artifactId>bcpg-jdk18on</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<optional>true</optional>
</dependency>
diff --git a/sshd-git/pom.xml b/sshd-git/pom.xml
index 11115001e..5cb4b7fad 100644
--- a/sshd-git/pom.xml
+++ b/sshd-git/pom.xml
@@ -88,12 +88,12 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk15on</artifactId>
+ <artifactId>bcpg-jdk18on</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/sshd-openpgp/pom.xml b/sshd-openpgp/pom.xml
index 7b2a3bbe2..d764e58bd 100644
--- a/sshd-openpgp/pom.xml
+++ b/sshd-openpgp/pom.xml
@@ -44,17 +44,24 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk15on</artifactId>
+ <artifactId>bcpg-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.c02e.jpgpj</groupId>
<artifactId>jpgpj</artifactId>
<version>1.3</version>
+ <exclusions>
+ <!-- Replaced by the jdk18on equivalent -->
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpg-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- test dependencies -->
diff --git a/sshd-osgi/pom.xml b/sshd-osgi/pom.xml
index feb3716aa..d68a21d88 100644
--- a/sshd-osgi/pom.xml
+++ b/sshd-osgi/pom.xml
@@ -52,13 +52,13 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk15on</artifactId>
+ <artifactId>bcpg-jdk18on</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
diff --git a/sshd-putty/pom.xml b/sshd-putty/pom.xml
index b79660bba..550009cd7 100644
--- a/sshd-putty/pom.xml
+++ b/sshd-putty/pom.xml
@@ -44,12 +44,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk15on</artifactId>
+ <artifactId>bcpg-jdk18on</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<optional>true</optional>
</dependency>