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 2018/10/29 07:35:53 UTC
[1/6] mina-sshd git commit: Updated transitive dependecies on Maven
and Plexus archivers
Repository: mina-sshd
Updated Branches:
refs/heads/master ec8ebfb6e -> 32e1877d0
Updated transitive dependecies on Maven and Plexus archivers
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/8f7b485b
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/8f7b485b
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/8f7b485b
Branch: refs/heads/master
Commit: 8f7b485b6d0361a70975701878a2a89dbbcfbdca
Parents: fa78112
Author: Lyor Goldstein <lg...@apache.org>
Authored: Mon Oct 29 08:24:58 2018 +0200
Committer: Lyor Goldstein <lg...@apache.org>
Committed: Mon Oct 29 09:35:46 2018 +0200
----------------------------------------------------------------------
pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 51 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/8f7b485b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ef5cb4e..2cb0235 100644
--- a/pom.xml
+++ b/pom.xml
@@ -663,6 +663,18 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>${maven.archiver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>${plexus.archiver.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -686,6 +698,18 @@
<configuration>
<additionalOptions>-Xdoclint:none </additionalOptions>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>${maven.archiver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>${plexus.archiver.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
@@ -868,6 +892,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>${plexus.archiver.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
@@ -1048,7 +1079,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.2</version>
<executions>
<execution>
<id>install</id>
@@ -1100,6 +1130,15 @@
</execution>
</executions>
</plugin>
+ <!-- NOTE: do not upgrade maven or plexus-archiver plugin
+ dependency for this plugin in order to avoid
+
+ Execution unix-bin of goal org.apache.maven.plugins:maven-assembly-plugin:3.1.0:single failed:
+ An API incompatibility was encountered while executing org.apache.maven.plugins:maven-assembly-plugin:3.1.0:single:
+ java.lang.AbstractMethodError:
+ org.apache.maven.plugins.assembly.archive.archiver.PrefixedFileSet.getFileMappers()
+ [Lorg/codehaus/plexus/components/io/filemappers/FileMapper;
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -1131,6 +1170,17 @@
</configuration>
</execution>
</executions>
+ <!-- NOTE: do not upgrade maven-archiver plugin
+ dependency for this plugin in order to avoid
+
+ Execution bundle-manifest of goal org.apache.felix:maven-bundle-plugin:4.0.0:manifest failed:
+ An API incompatibility was encountered while executing org.apache.felix:maven-bundle-plugin:4.0.0:manifest:
+ java.lang.NoSuchMethodError:
+ org.apache.maven.archiver.MavenArchiver.getManifest(
+ Lorg/apache/maven/project/MavenProject;
+ Lorg/apache/maven/archiver/MavenArchiveConfiguration;)
+ Lorg/codehaus/plexus/archiver/jar/Manifest;
+ -->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[3/6] mina-sshd git commit: Upgraded ByteBuddy version to 1.9.3
Posted by lg...@apache.org.
Upgraded ByteBuddy version to 1.9.3
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/a5ac9e91
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/a5ac9e91
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/a5ac9e91
Branch: refs/heads/master
Commit: a5ac9e91c08ddd8dd1c1ec14f5be744048035413
Parents: ec8ebfb
Author: Lyor Goldstein <lg...@apache.org>
Authored: Mon Oct 29 08:05:45 2018 +0200
Committer: Lyor Goldstein <lg...@apache.org>
Committed: Mon Oct 29 09:35:46 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/a5ac9e91/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d993f0e..a0649f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<spring.version>5.1.1.RELEASE</spring.version>
<jgit.version>5.1.3.201810200350-r</jgit.version>
<junit.version>4.12</junit.version>
- <bytebuddy.version>1.9.2</bytebuddy.version>
+ <bytebuddy.version>1.9.3</bytebuddy.version>
<surefire.plugin.version>2.22.1</surefire.plugin.version>
<maven.archiver.version>3.2.0</maven.archiver.version>
[6/6] mina-sshd git commit: Upgraded used Groovy version to 2.5.3
Posted by lg...@apache.org.
Upgraded used Groovy version to 2.5.3
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/32e1877d
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/32e1877d
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/32e1877d
Branch: refs/heads/master
Commit: 32e1877d090cb0f37172d44eabbd110ee9cb325a
Parents: 8f7b485
Author: Lyor Goldstein <lg...@apache.org>
Authored: Mon Oct 29 09:34:38 2018 +0200
Committer: Lyor Goldstein <lg...@apache.org>
Committed: Mon Oct 29 09:35:47 2018 +0200
----------------------------------------------------------------------
pom.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 46 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/32e1877d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2cb0235..d5c5180 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,8 +104,8 @@
<min.required.maven.version>3.5.0</min.required.maven.version>
<gmaven.plugin.version>2.1</gmaven.plugin.version>
<groovy.major.version>2</groovy.major.version>
- <groovy.minor.version>4</groovy.minor.version>
- <groovy.release.version>15</groovy.release.version>
+ <groovy.minor.version>5</groovy.minor.version>
+ <groovy.release.version>3</groovy.release.version>
<groovy.compliance.level>2.0</groovy.compliance.level>
<groovy.version>${groovy.major.version}.${groovy.minor.version}.${groovy.release.version}</groovy.version>
@@ -367,9 +367,21 @@
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy.version}</version>
+ <exclusions>
+ <exclusion> <!-- replaced by ant-junit4 -->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE
Upgrading it beyond 2.0.19 causes problems for the sshd-ldap
@@ -716,12 +728,7 @@
<artifactId>groovy-maven-plugin</artifactId>
<version>${gmaven.plugin.version}</version>
<dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- <!-- referenced indirectly by groovy-all -->
+ <!-- referenced indirectly by groovy-ant -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
@@ -738,10 +745,32 @@
<version>${ant.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-antlr</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy.version}</version>
+ <exclusions>
+ <exclusion> <!-- replaced by ant-junit4 -->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</plugin>
<plugin>
@@ -813,9 +842,9 @@
<artifactId>ant</artifactId>
<version>${ant.version}</version>
</dependency>
- <dependency>
+ <dependency> <!-- replace ant-junit artifact -->
<groupId>org.apache.ant</groupId>
- <artifactId>ant-junit</artifactId>
+ <artifactId>ant-junit4</artifactId>
<version>${ant.version}</version>
</dependency>
<dependency>
@@ -853,6 +882,12 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-ant</artifactId>
<version>${groovy.version}</version>
+ <exclusions>
+ <exclusion> <!-- replaced by ant-junit4 -->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</plugin>
[5/6] mina-sshd git commit: Upgraded PMD core version to 6.9.0
Posted by lg...@apache.org.
Upgraded PMD core version to 6.9.0
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/cbe352d2
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/cbe352d2
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/cbe352d2
Branch: refs/heads/master
Commit: cbe352d27ce770ee373bf604eb9ceba06576e304
Parents: 1a1c1f4
Author: Lyor Goldstein <lg...@apache.org>
Authored: Mon Oct 29 08:06:50 2018 +0200
Committer: Lyor Goldstein <lg...@apache.org>
Committed: Mon Oct 29 09:35:46 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
sshd-pmd-ruleset.xml | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/cbe352d2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 616e00f..e3dff04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
<maven.archiver.version>3.2.0</maven.archiver.version>
<plexus.archiver.version>3.7.0</plexus.archiver.version>
<!-- See https://pmd.github.io/ for available latest version -->
- <pmd.version>6.8.0</pmd.version>
+ <pmd.version>6.9.0</pmd.version>
</properties>
<profiles>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/cbe352d2/sshd-pmd-ruleset.xml
----------------------------------------------------------------------
diff --git a/sshd-pmd-ruleset.xml b/sshd-pmd-ruleset.xml
index 30cdfea..ea08f8b 100644
--- a/sshd-pmd-ruleset.xml
+++ b/sshd-pmd-ruleset.xml
@@ -37,10 +37,6 @@
<rule ref="category/java/codestyle.xml/AtLeastOneConstructor" />
<rule ref="category/java/codestyle.xml/ExtendsObject" />
<rule ref="category/java/codestyle.xml/BooleanGetMethodName" />
- <rule ref="category/java/codestyle.xml/ForLoopsMustUseBraces" />
- <rule ref="category/java/codestyle.xml/IfElseStmtsMustUseBraces" />
- <rule ref="category/java/codestyle.xml/IfStmtsMustUseBraces" />
- <rule ref="category/java/codestyle.xml/WhileLoopsMustUseBraces" />
<rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts">
<properties>
[4/6] mina-sshd git commit: Upgraded OWASP dependency check plugin
version to 3.3.3
Posted by lg...@apache.org.
Upgraded OWASP dependency check plugin version to 3.3.3
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/1a1c1f4a
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/1a1c1f4a
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/1a1c1f4a
Branch: refs/heads/master
Commit: 1a1c1f4a50884683aa9c8084bd5c7427e59973e0
Parents: a5ac9e9
Author: Lyor Goldstein <lg...@apache.org>
Authored: Mon Oct 29 08:06:17 2018 +0200
Committer: Lyor Goldstein <lg...@apache.org>
Committed: Mon Oct 29 09:35:46 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/1a1c1f4a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a0649f2..616e00f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,7 +177,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>3.3.2</version>
+ <version>3.3.3</version>
<!-- see https://jeremylong.github.io/DependencyCheck/dependency-check-maven/configuration.html -->
<configuration>
<!-- see https://github.com/jeremylong/DependencyCheck/issues/1394 -->
[2/6] mina-sshd git commit: Upgraded PMD Maven plugin version to
3.11.0
Posted by lg...@apache.org.
Upgraded PMD Maven plugin version to 3.11.0
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/fa781121
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/fa781121
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/fa781121
Branch: refs/heads/master
Commit: fa781121e65c883d2538c1b4db6d08d172b79a82
Parents: cbe352d
Author: Lyor Goldstein <lg...@apache.org>
Authored: Mon Oct 29 08:07:24 2018 +0200
Committer: Lyor Goldstein <lg...@apache.org>
Committed: Mon Oct 29 09:35:46 2018 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/fa781121/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e3dff04..ef5cb4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -835,7 +835,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.10.0</version>
+ <version>3.11.0</version>
<configuration>
<targetJdk>${javac.target}</targetJdk>
<printFailingErrors>true</printFailingErrors>