You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/11/29 21:45:42 UTC
[commons-net] branch master updated: Format to line length 120.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
The following commit(s) were added to refs/heads/master by this push:
new 74eb5e0 Format to line length 120.
74eb5e0 is described below
commit 74eb5e0d24114f031b3f02f8ec1d7fe471819665
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Nov 29 16:45:38 2020 -0500
Format to line length 120.
---
pom.xml | 274 ++++++++++++++++++++++++++++++++--------------------------------
1 file changed, 138 insertions(+), 136 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1f4732c..5719e76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,8 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.commons</groupId>
@@ -30,9 +31,8 @@
<artifactId>commons-net</artifactId>
<version>3.7.3-SNAPSHOT</version>
<name>Apache Commons Net</name>
- <!-- N.B. the description content is deliberately not indented
- ! to improve the layout of the Release Notes generated by mvn changes:announcement-generate
- -->
+ <!-- N.B. the description content is deliberately not indented ! to improve the layout of the Release Notes generated
+ by mvn changes:announcement-generate -->
<description>
Apache Commons Net library contains a collection of network utilities and protocol implementations.
Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Telnet, Whois
@@ -56,12 +56,13 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
<!-- Current release -->
<commons.release.version>3.7.3</commons.release.version>
<commons.rc.version>RC1</commons.rc.version>
- <commons.release.desc>(Requires Java ${maven.compiler.target} or later)</commons.release.desc>
+ <commons.release.desc>(Requires Java ${maven.compiler.target} or
+ later)</commons.release.desc>
<!-- Release plugin defines -->
<commons.bc.version>3.7.2</commons.bc.version>
<commons.release.isDistModule>true</commons.release.isDistModule>
- <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
+ <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
<commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
<!-- Local version defines -->
<commons.changes.onlyCurrentVersion>true</commons.changes.onlyCurrentVersion>
@@ -78,11 +79,11 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
</issueManagement>
<distributionManagement>
- <site>
- <id>apache.website</id>
- <name>Apache Commons Site</name>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-net/</url>
- </site>
+ <site>
+ <id>apache.website</id>
+ <name>Apache Commons Site</name>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-net/</url>
+ </site>
</distributionManagement>
<dependencies>
@@ -92,52 +93,52 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
<version>4.13.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-core</artifactId>
+ <dependency>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftpserver-core</artifactId>
<version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <!-- Sigh, Net is on Java 7, IO 2.7 and up require Java 8. -->
- <!-- <version>2.8.0</version> -->
- <version>2.6</version>
- <scope>test</scope>
- </dependency>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <!-- Sigh, Net is on Java 7, IO 2.7 and up require Java 8. -->
+ <!-- <version>2.8.0</version> -->
+ <version>2.6</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<defaultGoal>clean apache-rat:check javadoc:javadoc checkstyle:check clirr:check package</defaultGoal>
<pluginManagement>
- <plugins>
- <!-- Allow CLI usage -->
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>${commons.spotbugs.version}</version>
- <configuration>
- <excludeFilterFile>findbugs-exclude-filter.xml</excludeFilterFile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${commons.compiler.version}</version>
- <configuration>
- <!-- Fix incremental compiler bug, see https://issues.apache.org/jira/browse/MCOMPILER-205 etc. -->
- <excludes>
- <exclude>**/package-info.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${commons.checkstyle-plugin.version}</version>
- </plugin>
- </plugins>
+ <plugins>
+ <!-- Allow CLI usage -->
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${commons.spotbugs.version}</version>
+ <configuration>
+ <excludeFilterFile>findbugs-exclude-filter.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${commons.compiler.version}</version>
+ <configuration>
+ <!-- Fix incremental compiler bug, see https://issues.apache.org/jira/browse/MCOMPILER-205 etc. -->
+ <excludes>
+ <exclude>**/package-info.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${commons.checkstyle-plugin.version}</version>
+ </plugin>
+ </plugins>
</pluginManagement>
<plugins>
@@ -203,35 +204,42 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
<attribute name="Extension-Name" value="org.apache.commons.net" />
<attribute name="Specification-Title" value="${project.name}" />
<attribute name="Implementation-Title" value="${project.name}" />
- <attribute name="Implementation-Vendor" value="${project.organization.name}" />
+ <attribute name="Implementation-Vendor"
+ value="${project.organization.name}" />
<attribute name="Implementation-Version" value="${project.version}" />
<attribute name="Implementation-Vendor-Id" value="org.apache" />
- <attribute name="Implementation-Build" value="${implementation.build}"/>
- <attribute name="X-Compile-Source-JDK" value="${maven.compiler.source}" />
- <attribute name="X-Compile-Target-JDK" value="${maven.compiler.target}" />
+ <attribute name="Implementation-Build" value="${implementation.build}" />
+ <attribute name="X-Compile-Source-JDK"
+ value="${maven.compiler.source}" />
+ <attribute name="X-Compile-Target-JDK"
+ value="${maven.compiler.target}" />
</manifest>
- <fileset dir="target/classes" includes="org/apache/commons/net/ftp/**,org/apache/commons/net/*,org/apache/commons/net/io/*,org/apache/commons/net/util/*" />
+ <fileset dir="target/classes"
+ includes="org/apache/commons/net/ftp/**,org/apache/commons/net/*,org/apache/commons/net/io/*,org/apache/commons/net/util/*" />
</jar>
- <!--
- Create the binary examples jar, which will be added to the binary zip/tgz,
- but not deployed independently to Maven
- -->
+ <!-- Create the binary examples jar, which will be added to the binary zip/tgz, but not deployed
+ independently to Maven -->
<jar destfile="target/commons-net-examples-${project.version}.jar">
<metainf dir="${basedir}" includes="NOTICE.txt,LICENSE.txt" />
<manifest>
<attribute name="Extension-Name" value="org.apache.commons.net" />
<attribute name="Specification-Title" value="${project.name}" />
<attribute name="Implementation-Title" value="${project.name}" />
- <attribute name="Implementation-Vendor" value="${project.organization.name}" />
+ <attribute name="Implementation-Vendor"
+ value="${project.organization.name}" />
<attribute name="Implementation-Version" value="${project.version}" />
<attribute name="Implementation-Vendor-Id" value="org.apache" />
- <attribute name="Implementation-Build" value="${implementation.build}"/>
- <attribute name="X-Compile-Source-JDK" value="${maven.compiler.source}" />
- <attribute name="X-Compile-Target-JDK" value="${maven.compiler.target}" />
+ <attribute name="Implementation-Build" value="${implementation.build}" />
+ <attribute name="X-Compile-Source-JDK"
+ value="${maven.compiler.source}" />
+ <attribute name="X-Compile-Target-JDK"
+ value="${maven.compiler.target}" />
<!-- Helper application -->
- <attribute name="Main-Class" value="org/apache/commons/net/examples/Main" />
+ <attribute name="Main-Class"
+ value="org/apache/commons/net/examples/Main" />
<!-- Allow java -jar examples.jar to work -->
- <attribute name="Class-Path" value="commons-net-${project.version}.jar" />
+ <attribute name="Class-Path"
+ value="commons-net-${project.version}.jar" />
</manifest>
<fileset dir="target/classes" includes="**/examples/**" />
</jar>
@@ -243,8 +251,8 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
</execution>
</executions>
</plugin>
- <!-- Attaches the commons-net-ftp and examples JARs to the Maven lifecycle
- to ensure they will be signed and deployed as normal -->
+ <!-- Attaches the commons-net-ftp and examples JARs to the Maven lifecycle to ensure they will be signed and
+ deployed as normal -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -284,71 +292,66 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
<!-- Copy the examples sources -->
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>pre-site</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/site/examples</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/java/org/apache/commons/net/examples</directory>
- <excludes>
- <exclude>**/Main.java</exclude>
- </excludes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/site/examples</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java/org/apache/commons/net/examples</directory>
+ <excludes>
+ <exclude>**/Main.java</exclude>
+ </excludes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <ignorePathsToDelete>
+ <ignorePathToDelete>javadocs</ignorePathToDelete>
+ </ignorePathsToDelete>
+ </configuration>
+ </plugin>
+
+ <!-- drop examples from CLI invocations -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/examples/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <!-- Allow exec:java to launch examples from the classpath For example: mvn -q exec:java -Dexec.arguments=FTPClientExample,-A,-l,hostname -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.apache.commons.net.examples.Main</mainClass>
+ </configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <ignorePathsToDelete>
- <ignorePathToDelete>javadocs</ignorePathToDelete>
- </ignorePathsToDelete>
- </configuration>
- </plugin>
-
- <!-- drop examples from CLI invocations -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/examples/**</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <!--
- Allow exec:java to launch examples from the classpath
- For example:
-
- mvn -q exec:java -Dexec.arguments=FTPClientExample,-A,-l,hostname
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>org.apache.commons.net.examples.Main</mainClass>
- </configuration>
- </plugin>
<!-- Allow checkstyle use from command line -->
<plugin>
@@ -384,7 +387,7 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
<artifactId>clirr-maven-plugin</artifactId>
<configuration>
<excludes>
- <exclude>**/examples/**</exclude>
+ <exclude>**/examples/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -437,8 +440,7 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
<id>dfs</id>
<email>dfs@apache.org</email>
<organization>
- <a href="http://www.savarese.com/">Savarese Software Research</a>
- </organization>
+ <a href="http://www.savarese.com/">Savarese Software Research</a> </organization>
</developer>
<developer>
<name>Rory Winston</name>
@@ -504,7 +506,7 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
<contributor>
<name>Jason Mathews</name>
<organization>MITRE Corp</organization>
- </contributor>
+ </contributor>
<contributor>
<name>Winston Ojeda</name>
<email>Winston.Ojeda@qg.com</email>