Repository: mina-sshd Updated Branches: refs/heads/master 3c6bfab46 -> 3d614500b
Fix some build warnings Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/4da85a78 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/4da85a78 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/4da85a78 Branch: refs/heads/master Commit: 4da85a7895e4a2a854388cfd1da8a5a7cac07822 Parents: 3c6bfab Author: Guillaume Nodet <[email protected]> Authored: Mon May 28 13:58:02 2018 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Mon May 28 13:58:02 2018 +0200 ---------------------------------------------------------------------- pom.xml | 213 +++++++++++++++++++++++++++--------------------- sshd-core/pom.xml | 1 + sshd-git/pom.xml | 1 + sshd-mina/pom.xml | 2 + sshd-netty/pom.xml | 2 + sshd-scp/pom.xml | 1 + sshd-sftp/pom.xml | 1 + 7 files changed, 128 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4da85a78/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1198af7..0fef5e6 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,8 @@ <maven.compiler.source>${javac.source}</maven.compiler.source> <ant.version>1.10.3</ant.version> <ant.build.javac.source>${javac.source}</ant.build.javac.source> + <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version> + <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version> <javac.target>${javac.source}</javac.target> <project.build.java.target>${javac.target}</project.build.java.target> @@ -133,6 +135,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> + <version>3.0.5</version> <configuration> <xmlOutput>true</xmlOutput> <fork>false</fork> @@ -182,6 +185,102 @@ </plugins> </build> </profile> + <profile> + <id>only-eclipse</id> + <activation> + <property> + <name>m2e.version</name> + </property> + </activation> + <build> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse + m2e settings only and overcome integration problems. + It has no influence on the Maven build itself. --> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>copy</goal> + <goal>copy-dependencies</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>compile</goal> + <goal>execute</goal> + <goal>testCompile</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <versionRange>[0.1,)</versionRange> + <goals> + <goal>check</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>check</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>manifest</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute /> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> </profiles> <dependencyManagement> @@ -367,88 +466,6 @@ <build> <pluginManagement> <plugins> - <!--This plugin's configuration is used to store Eclipse - m2e settings only and overcome integration problems. - It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <versionRange>[1.0,)</versionRange> - <goals> - <goal>copy</goal> - <goal>copy-dependencies</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> - <versionRange>[1.0,)</versionRange> - <goals> - <goal>compile</goal> - <goal>execute</goal> - <goal>testCompile</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <versionRange>[0.1,)</versionRange> - <goals> - <goal>check</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <versionRange>[1.0,)</versionRange> - <goals> - <goal>check</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <versionRange>[1.0,)</versionRange> - <goals> - <goal>manifest</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> @@ -515,12 +532,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>3.0.0</version> + <version>3.1.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -530,7 +547,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> + <version>3.0.0</version> </plugin> <plugin> <groupId>org.codehaus.gmaven</groupId> @@ -614,7 +631,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>3.0.4</version> + <version>3.0.5F</version> <!-- see https://www.petrikainulainen.net/programming/maven/findbugs-maven-plugin-tutorial/ --> <configuration> <effort>Max</effort> @@ -704,6 +721,16 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.1.1</version> + </plugin> </plugins> </pluginManagement> @@ -798,7 +825,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> + <version>3.0.0-M1</version> <executions> <execution> <id>enforce-versions</id> @@ -900,7 +927,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>3.2.0</version> + <version>3.5.0</version> <inherited>true</inherited> <extensions>true</extensions> <executions> @@ -921,7 +948,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.0.2</version> + <version>3.1.0</version> <inherited>true</inherited> <configuration> <archive> @@ -970,9 +997,9 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> + <version>${build-helper-maven-plugin.version}</version> + <executions> + <execution> <id>remove-previous-artifact</id> <phase>clean</phase> <goals> @@ -981,7 +1008,7 @@ <configuration> <removeAll>false</removeAll> </configuration> - </execution> + </execution> </executions> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4da85a78/sshd-core/pom.xml ---------------------------------------------------------------------- diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml index cf1c40f..510c551 100644 --- a/sshd-core/pom.xml +++ b/sshd-core/pom.xml @@ -153,6 +153,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <reportsDirectory>${project.build.directory}/surefire-reports-nio2</reportsDirectory> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4da85a78/sshd-git/pom.xml ---------------------------------------------------------------------- diff --git a/sshd-git/pom.xml b/sshd-git/pom.xml index 09449d6..d1e1e41 100644 --- a/sshd-git/pom.xml +++ b/sshd-git/pom.xml @@ -109,6 +109,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <reportsDirectory>${project.build.directory}/surefire-reports-nio2</reportsDirectory> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4da85a78/sshd-mina/pom.xml ---------------------------------------------------------------------- diff --git a/sshd-mina/pom.xml b/sshd-mina/pom.xml index 88df02a..22d29b8 100644 --- a/sshd-mina/pom.xml +++ b/sshd-mina/pom.xml @@ -118,6 +118,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> + <version>${build-helper-maven-plugin.version}</version> <executions> <execution> <id>add-test-source</id> @@ -151,6 +152,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <reportsDirectory>${project.build.directory}/surefire-reports-mina</reportsDirectory> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4da85a78/sshd-netty/pom.xml ---------------------------------------------------------------------- diff --git a/sshd-netty/pom.xml b/sshd-netty/pom.xml index 264a75c..3a893a7 100644 --- a/sshd-netty/pom.xml +++ b/sshd-netty/pom.xml @@ -125,6 +125,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> + <version>${build-helper-maven-plugin.version}</version> <executions> <execution> <id>add-test-source</id> @@ -169,6 +170,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <reportsDirectory>${project.build.directory}/surefire-reports-netty</reportsDirectory> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4da85a78/sshd-scp/pom.xml ---------------------------------------------------------------------- diff --git a/sshd-scp/pom.xml b/sshd-scp/pom.xml index 2af3446..58eee40 100644 --- a/sshd-scp/pom.xml +++ b/sshd-scp/pom.xml @@ -99,6 +99,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <reportsDirectory>${project.build.directory}/surefire-reports-nio2</reportsDirectory> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4da85a78/sshd-sftp/pom.xml ---------------------------------------------------------------------- diff --git a/sshd-sftp/pom.xml b/sshd-sftp/pom.xml index 2d5cd0f..d57b6b7 100644 --- a/sshd-sftp/pom.xml +++ b/sshd-sftp/pom.xml @@ -94,6 +94,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <reportsDirectory>${project.build.directory}/surefire-reports-nio2</reportsDirectory>
