From a621bcbccece69fcbb18aba496d6fb8830609e6f Mon Sep 17 00:00:00 2001 From: VGR Date: Wed, 12 Dec 2018 19:02:57 -0500 Subject: [PATCH] Based on feedback, added self to contributors, added line to WHATSNEW, added Ant version to docs, and replaced GPL man pages with BSD-licensed man pages. --- CONTRIBUTORS | 1 + WHATSNEW | 2 + contributors.xml | 4 + manual/Tasks/jmod.html | 2 + manual/Tasks/link.html | 2 + src/etc/testcases/taskdefs/jmod.xml | 785 ++++++++++++++---- src/etc/testcases/taskdefs/link.xml | 308 +++++-- .../tools/ant/taskdefs/modules/Jmod.java | 2 + .../tools/ant/taskdefs/modules/Link.java | 2 + .../ant/taskdefs/modules/package-info.java | 2 + .../apache/tools/ant/types/ModuleVersion.java | 2 + 11 files changed, 864 insertions(+), 248 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c6338ef7c..c9a3f0897 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -76,6 +76,7 @@ Costin Manolache Craeg Strong Craig Cottingham Craig R. McClanahan +Craig Pell Craig Richardson Craig Ryan Craig Sandvik diff --git a/WHATSNEW b/WHATSNEW index d07846d90..e67b25663 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -82,6 +82,8 @@ Other changes: loading resources at runtime in Java 9+ runtime environments. Bugzilla Report 62952 + * Added jmod and link tasks, to support jmod and jlink tools of JDK 9+. + Changes from Ant 1.10.4 TO Ant 1.10.5 ===================================== diff --git a/contributors.xml b/contributors.xml index c56bd2454..960f2db6f 100644 --- a/contributors.xml +++ b/contributors.xml @@ -329,6 +329,10 @@ Craig Cottingham + + Craig + Pell + Craig R. diff --git a/manual/Tasks/jmod.html b/manual/Tasks/jmod.html index 0540918b0..5c8e09d36 100644 --- a/manual/Tasks/jmod.html +++ b/manual/Tasks/jmod.html @@ -25,6 +25,8 @@

Jmod

+

Since Apache Ant 1.10.6

+

Description

Creates a linkable jmod file from a modular jar file, and optionally from other application files such as native libraries and license documents. diff --git a/manual/Tasks/link.html b/manual/Tasks/link.html index 078acc172..59646cbe0 100644 --- a/manual/Tasks/link.html +++ b/manual/Tasks/link.html @@ -25,6 +25,8 @@

+

Since Apache Ant 1.10.6

+

Description

Assembles jmod files into an executable image. Equivalent to the JDK's jlink diff --git a/src/etc/testcases/taskdefs/jmod.xml b/src/etc/testcases/taskdefs/jmod.xml index 2a22998cb..614304067 100644 --- a/src/etc/testcases/taskdefs/jmod.xml +++ b/src/etc/testcases/taskdefs/jmod.xml @@ -642,43 +642,134 @@ limitations under the License. -.br -Report true translation bugs to -.SH COPYRIGHT -Copyright \(co 2016 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later . -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. +--> +.PP +\fBchsh\fR(1), +\fBlogin.defs\fR(5), +\fBpasswd\fR(5)\&. ]]> @@ -692,43 +783,124 @@ Full documentation at: -.br -Report false translation bugs to -.SH COPYRIGHT -Copyright \(co 2016 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later . -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. +--> +.PP +\fBvi\fR(1), +\fBgroup\fR(5), +\fBgshadow\fR(5) +, +\fBpasswd\fR(5), , +\fBshadow\fR(5)\&. ]]> @@ -747,43 +919,124 @@ Full documentation at: -.br -Report false translation bugs to -.SH COPYRIGHT -Copyright \(co 2016 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later . -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. +--> +.PP +\fBvi\fR(1), +\fBgroup\fR(5), +\fBgshadow\fR(5) +, +\fBpasswd\fR(5), , +\fBshadow\fR(5)\&. ]]> @@ -804,83 +1057,255 @@ Full documentation at: -.br -Report true translation bugs to -.SH COPYRIGHT -Copyright \(co 2016 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later . -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. +--> +.PP +\fBchsh\fR(1), +\fBlogin.defs\fR(5), +\fBpasswd\fR(5)\&. ]]> -.br -Report false translation bugs to -.SH COPYRIGHT -Copyright \(co 2016 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later . -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. +--> +.PP +\fBvi\fR(1), +\fBgroup\fR(5), +\fBgshadow\fR(5) +, +\fBpasswd\fR(5), , +\fBshadow\fR(5)\&. ]]> diff --git a/src/etc/testcases/taskdefs/link.xml b/src/etc/testcases/taskdefs/link.xml index 321247556..e31659efd 100644 --- a/src/etc/testcases/taskdefs/link.xml +++ b/src/etc/testcases/taskdefs/link.xml @@ -171,84 +171,256 @@ module ${smile.mod} { -.br -Report true translation bugs to -.SH COPYRIGHT -Copyright \(co 2016 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later . -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. +These fields must not contain any colons\&. Except for the +\fIother\fR +field, they should not contain any comma or equal sign\&. It is also recommended to avoid non\-US\-ASCII characters, but this is only enforced for the phone numbers\&. The +\fIother\fR +field is used to store accounting information used by other applications\&. +.SH "OPTIONS" +.PP +The options which apply to the +\fBchfn\fR +command are: +.PP +\fB\-f\fR, \fB\-\-full\-name\fR\ \&\fIFULL_NAME\fR +.RS 4 +Change the user\*(Aqs full name\&. +.RE +.PP +\fB\-h\fR, \fB\-\-home\-phone\fR\ \&\fIHOME_PHONE\fR +.RS 4 +Change the user\*(Aqs home phone number\&. +.RE +.PP +\fB\-o\fR, \fB\-\-other\fR\ \&\fIOTHER\fR +.RS 4 +Change the user\*(Aqs other GECOS information\&. This field is used to store accounting information used by other applications, and can be changed only by a superuser\&. +.RE +.PP +\fB\-r\fR, \fB\-\-room\fR\ \&\fIROOM_NUMBER\fR +.RS 4 +Change the user\*(Aqs room number\&. +.RE +.PP +\fB\-R\fR, \fB\-\-root\fR\ \&\fICHROOT_DIR\fR +.RS 4 +Apply changes in the +\fICHROOT_DIR\fR +directory and use the configuration files from the +\fICHROOT_DIR\fR +directory\&. +.RE +.PP +\fB\-u\fR, \fB\-\-help\fR +.RS 4 +Display help message and exit\&. +.RE +.PP +\fB\-w\fR, \fB\-\-work\-phone\fR\ \&\fIWORK_PHONE\fR +.RS 4 +Change the user\*(Aqs office phone number\&. +.RE +.PP +If none of the options are selected, +\fBchfn\fR +operates in an interactive fashion, prompting the user with the current values for all of the fields\&. Enter the new value to change the field, or leave the line blank to use the current value\&. The current value is displayed between a pair of +\fB[ ]\fR +marks\&. Without options, +\fBchfn\fR +prompts for the current user account\&. +.SH "CONFIGURATION" +.PP +The following configuration variables in +/etc/login\&.defs +change the behavior of this tool: +.PP +\fBCHFN_RESTRICT\fR (string) +.RS 4 +This parameter specifies which values in the +\fIgecos\fR +field of the +/etc/passwd +file may be changed by regular users using the +\fBchfn\fR +program\&. It can be any combination of letters +\fIf\fR, +\fIr\fR, +\fIw\fR, +\fIh\fR, for Full name, Room number, Work phone, and Home phone, respectively\&. For backward compatibility, +\fIyes\fR +is equivalent to +\fIrwh\fR +and +\fIno\fR +is equivalent to +\fIfrwh\fR\&. If not specified, only the superuser can make any changes\&. The most restrictive setting is better achieved by not installing +\fBchfn\fR +SUID\&. +.RE +.SH "FILES" +.PP +/etc/login\&.defs +.RS 4 +Shadow password suite configuration\&. +.RE +.PP +/etc/passwd +.RS 4 +User account information\&. +.RE .SH "SEE ALSO" -Full documentation at: +.PP +\fBchsh\fR(1), +\fBlogin.defs\fR(5), +\fBpasswd\fR(5)\&. ]]> -.br -Report false translation bugs to -.SH COPYRIGHT -Copyright \(co 2016 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later . -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. +The options which apply to the +\fBvipw\fR +and +\fBvigr\fR +commands are: +.PP +\fB\-g\fR, \fB\-\-group\fR +.RS 4 +Edit group database\&. +.RE +.PP +\fB\-h\fR, \fB\-\-help\fR +.RS 4 +Display help message and exit\&. +.RE +.PP +\fB\-p\fR, \fB\-\-passwd\fR +.RS 4 +Edit passwd database\&. +.RE +.PP +\fB\-q\fR, \fB\-\-quiet\fR +.RS 4 +Quiet mode\&. +.RE +.PP +\fB\-R\fR, \fB\-\-root\fR\ \&\fICHROOT_DIR\fR +.RS 4 +Apply changes in the +\fICHROOT_DIR\fR +directory and use the configuration files from the +\fICHROOT_DIR\fR +directory\&. +.RE +.PP +\fB\-s\fR, \fB\-\-shadow\fR +.RS 4 +Edit shadow or gshadow database\&. +.RE +.SH "ENVIRONMENT" +.PP +\fBVISUAL\fR +.RS 4 +Editor to be used\&. +.RE +.PP +\fBEDITOR\fR +.RS 4 +Editor to be used if +\fBVISUAL\fR +is not set\&. +.RE +.SH "FILES" +.PP +/etc/group +.RS 4 +Group account information\&. +.RE +.PP +/etc/gshadow +.RS 4 +Secure group account information\&. +.RE +.PP +/etc/passwd +.RS 4 +User account information\&. +.RE +.PP +/etc/shadow +.RS 4 +Secure user account information\&. +.RE .SH "SEE ALSO" -Full documentation at: +.PP +\fBvi\fR(1), +\fBgroup\fR(5), +\fBgshadow\fR(5) +, +\fBpasswd\fR(5), , +\fBshadow\fR(5)\&. ]]> diff --git a/src/main/org/apache/tools/ant/taskdefs/modules/Jmod.java b/src/main/org/apache/tools/ant/taskdefs/modules/Jmod.java index 2284ed364..dfbf3e26d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/modules/Jmod.java +++ b/src/main/org/apache/tools/ant/taskdefs/modules/Jmod.java @@ -150,6 +150,8 @@ import org.apache.tools.ant.types.resources.Union; * *

* destFile and classpath are required data. + * + * @since 1.10.6 */ public class Jmod extends Task { diff --git a/src/main/org/apache/tools/ant/taskdefs/modules/Link.java b/src/main/org/apache/tools/ant/taskdefs/modules/Link.java index 36fd28130..343b86715 100644 --- a/src/main/org/apache/tools/ant/taskdefs/modules/Link.java +++ b/src/main/org/apache/tools/ant/taskdefs/modules/Link.java @@ -230,6 +230,8 @@ import org.apache.tools.ant.util.ResourceUtils; * * * @see jlink tool reference + * + * @since 1.10.6 */ public class Link extends Task { diff --git a/src/main/org/apache/tools/ant/taskdefs/modules/package-info.java b/src/main/org/apache/tools/ant/taskdefs/modules/package-info.java index 99b11e536..d94431734 100644 --- a/src/main/org/apache/tools/ant/taskdefs/modules/package-info.java +++ b/src/main/org/apache/tools/ant/taskdefs/modules/package-info.java @@ -19,5 +19,7 @@ /** * Tasks for dealing with Java modules, which are supported starting with * Java 9. + * + * @since 1.10.6 */ package org.apache.tools.ant.taskdefs.modules; diff --git a/src/main/org/apache/tools/ant/types/ModuleVersion.java b/src/main/org/apache/tools/ant/types/ModuleVersion.java index 0a43420bc..551b959de 100644 --- a/src/main/org/apache/tools/ant/types/ModuleVersion.java +++ b/src/main/org/apache/tools/ant/types/ModuleVersion.java @@ -24,6 +24,8 @@ import java.util.Objects; * Element describing the parts of a Java * module version. * The version number is required; all other parts are optional. + * + * @since 1.10.6 */ public class ModuleVersion { /** Module version's required version number. */