From dbf907e1b42ddd36711f6624fc822e7adca75eaa Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Fri, 13 May 2022 22:28:52 +0200 Subject: [PATCH] Change links from http:// to https://, fix broken link --- README.md | 12 +++++----- RELEASE-NOTES.md | 6 ++--- docs/A-Whirlwind-Tour-of-Picocli.adoc | 2 +- docs/autocomplete.adoc | 2 +- docs/feedback.adoc | 2 +- docs/index.adoc | 24 +++++++++---------- docs/quick-guide.adoc | 2 +- gradle/publish-mavencentral.gradle | 2 +- pom.xml | 2 +- src/main/java/picocli/AutoComplete.java | 2 +- src/main/java/picocli/CommandLine.java | 10 ++++---- src/test/java/picocli/AutoCompleteTest.java | 8 +++---- src/test/java/picocli/TypeConversionTest.java | 8 +++---- src/test/resources/bashify_completion.bash | 2 +- src/test/resources/basic.bash | 2 +- src/test/resources/hyphenated_completion.bash | 2 +- .../picocompletion-demo-help_completion.bash | 2 +- .../picocompletion-demo_completion.bash | 2 +- 18 files changed, 46 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index 00e39ef79..12523edb3 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ converting the input to strongly typed data. Supports git-like [subcommands](htt (and nested [sub-subcommands](https://picocli.info/#_nested_sub_subcommands)), any option prefix style, POSIX-style [grouped short options](https://picocli.info/#_short_posix_options), custom [type converters](https://picocli.info/#_custom_type_converters), -[password options](http://picocli.info/#_interactive_password_options) and more. +[password options](https://picocli.info/#_interactive_password_options) and more. Picocli distinguishes between [named options](https://picocli.info/#_options) and [positional parameters](https://picocli.info/#_positional_parameters) and allows _both_ to be @@ -145,8 +145,8 @@ The user manual has examples of integrating with [Guice](https://picocli.info/#_ * [Migrating from Commons CLI to picocli](https://picocli.info/migrating-from-commons-cli.html). You won't regret it! :-) (also on: [DZone](https://dzone.com/articles/migrating-from-commons-cli-to-picocli) and [Java Code Geeks](https://www.javacodegeeks.com/2018/11/migrating-commons-cli-picocli.html)). * [Groovy 2.5 CliBuilder Renewal](https://picocli.info/groovy-2.5-clibuilder-renewal.html) (also on [blogs.apache.org](https://blogs.apache.org/logging/entry/groovy-2-5-clibuilder-renewal)). In two parts: [Part 1](https://picocli.info/groovy-2.5-clibuilder-renewal-part1.html) (also on: [DZone](https://dzone.com/articles/groovy-25-clibuilder-renewal), [Java Code Geeks](https://www.javacodegeeks.com/2018/06/groovy-clibuilder-renewal-part-1.html)), [Part 2](https://picocli.info/groovy-2.5-clibuilder-renewal-part2.html) (also on: [DZone](https://dzone.com/articles/groovy-25-clibuilder-renewal-part-2), [Java Code Geeks](https://www.javacodegeeks.com/2018/06/groovy-clibuilder-renewal-part-2.html)). * Micronaut user manual for running microservices [standalone with picocli](https://docs.micronaut.io/snapshot/guide/index.html#commandLineApps). -* [Java Command-Line Interfaces (Part 30): Observations](http://marxsoftware.blogspot.jp/2017/11/java-cmd-line-observations.html) by Dustin Marx about picocli 2.0.1 (also on: [DZone](https://dzone.com/articles/java-command-line-interfaces-part-30-finale-observations), [Java Code Geeks](https://www.javacodegeeks.com/2017/11/java-command-line-interfaces-part-30-observations.html)) -* [Java Command-Line Interfaces (Part 10): Picocli](http://marxsoftware.blogspot.jp/2017/08/picocli.html) by Dustin Marx about picocli 0.9.7 (also on: [DZone](https://dzone.com/articles/java-command-line-interfaces-part-10-picocli), [Java Code Geeks](https://www.javacodegeeks.com/2017/08/java-command-line-interfaces-part-10-picocli.html)) +* [Java Command-Line Interfaces (Part 30): Observations](https://marxsoftware.blogspot.jp/2017/11/java-cmd-line-observations.html) by Dustin Marx about picocli 2.0.1 (also on: [DZone](https://dzone.com/articles/java-command-line-interfaces-part-30-finale-observations), [Java Code Geeks](https://www.javacodegeeks.com/2017/11/java-command-line-interfaces-part-30-observations.html)) +* [Java Command-Line Interfaces (Part 10): Picocli](https://marxsoftware.blogspot.jp/2017/08/picocli.html) by Dustin Marx about picocli 0.9.7 (also on: [DZone](https://dzone.com/articles/java-command-line-interfaces-part-10-picocli), [Java Code Geeks](https://www.javacodegeeks.com/2017/08/java-command-line-interfaces-part-10-picocli.html)) * [Picocli 2.0: Groovy Scripts on Steroids](https://picocli.info/picocli-2.0-groovy-scripts-on-steroids.html) (also on: [DZone](https://dzone.com/articles/picocli-v2-groovy-scripts-on-steroids), [Java Code Geeks](https://www.javacodegeeks.com/2018/01/picocli-2-0-groovy-scripts-steroids.html)) * [Picocli 2.0: Do More With Less](https://picocli.info/picocli-2.0-do-more-with-less.html) (also on: [DZone](https://dzone.com/articles/whats-new-in-picocli-20), [Java Code Geeks](https://www.javacodegeeks.com/2018/01/picocli-2-0-less.html)) * [Announcing picocli 1.0](https://picocli.info/announcing-picocli-1.0.html) (also on: [DZone](https://dzone.com/articles/announcing-picocli-10)) @@ -197,7 +197,7 @@ Join the [picocli Google group](https://groups.google.com/d/forum/picocli) if yo ### Commitments -| This project follows [semantic versioning](http://semver.org/) and adheres to the **[Zero Bugs Commitment](https://github.com/classgraph/classgraph/blob/latest/Zero-Bugs-Commitment.md)**. | +| This project follows [semantic versioning](https://semver.org/) and adheres to the **[Zero Bugs Commitment](https://github.com/classgraph/classgraph/blob/latest/Zero-Bugs-Commitment.md)**. | |------------------------| ## Adoption @@ -236,7 +236,7 @@ Join the [picocli Google group](https://groups.google.com/d/forum/picocli) if yo -* Picocli is now part of Groovy. From Groovy 2.5, all Groovy command line tools are picocli-based, and picocli is the underlying parser for Groovy's [CliBuilder DSL](http://groovy-lang.org/dsls.html#_clibuilder). +* Picocli is now part of Groovy. From Groovy 2.5, all Groovy command line tools are picocli-based, and picocli is the underlying parser for Groovy's [CliBuilder DSL](https://groovy-lang.org/dsls.html#_clibuilder). * Picocli is now part of Micronaut. The Micronaut CLI has been rewritten with picocli, and Micronaut has dedicated support for running microservices [standalone with picocli](https://docs.micronaut.io/snapshot/guide/index.html#commandLineApps). See also [Micronaut Picocli Guide](https://micronaut-projects.github.io/micronaut-picocli/latest/guide/). * Quarkus now offers [Command mode with picocli](https://quarkus.io/guides/picocli). * Picocli is now part of JUnit 5. JUnit 5.3 migrated its `ConsoleLauncher` from jopt-simple to picocli to support @-files (argument files); this helps users who need to specify many tests on the command line and run into system limitations. @@ -250,7 +250,7 @@ Join the [picocli Google group](https://groups.google.com/d/forum/picocli) if yo * Picocli is used in Pinterest [ktlint](https://ktlint.github.io/). * Picocli is used in Spring IO [nohttp-cli](https://github.com/spring-io/nohttp/tree/main/nohttp-cli). * The [MinecraftPicocli](https://github.com/Rubydesic/MinecraftPicocli) library facilitates the use of picocli in [Minecraft Forge](https://files.minecraftforge.net/). -* [Simple Java Mail](http://www.simplejavamail.org/) now offers a picocli-based [CLI](http://www.simplejavamail.org/cli.html#navigation). +* [Simple Java Mail](https://www.simplejavamail.org/) now offers a picocli-based [CLI](https://www.simplejavamail.org/cli.html#navigation). * [jbang](https://github.com/maxandersen/jbang) not only uses picocli internally, but also has a CLI template to generate an initial script: use `jbang --init=cli helloworld.java` to generate a sample picocli-enabled jbang script. See [asciinema](https://asciinema.org/a/AVwA19yijKRNKEO0bJENN2ME3?autoplay=true&speed=2). * Picocli is the main library used in the CookieTemple [cli-java template](https://cookietemple.readthedocs.io/en/latest/available_templates/available_templates.html#cli-java) for building GraalVM native CLI executables in Java. See [this preview](https://user-images.githubusercontent.com/21954664/86740903-474a3000-c037-11ea-9ae3-1a8f7bf1743f.gif). * Picocli is [mentioned](https://clig.dev/#the-basics) in [Command Line Interface Guidelines](https://clig.dev/). diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 3e5360221..8c6a479d7 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -11,7 +11,7 @@ Also, this release has various fixes and enhancements related to the synopsis of This is the seventy-ninth public release. -Picocli follows [semantic versioning](http://semver.org/). +Picocli follows [semantic versioning](https://semver.org/). Artifacts in this release are signed by Remko Popma (6601 E5C0 8DCC BB96). ## Table of Contents @@ -6107,7 +6107,7 @@ This release contains bugfixes and support for command aliases. Picocli has a new logo! Many thanks to [Reallinfo](https://github.com/reallinfo) for the design! - + This is the thirty-second public release. Picocli follows [semantic versioning](http://semver.org/). @@ -6249,7 +6249,7 @@ The usage help synopsis of the subcommand shows not only the subcommand name but # Picocli 3.0.0 The picocli community is pleased to announce picocli 3.0.0. -This release offers a [programmatic API](http://picocli.info/picocli-3.0-programmatic-api.html) for creating command line applications, in addition to the annotations API. The programmatic API allows applications to dynamically create command line options on the fly, and also makes it possible to create idiomatic domain-specific languages for processing command line arguments, using picocli, in other JVM languages. The picocli community is proud to announce that [Apache Groovy](http://groovy-lang.org/)'s [CliBuilder](http://docs.groovy-lang.org/docs/next/html/gapi/groovy/cli/picocli/CliBuilder.html) DSL for command line applications has been rewritten to use the picocli programmatic API, starting from Groovy 2.5. +This release offers a [programmatic API](https://picocli.info/picocli-3.0-programmatic-api.html) for creating command line applications, in addition to the annotations API. The programmatic API allows applications to dynamically create command line options on the fly, and also makes it possible to create idiomatic domain-specific languages for processing command line arguments, using picocli, in other JVM languages. The picocli community is proud to announce that [Apache Groovy](http://groovy-lang.org/)'s [CliBuilder](https://docs.groovy-lang.org/docs/next/html/gapi/groovy/cli/picocli/CliBuilder.html) DSL for command line applications has been rewritten to use the picocli programmatic API, starting from Groovy 2.5. Another new feature in this release are Mixins. Mixins allow reusing common options, parameters and command attributes in multiple applications without copy-and-paste duplication. diff --git a/docs/A-Whirlwind-Tour-of-Picocli.adoc b/docs/A-Whirlwind-Tour-of-Picocli.adoc index 0a93f09c2..2b6608e50 100644 --- a/docs/A-Whirlwind-Tour-of-Picocli.adoc +++ b/docs/A-Whirlwind-Tour-of-Picocli.adoc @@ -7,7 +7,7 @@ ifdef::env-github[] :note-caption: :information_source: :tip-caption: :bulb: endif::[] -//:imagesdir: http://picocli.info +//:imagesdir: https://picocli.info > a mighty tiny command line processor diff --git a/docs/autocomplete.adoc b/docs/autocomplete.adoc index 69c630876..e36bf0ecf 100644 --- a/docs/autocomplete.adoc +++ b/docs/autocomplete.adoc @@ -77,7 +77,7 @@ jchecksum_completion myproject.jar picocli-1.0.0.jar ---- === Install Completion Script -Finally, http://tldp.org/HOWTO/Bash-Prompt-HOWTO/x237.html[source] the completion script: +Finally, https://tldp.org/HOWTO/Bash-Prompt-HOWTO/x237.html[source] the completion script: .Bash or ZSH [source,bash] diff --git a/docs/feedback.adoc b/docs/feedback.adoc index cddd5a701..1cc801dde 100644 --- a/docs/feedback.adoc +++ b/docs/feedback.adoc @@ -1,6 +1,6 @@ [quote, Jakub Korab (@jakekorab), https://twitter.com/jakekorab/status/1273644747639357447] Picocli is PFM. -http://picocli.info +https://picocli.info --- diff --git a/docs/index.adoc b/docs/index.adoc index 753e0e9c8..9a5cef736 100644 --- a/docs/index.adoc +++ b/docs/index.adoc @@ -35,7 +35,7 @@ Every main method deserves picocli! image:logo/horizontal.png[picocli the Mighty Tiny Command Line Interface,width=800] -The user manual for the latest release is at http://picocli.info. +The user manual for the latest release is at https://picocli.info. For the busy and impatient: there is also a link:quick-guide.html[Quick Guide]. == Introduction @@ -709,7 +709,7 @@ fun main(args: Array) : Unit = exitProcess(CommandLine(Main()).execute(* ---- === Short (POSIX) Options -Picocli supports http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html#tag_12_02[POSIX clustered short options]: +Picocli supports https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html#tag_12_02[POSIX clustered short options]: one or more single-character options without option-arguments, followed by at most one option with an option-argument, can be grouped behind one '-' delimiter. @@ -1158,7 +1158,7 @@ See <> for details. From picocli 3.8.1, a simpler argument file format is also supported where every line (except empty lines and comment lines) is interpreted as a single argument. Arguments containing whitespace do not need to be quoted, but it is not possible to have arguments with embedded newlines or to have empty string arguments without quotes. -From picocli 3.9, this simpler argument format is fully compatible with http://jcommander.org/#_syntax[JCommander]'s `@-file` argument file format. +From picocli 3.9, this simpler argument format is fully compatible with https://jcommander.org/#_syntax[JCommander]'s `@-file` argument file format. You can tell picocli to use the simplified argument file format programmatically with `CommandLine.setUseSimplifiedAtFiles(true)`, or by setting system property `picocli.useSimplifiedAtFiles` without a value or with value `"true"` @@ -7177,7 +7177,7 @@ On Windows, when picocli detects it is running under a Unix variant like Cygwin Displaying colors on Windows Command Console and PowerShell requires a bit of extra work. -The easiest way to accomplish this is to use the http://fusesource.github.io/jansi/[Jansi] library in your application. +The easiest way to accomplish this is to use the https://fusesource.github.io/jansi/[Jansi] library in your application. NOTE: None of the below is mandatory. If not supported, picocli will simply not emit ANSI escape codes, and everything will work without colors. @@ -7265,7 +7265,7 @@ Picocli-based applications will show ANSI colors in WSL by default. ===== For Reference: 3rd Party Software In Windows version prior to 10, the Windows command console doesn't support output coloring by default. -One option is for end users to install either http://cmder.net/[Cmder], http://sourceforge.net/projects/conemu/[ConEmu], https://github.com/adoxa/ansicon/[ANSICON] or https://mintty.github.io/[Mintty] (used by default in GitBash and Cygwin) to add coloring support to their Windows command console. +One option is for end users to install either https://cmder.net/[Cmder], https://sourceforge.net/projects/conemu/[ConEmu], https://github.com/adoxa/ansicon/[ANSICON] or https://mintty.github.io/[Mintty] (used by default in GitBash and Cygwin) to add coloring support to their Windows command console. @@ -7305,12 +7305,12 @@ Below is the exact sequence of steps picocli uses to determine whether or not to . ANSI is enabled when system property `os.name` starts with `"Windows"` and JAnsi Console is https://github.com/fusesource/jansi[installed]. . ANSI is disabled when environment variable https://bixense.com/clicolors/[`CLICOLOR == 0`]. . ANSI is disabled when environment variable https://conemu.github.io/en/AnsiEscapeCodes.html#Environment_variable[`ConEmuANSI == OFF`]. -. ANSI is disabled when Picocli https://stackoverflow.com/questions/1403772/how-can-i-check-if-a-java-programs-input-output-streams-are-connected-to-a-term[_guesses_] the program's output stream is not connected to a terminal: when `System.console()` returns `null`. This check is omitted if picocli _guesses_ the program is running in a Windows https://www.cygwin.com/[Cygwin], http://www.mingw.org/wiki/MSYS[MSYS] or https://www.msys2.org/[MSYS2] environment: when system property `os.name` starts with `"Windows"` and either environment variable `TERM` contains `cygwin` or starts with `xterm` or environment variable `OSTYPE` is defined. +. ANSI is disabled when Picocli https://stackoverflow.com/questions/1403772/how-can-i-check-if-a-java-programs-input-output-streams-are-connected-to-a-term[_guesses_] the program's output stream is not connected to a terminal: when `System.console()` returns `null`. This check is omitted if picocli _guesses_ the program is running in a Windows https://www.cygwin.com/[Cygwin], https://mingw.osdn.io/[MSYS] or https://www.msys2.org/[MSYS2] environment: when system property `os.name` starts with `"Windows"` and either environment variable `TERM` contains `cygwin` or starts with `xterm` or environment variable `OSTYPE` is defined. . ANSI is enabled when environment variable https://github.com/adoxa/ansicon/blob/master/readme.txt[`ANSICON`] is defined. . ANSI is enabled when environment variable https://bixense.com/clicolors/[`CLICOLOR == 1`]. . ANSI is enabled when environment variable https://conemu.github.io/en/AnsiEscapeCodes.html#Environment_variable[`ConEmuANSI == ON`]. . ANSI is enabled when picocli detects the program is running in a non-Windows OS (system property `os.name` does not start with `"Windows"`). -. ANSI is enabled when picocli _guesses_ the program is running in a https://www.cygwin.com/[Cygwin], http://www.mingw.org/wiki/MSYS[MSYS] or https://www.msys2.org/[MSYS2] environment (either environment variable `TERM` contains `cygwin` or starts with `xterm` or environment variable `OSTYPE` is defined). +. ANSI is enabled when picocli _guesses_ the program is running in a https://www.cygwin.com/[Cygwin], https://mingw.osdn.io/[MSYS] or https://www.msys2.org/[MSYS2] environment (either environment variable `TERM` contains `cygwin` or starts with `xterm` or environment variable `OSTYPE` is defined). ANSI escape codes are not emitted if none of the above apply. @@ -10277,7 +10277,7 @@ The programmatic API allows applications to dynamically create command line opti It also makes it possible to use picocli in other JVM languages that do not support annotations. Another use case is creating idiomatic domain-specific languages for processing command line arguments. -For example, Groovy's http://groovy-lang.org/dsls.html#_clibuilder[CliBuilder DSL] is implemented using picocli's programmatic API. +For example, Groovy's https://groovy-lang.org/dsls.html#_clibuilder[CliBuilder DSL] is implemented using picocli's programmatic API. [#option-parameters-methods] === `@Option` and `@Parameters` Methods @@ -11275,7 +11275,7 @@ assertEquals("output.txt", optionArg.file) Picocli makes it easy to follow this new and modern set of https://clig.dev/#guidelines[Command Line Interface Guidelines]. Slightly older, but a classic: when designing your command line application, -the https://www.gnu.org/prep/standards/html_node/Command_002dLine-Interfaces.html#Command_002dLine-Interfaces[GNU recommendations] for command line interfaces and http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html#tag_12_02[POSIX Utility Guidelines] may be useful. +the https://www.gnu.org/prep/standards/html_node/Command_002dLine-Interfaces.html#Command_002dLine-Interfaces[GNU recommendations] for command line interfaces and https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html#tag_12_02[POSIX Utility Guidelines] may be useful. Generally, many applications use options for optional values and parameters for mandatory values. However, picocli lets you make options required if you want to, see <>. @@ -12911,7 +12911,7 @@ This https://www.infoq.com/news/2019/03/jep-343-jpackage/[InfoQ article] may be === jbang https://github.com/maxandersen/jbang[jbang] allows you to write scripts in Java that use external dependencies. -You use it with a `//DEPS` comment, similar to the http://groovy-lang.org/grape.html[`@Grab`] annotation in Groovy. +You use it with a `//DEPS` comment, similar to the https://groovy-lang.org/grape.html[`@Grab`] annotation in Groovy. Use `jbang --init=cli helloworld.java` to create an initial script with a picocli template. This https://asciinema.org/a/AVwA19yijKRNKEO0bJENN2ME3?autoplay=true&speed=2[asciinema presentation] shows what is possible. @@ -12922,7 +12922,7 @@ https://jreleaser.org[JReleaser] enables several packaging options such as https https://snapcraft.io/[Snapcraft], https://scoop.sh/[Scoop], https://www.jbang.dev/[jbang], https://www.docker.com/[Docker], among others. Currently two different distribution types are supported: jlink, and standard zip/tar distributions. The latter can be generated with a combination of the https://www.mojohaus.org/appassembler/appassembler-maven-plugin/[appassembler-maven-plugin] and -http://maven.apache.org/plugins/maven-assembly-plugin/[maven-assembly-plugin] plugins if using Maven, or the +https://maven.apache.org/plugins/maven-assembly-plugin/[maven-assembly-plugin] plugins if using Maven, or the https://docs.gradle.org/current/userguide/application_plugin.html[application] plugin if using Gradle. == Picocli in Other Languages @@ -13080,7 +13080,7 @@ In order to get you started quickly, you may have a look at the https://github.c === Kotlin ==== Kotlin Annotation Syntax -Kotlin 1.2 (released Nov 28, 2017) officially supports http://kotlinlang.org/docs/reference/whatsnew12.html#array-literals-in-annotations[array literals in annotations], allowing a more compact notation: +Kotlin 1.2 (released Nov 28, 2017) officially supports https://kotlinlang.org/docs/reference/whatsnew12.html#array-literals-in-annotations[array literals in annotations], allowing a more compact notation: [source,kotlin] ---- diff --git a/docs/quick-guide.adoc b/docs/quick-guide.adoc index 3da323471..dbd7a6dc7 100644 --- a/docs/quick-guide.adoc +++ b/docs/quick-guide.adoc @@ -870,7 +870,7 @@ See the https://picocli.info/#_hidden_options_and_parameters[user manual] for de ==== Show Default Values -The link:http://picocli.info/#_default_values[default value] for an option or positional parameter +The link:https://picocli.info/#_default_values[default value] for an option or positional parameter can be embedded in the description by specifying the variable `${DEFAULT-VALUE}` in the description text. See the https://picocli.info/#_show_default_values[user manual] for details. diff --git a/gradle/publish-mavencentral.gradle b/gradle/publish-mavencentral.gradle index fcba7157b..a2b7c1948 100644 --- a/gradle/publish-mavencentral.gradle +++ b/gradle/publish-mavencentral.gradle @@ -92,7 +92,7 @@ publishing { packaging = 'jar' name = project.name description = project.description - url = 'http://picocli.info' + url = 'https://picocli.info' inceptionYear = '2018' licenses { license { diff --git a/pom.xml b/pom.xml index 465d40013..a7601a339 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ jar picocli - a mighty tiny Command Line Interface Java command line parser with both an annotations API and a programmatic API. Usage help with ANSI styles and colors. Autocomplete. Nested subcommands. Easily included as source to avoid adding a dependency. - http://picocli.info + https://picocli.info 2017 diff --git a/src/main/java/picocli/AutoComplete.java b/src/main/java/picocli/AutoComplete.java index 0f4c2c341..5e8fa650f 100644 --- a/src/main/java/picocli/AutoComplete.java +++ b/src/main/java/picocli/AutoComplete.java @@ -314,7 +314,7 @@ private static class CommandDescriptor { "# =======================\n" + "#\n" + "# Bash completion support for the `%1$s` command,\n" + - "# generated by [picocli](http://picocli.info/) version %2$s.\n" + + "# generated by [picocli](https://picocli.info/) version %2$s.\n" + "#\n" + "# Installation\n" + "# ------------\n" + diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java index bdc292514..a5c7b1ee8 100644 --- a/src/main/java/picocli/CommandLine.java +++ b/src/main/java/picocli/CommandLine.java @@ -2799,7 +2799,7 @@ private StringBuilder usage(StringBuilder sb, Help help) { /** * Prints version information from the {@link Command#version()} annotation to the specified {@code PrintStream}. * Each element of the array of version strings is printed on a separate line. Version strings may contain - * markup for colors and style. + * markup for colors and style. * @param out the printStream to print to * @param ansi whether the usage message should include ANSI escape codes or not * @see Command#version() @@ -2817,7 +2817,7 @@ public void printVersionHelp(PrintStream out, Help.Ansi ansi) { * Prints version information from the {@link Command#version()} annotation to the specified {@code PrintStream}. * Each element of the array of version strings is {@linkplain String#format(String, Object...) formatted} with the * specified parameters, and printed on a separate line. Both version strings and parameters may contain - * markup for colors and style. + * markup for colors and style. * @param out the printStream to print to * @param ansi whether the usage message should include ANSI escape codes or not * @param params Arguments referenced by the format specifiers in the version strings @@ -2841,7 +2841,7 @@ public void printVersionHelp(PrintStream out, Help.Ansi ansi, Object... params) * Prints version information from the {@link Command#version()} annotation to the specified {@code PrintWriter}. * Each element of the array of version strings is {@linkplain String#format(String, Object...) formatted} with the * specified parameters, and printed on a separate line. Both version strings and parameters may contain - * markup for colors and style. + * markup for colors and style. * @param out the PrintWriter to print to * @param ansi whether the usage message should include ANSI escape codes or not * @param params Arguments referenced by the format specifiers in the version strings @@ -3790,7 +3790,7 @@ public enum ScopeType { /** * Set {@code usageHelp=true} for the {@code --help} option that triggers display of the usage help message. - * The convenience methods {@code Commandline.call}, + * The convenience methods {@code Commandline.call}, * {@code Commandline.run}, and {@code Commandline.parseWithHandler(s)} will automatically print usage help * when an option with {@code usageHelp=true} was specified on the command line. *

@@ -3814,7 +3814,7 @@ public enum ScopeType { /** * Set {@code versionHelp=true} for the {@code --version} option that triggers display of the version information. - * The convenience methods {@code Commandline.call}, + * The convenience methods {@code Commandline.call}, * {@code Commandline.run}, and {@code Commandline.parseWithHandler(s)} will automatically print version information * when an option with {@code versionHelp=true} was specified on the command line. *

diff --git a/src/test/java/picocli/AutoCompleteTest.java b/src/test/java/picocli/AutoCompleteTest.java index ebb51e5cb..8546ed074 100644 --- a/src/test/java/picocli/AutoCompleteTest.java +++ b/src/test/java/picocli/AutoCompleteTest.java @@ -642,7 +642,7 @@ private String expectedCompletionScriptForAutoCompleteApp() { "# =======================\n" + "#\n" + "# Bash completion support for the `picocli.AutoComplete` command,\n" + - "# generated by [picocli](http://picocli.info/) version %s.\n" + + "# generated by [picocli](https://picocli.info/) version %s.\n" + "#\n" + "# Installation\n" + "# ------------\n" + @@ -859,7 +859,7 @@ private String expectedCompletionScriptForNonDefault() { "# =======================\n" + "#\n" + "# Bash completion support for the `nondefault` command,\n" + - "# generated by [picocli](http://picocli.info/) version %s.\n" + + "# generated by [picocli](https://picocli.info/) version %s.\n" + "#\n" + "# Installation\n" + "# ------------\n" + @@ -1424,7 +1424,7 @@ private String getCompletionScriptText(String cmdName) { "# =======================\n" + "#\n" + "# Bash completion support for the `%1$s` command,\n" + - "# generated by [picocli](http://picocli.info/) version %2$s.\n" + + "# generated by [picocli](https://picocli.info/) version %2$s.\n" + "#\n" + "# Installation\n" + "# ------------\n" + @@ -1634,7 +1634,7 @@ private String getCompletionScriptTextWithHidden(String commandName) { "# =======================\n" + "#\n" + "# Bash completion support for the `%1$s` command,\n" + - "# generated by [picocli](http://picocli.info/) version %2$s.\n" + + "# generated by [picocli](https://picocli.info/) version %2$s.\n" + "#\n" + "# Installation\n" + "# ------------\n" + diff --git a/src/test/java/picocli/TypeConversionTest.java b/src/test/java/picocli/TypeConversionTest.java index a61c30a00..9b266cf9c 100644 --- a/src/test/java/picocli/TypeConversionTest.java +++ b/src/test/java/picocli/TypeConversionTest.java @@ -180,8 +180,8 @@ public void testTypeConversionSucceedsForValidInput() throws Exception { "-double", "3.45", "-Double", "4.56", // "-String", "abc", "-StringBuilder", "bcd", "-CharSequence", "xyz", // "-File", "abc.txt", // - "-URL", "http://pico-cli.github.io", // - "-URI", "http://pico-cli.github.io/index.html", // + "-URL", "https://picocli.info", // + "-URI", "https://picocli.info/index.html", // "-Date", "2017-01-30", // "-Time", "23:59:59", // "-BigDecimal", "12345678901234567890.123", // @@ -221,8 +221,8 @@ public void testTypeConversionSucceedsForValidInput() throws Exception { assertEquals("StringBuilder", "bcd", bean.aStringBuilderField.toString()); assertEquals("CharSequence", "xyz", bean.aCharSequenceField); assertEquals("File", new File("abc.txt"), bean.aFileField); - assertEquals("URL", new URL("http://pico-cli.github.io"), bean.anURLField); - assertEquals("URI", new URI("http://pico-cli.github.io/index.html"), bean.anURIField); + assertEquals("URL", new URL("https://picocli.info"), bean.anURLField); + assertEquals("URI", new URI("https://picocli.info/index.html"), bean.anURIField); assertEquals("Date", new SimpleDateFormat("yyyy-MM-dd").parse("2017-01-30"), bean.aDateField); assertEquals("Time", new Time(new SimpleDateFormat("HH:mm:ss").parse("23:59:59").getTime()), bean.aTimeField); assertEquals("BigDecimal", new BigDecimal("12345678901234567890.123"), bean.aBigDecimalField); diff --git a/src/test/resources/bashify_completion.bash b/src/test/resources/bashify_completion.bash index b6f92b9a6..679c78656 100644 --- a/src/test/resources/bashify_completion.bash +++ b/src/test/resources/bashify_completion.bash @@ -4,7 +4,7 @@ # ======================= # # Bash completion support for the `bashify` command, -# generated by [picocli](http://picocli.info/) version %1$s. +# generated by [picocli](https://picocli.info/) version %1$s. # # Installation # ------------ diff --git a/src/test/resources/basic.bash b/src/test/resources/basic.bash index bd4cf8794..ce12421b9 100644 --- a/src/test/resources/basic.bash +++ b/src/test/resources/basic.bash @@ -4,7 +4,7 @@ # ======================= # # Bash completion support for the `basicExample` command, -# generated by [picocli](http://picocli.info/) version %1$s. +# generated by [picocli](https://picocli.info/) version %1$s. # # Installation # ------------ diff --git a/src/test/resources/hyphenated_completion.bash b/src/test/resources/hyphenated_completion.bash index fb41b8738..91bb7434b 100644 --- a/src/test/resources/hyphenated_completion.bash +++ b/src/test/resources/hyphenated_completion.bash @@ -4,7 +4,7 @@ # ======================= # # Bash completion support for the `rcmd` command, -# generated by [picocli](http://picocli.info/) version %1$s. +# generated by [picocli](https://picocli.info/) version %1$s. # # Installation # ------------ diff --git a/src/test/resources/picocompletion-demo-help_completion.bash b/src/test/resources/picocompletion-demo-help_completion.bash index 441a8c3d6..3408e5681 100644 --- a/src/test/resources/picocompletion-demo-help_completion.bash +++ b/src/test/resources/picocompletion-demo-help_completion.bash @@ -4,7 +4,7 @@ # ======================= # # Bash completion support for the `picocompletion-demo-help` command, -# generated by [picocli](http://picocli.info/) version %1$s. +# generated by [picocli](https://picocli.info/) version %1$s. # # Installation # ------------ diff --git a/src/test/resources/picocompletion-demo_completion.bash b/src/test/resources/picocompletion-demo_completion.bash index 75f378969..996320ca0 100644 --- a/src/test/resources/picocompletion-demo_completion.bash +++ b/src/test/resources/picocompletion-demo_completion.bash @@ -4,7 +4,7 @@ # ======================= # # Bash completion support for the `picocompletion-demo` command, -# generated by [picocli](http://picocli.info/) version %1$s. +# generated by [picocli](https://picocli.info/) version %1$s. # # Installation # ------------