Fix notice year, update plugins

onyas · Nov 29, 2021 · 80e57cf · 80e57cf
1 parent f8069c6
commit 80e57cf
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 31 deletions.
diff --git a/NOTICE-bin.txt b/NOTICE-bin.txt
@@ -1,5 +1,5 @@
 Apache MINA SSHD
-Copyright 2008-2018 The Apache Software Foundation
+Copyright 2008-2021 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http:https://www.apache.org/).

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache MINA SSHD
-Copyright 2008-2018 The Apache Software Foundation
+Copyright 2008-2021 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http:https://www.apache.org/).

diff --git a/pom.xml b/pom.xml
@@ -83,7 +83,7 @@
  <properties>
  <projectRoot>${project.basedir}</projectRoot>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.outputTimestamp>2020-01-01T00:00:00Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2021-01-01T00:00:00Z</project.build.outputTimestamp>
 
  <!-- NOTE: actual value updated by gmavenplus-plugin on initialization phase -->
  <!-- workspace.root.dir>${project.basedir}</workspace.root.dir -->
@@ -780,15 +780,15 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
+ <version>3.0.0-M4</version>
  <configuration>
  <autoVersionSubmodules>true</autoVersionSubmodules>
  </configuration>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-gpg-plugin</artifactId>
- <version>1.6</version>
+ <version>3.0.1</version>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
@@ -824,12 +824,12 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
+ <version>3.0.0-M1</version>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
  <configuration>
  <additionalOptions>-Xdoclint:-missing</additionalOptions>
  <encoding>${project.build.sourceEncoding}</encoding>
@@ -854,7 +854,7 @@
  <plugin>
  <groupId>org.codehaus.gmavenplus</groupId>
  <artifactId>gmavenplus-plugin</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0</version>
  <dependencies>
  <!-- referenced indirectly by groovy-ant -->
  <dependency>
@@ -1022,7 +1022,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-pmd-plugin</artifactId>
- <version>3.14.0</version>
+ <version>3.15.0</version>
  <configuration>
  <targetJdk>${javac.target}</targetJdk>
  <printFailingErrors>true</printFailingErrors>
@@ -1068,7 +1068,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.2.0</version>
  <dependencies>
  <dependency>
  <groupId>org.codehaus.plexus</groupId>
@@ -1103,7 +1103,7 @@
  <plugin>
  <groupId>net.revelc.code.formatter</groupId>
  <artifactId>formatter-maven-plugin</artifactId>
- <version>2.14.0</version>
+ <version>2.17.0</version>
  <configuration>
  <skipXmlFormatting>true</skipXmlFormatting>
  <skipHtmlFormatting>true</skipHtmlFormatting>
@@ -1116,7 +1116,7 @@
  <plugin>
  <groupId>net.revelc.code</groupId>
  <artifactId>impsort-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>1.6.2</version>
  <configuration>
  <lineEnding>LF</lineEnding>
  <groups>java.,javax.,org.w3c.,org.xml.,junit.</groups>
@@ -1125,6 +1125,11 @@
  <staticGroups>java.,javax.,org.w3c.,org.xml.,junit.</staticGroups>
  </configuration>
  </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin.version}</version>
+ </plugin>
  </plugins>
  </pluginManagement>
 
@@ -1251,30 +1256,30 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version>
+ <version>3.0.0</version>
  <executions>
  <execution>
- <id>enforce-versions</id>
+ <id>enforce-maven-version</id>
  <goals>
  <goal>enforce</goal>
  </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>${min.required.maven.version}</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>${required.java.version}</version>
+ </requireJavaVersion>
+ <requireReleaseDeps>
+ <onlyWhenRelease>true</onlyWhenRelease>
+ <message>No Snapshot Dependencies Allowed</message>
+ </requireReleaseDeps>
+ <dependencyConvergence />
+ </rules>
+ </configuration>
  </execution>
  </executions>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[${min.required.maven.version},)</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>${required.java.version}</version>
- </requireJavaVersion>
- <requireReleaseDeps>
- <onlyWhenRelease>true</onlyWhenRelease>
- <message>No Snapshot Dependencies Allowed</message>
- </requireReleaseDeps>
- <dependencyConvergence />
- </rules>
- </configuration>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
@@ -1410,7 +1415,7 @@
  <plugin>
  <groupId>org.apache.felix</groupId>
  <artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.1</version>
+ <version>5.1.2</version>
  <inherited>true</inherited>
  <extensions>true</extensions>
  <executions>
@@ -1551,7 +1556,7 @@
  <plugin> <!-- used by PMD to create a source XREF -->
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-jxr-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.1</version>
  </plugin>
  </plugins>
  </reporting>

diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
@@ -219,6 +219,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
  <executions>
  <execution>
  <id>jce</id>
@@ -252,6 +253,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
  <configuration>
  <excludes>
  <exclude>foo</exclude>
@@ -275,6 +277,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
  <configuration>
  <excludedGroups>org.apache.sshd.util.test.ContainerTestCase</excludedGroups>
  </configuration>

diff --git a/sshd-git/pom.xml b/sshd-git/pom.xml
@@ -48,6 +48,16 @@
  <groupId>org.eclipse.jgit</groupId>
  <artifactId>org.eclipse.jgit.pgm</artifactId>
  <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-osgi</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
 
  <!-- Test dependencies -->
@@ -141,6 +151,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
  <executions>
  <execution>
  <id>mina</id>
@@ -184,6 +195,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
  <executions>
  <execution>
  <id>netty</id>

diff --git a/sshd-scp/pom.xml b/sshd-scp/pom.xml
@@ -126,6 +126,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
  <executions>
  <execution>
  <id>mina</id>
@@ -169,6 +170,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
  <executions>
  <execution>
  <id>netty</id>

diff --git a/sshd-sftp/pom.xml b/sshd-sftp/pom.xml
@@ -150,6 +150,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
  <executions>
  <execution>
  <id>mina</id>
@@ -193,6 +194,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
  <executions>
  <execution>
  <id>netty</id>