Skip to content

Commit

Permalink
Prepare for next development cycle
Browse files Browse the repository at this point in the history
  • Loading branch information
remkop committed Apr 16, 2023
1 parent 0f097e7 commit 72a49fc
Show file tree
Hide file tree
Showing 13 changed files with 66 additions and 66 deletions.
8 changes: 4 additions & 4 deletions dependencies.gradle
Expand Up @@ -5,12 +5,12 @@ ext {
// PICOCLI VERSION

// projectPreviousPublishedVersion is non-SNAPSHOT, only published releases
projectPreviousPublishedVersion = "4\\.7\\.2" // for task bumpReadmeVersion
projectPreviousPublishedVersion = "4\\.7\\.3" // for task bumpReadmeVersion
// projectPreviousVersionRegex may be a SNAPSHOT
projectPreviousVersionRegex = "4\\.7\\.3-SNAPSHOT" // for task bumpVersion
projectVersion = "4.7.3" // for all build tasks
projectPreviousVersionRegex = "4\\.7\\.3" // for task bumpVersion
projectVersion = "4.7.4-SNAPSHOT" // for all build tasks
releaseDate = "2023-04-16" // for task bumpVersion
releaseDatePreviousRegex = "2023\\-04\\-09" // for task bumpVersion
releaseDatePreviousRegex = "2023\\-04\\-16" // for task bumpVersion

// DEPENDENCIES
asciidoctorGradlePluginVersion = "3.3.2"
Expand Down
2 changes: 1 addition & 1 deletion docs/autocomplete.adoc
@@ -1,7 +1,7 @@
= Autocomplete for Java Command Line Applications
//:author: Remko Popma
//:email: rpopma@apache.org
:revnumber: 4.7.3
:revnumber: 4.7.4-SNAPSHOT
:revdate: 2023-04-16
:toc: left
:numbered:
Expand Down
62 changes: 31 additions & 31 deletions docs/index.adoc
@@ -1,7 +1,7 @@
= picocli - a mighty tiny command line interface
//:author: Remko Popma
//:email: rpopma@apache.org
:revnumber: 4.7.3
:revnumber: 4.7.4-SNAPSHOT
:revdate: 2023-04-16
:toc: left
:numbered:
Expand Down Expand Up @@ -120,7 +120,7 @@ class CheckSum implements Callable<Integer> {
[[CheckSum-App-Groovy]]
[source,groovy,role="secondary"]
----
@Grab('info.picocli:picocli-groovy:4.7.3')
@Grab('info.picocli:picocli-groovy:4.7.4-SNAPSHOT')
import picocli.CommandLine
import static picocli.CommandLine.*

Expand Down Expand Up @@ -152,7 +152,7 @@ class Checksum implements Callable<Integer> {
[[CheckSum-App-Groovy-Script]]
[source,groovy,role="secondary"]
----
@Grab('info.picocli:picocli-groovy:4.7.3')
@Grab('info.picocli:picocli-groovy:4.7.4-SNAPSHOT')
import static picocli.CommandLine.*
import groovy.transform.Field
import java.security.MessageDigest
Expand Down Expand Up @@ -279,7 +279,7 @@ Below are examples of configuring Gradle or Maven to use picocli as an external
[source,groovy,role="primary"]
----
dependencies {
implementation 'info.picocli:picocli:4.7.3'
implementation 'info.picocli:picocli:4.7.4-SNAPSHOT'
}
----
.Maven
Expand All @@ -288,7 +288,7 @@ dependencies {
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.3</version>
<version>4.7.4-SNAPSHOT</version>
</dependency>
----

Expand Down Expand Up @@ -325,8 +325,8 @@ https://immutables.github.io/apt.html[This page] shows the steps to configure Ec
[source,groovy,role="primary"]
----
dependencies {
implementation 'info.picocli:picocli:4.7.3'
annotationProcessor 'info.picocli:picocli-codegen:4.7.3'
implementation 'info.picocli:picocli:4.7.4-SNAPSHOT'
annotationProcessor 'info.picocli:picocli-codegen:4.7.4-SNAPSHOT'
}


Expand All @@ -348,7 +348,7 @@ compileJava {
<path>
<groupId>info.picocli</groupId>
<artifactId>picocli-codegen</artifactId>
<version>4.7.3</version>
<version>4.7.4-SNAPSHOT</version>
</path>
</annotationProcessorPaths>
<compilerArgs>
Expand All @@ -368,7 +368,7 @@ then replace `annotationProcessor` with `kapt`:
apply plugin: 'kotlin-kapt' // required
dependencies {
// ...
kapt 'info.picocli:picocli-codegen:4.7.3'
kapt 'info.picocli:picocli-codegen:4.7.4-SNAPSHOT'
}
```

Expand Down Expand Up @@ -399,7 +399,7 @@ Now, assuming we created a jar named `checksum.jar` containing our compiled `Che

[source,bash]
----
java -cp "picocli-4.7.3.jar:checksum.jar" CheckSum --algorithm SHA-1 hello.txt
java -cp "picocli-4.7.4-SNAPSHOT.jar:checksum.jar" CheckSum --algorithm SHA-1 hello.txt
----

You may want to package your application in such a way that end users can invoke it with a short command like this:
Expand Down Expand Up @@ -10381,7 +10381,7 @@ Eventually, we are ready to run our application:

[source,bash]
----
java -cp "picocli-4.7.3.jar;myapp.jar" org.myorg.GreetingApp Sarah Lea
java -cp "picocli-4.7.4-SNAPSHOT.jar;myapp.jar" org.myorg.GreetingApp Sarah Lea
----

With no command line parameter `--locale` given, the message texts are printed in the default language (here: English):
Expand All @@ -10395,7 +10395,7 @@ In order to control the locale chosen for our output, we have to make use of the

[source,bash]
----
java -cp "picocli-4.7.3.jar;myapp.jar" org.myorg.GreetingApp --locale=es Sarah Lea
java -cp "picocli-4.7.4-SNAPSHOT.jar;myapp.jar" org.myorg.GreetingApp --locale=es Sarah Lea
----

Now our message texts are printed in Spanish:
Expand Down Expand Up @@ -11714,21 +11714,21 @@ Since picocli dependencies are not available in the Spring Initializr, we have t
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli-spring-boot-starter</artifactId>
<version>4.7.3</version>
<version>4.7.4-SNAPSHOT</version>
</dependency>
----
.Gradle (Groovy)
[source,groovy,role="secondary"]
----
dependencies {
implementation 'info.picocli:picocli-spring-boot-starter:4.7.3'
implementation 'info.picocli:picocli-spring-boot-starter:4.7.4-SNAPSHOT'
}
----
.Gradle (Kotlin)
[source,kotlin,role="secondary"]
----
dependencies {
implementation("info.picocli:picocli-spring-boot-starter:4.7.3")
implementation("info.picocli:picocli-spring-boot-starter:4.7.4-SNAPSHOT")
}
----

Expand Down Expand Up @@ -13078,7 +13078,7 @@ As mentioned in <<Running the Application>>, earlier in this manual, one way to

[source,bash]
----
java -cp "picocli-4.7.3.jar;myapp.jar" org.myorg.MyMainClass --option=value arg0 arg1
java -cp "picocli-4.7.4-SNAPSHOT.jar;myapp.jar" org.myorg.MyMainClass --option=value arg0 arg1
----

That is quite verbose. You may want to package your application in such a way that end users can invoke it by its command name like this:
Expand All @@ -13097,7 +13097,7 @@ On unix-based operating systems, you can ask your users to define an alias. For

[source,bash]
----
alias mycommand='java -cp "/path/to/picocli-4.7.3.jar:/path/to/myapp.jar" org.myorg.MainClass'
alias mycommand='java -cp "/path/to/picocli-4.7.4-SNAPSHOT.jar:/path/to/myapp.jar" org.myorg.MainClass'
----

Append the above line to your `~/.bashrc` file to make this alias available in every new shell session.
Expand Down Expand Up @@ -13146,7 +13146,7 @@ After installing GraalVM and installing the `native-image` generator utility (wi
you can then create a native image by invoking the `native-image` command:

----
path/to/native-image -cp picocli-4.7.3.jar --static -jar myapp.jar
path/to/native-image -cp picocli-4.7.4-SNAPSHOT.jar --static -jar myapp.jar
----

CAUTION: To create a native image, the compiler toolchain for your platform needs to be installed. See https://www.infoq.com/articles/java-native-cli-graalvm-picocli/[Build Great Native CLI Apps in Java with Graalvm and Picocli] for details.
Expand Down Expand Up @@ -13291,7 +13291,7 @@ The script body is executed if the user input was valid and did not request usag

[source,groovy]
----
@Grab('info.picocli:picocli-groovy:4.7.3')
@Grab('info.picocli:picocli-groovy:4.7.4-SNAPSHOT')
@GrabConfig(systemClassLoader=true)
@Command(name = "myScript",
mixinStandardHelpOptions = true, // add --help and --version options
Expand Down Expand Up @@ -13332,7 +13332,7 @@ The table below compares these two base classes.


WARNING: When upgrading scripts from picocli versions older than 4.0, just changing the version number is not enough!
Scripts should use `@Grab('info.picocli:picocli-groovy:4.7.3')`. The old artifact id `@Grab('info.picocli:picocli:4.7.3')` will not work,
Scripts should use `@Grab('info.picocli:picocli-groovy:4.7.4-SNAPSHOT')`. The old artifact id `@Grab('info.picocli:picocli:4.7.4-SNAPSHOT')` will not work,
because the `@picocli.groovy.PicocliScript` annotation class and supporting classes have been moved into a separate module, `picocli-groovy`.

==== Closures in Annotations
Expand Down Expand Up @@ -13390,7 +13390,7 @@ NOTE: When using a Groovy version older than 2.4.7, use this workaround for the

[source,groovy]
----
@Grab('info.picocli:picocli-groovy:4.7.3')
@Grab('info.picocli:picocli-groovy:4.7.4-SNAPSHOT')
@GrabExclude('org.codehaus.groovy:groovy-all') // work around GROOVY-7613
...
----
Expand Down Expand Up @@ -13533,13 +13533,13 @@ You can add picocli as an external dependency to your project, or you can includ
.Gradle
[source,groovy,role="primary"]
----
implementation 'info.picocli:picocli:4.7.3'
implementation 'info.picocli:picocli:4.7.4-SNAPSHOT'
----

.Gradle (Kotlin)
[source,kotlin,role="secondary"]
----
implementation("info.picocli:picocli:4.7.3")
implementation("info.picocli:picocli:4.7.4-SNAPSHOT")
----

.Maven
Expand All @@ -13548,50 +13548,50 @@ implementation("info.picocli:picocli:4.7.3")
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.3</version>
<version>4.7.4-SNAPSHOT</version>
</dependency>
----

.Scala SBT
[source,role="secondary"]
----
libraryDependencies += "info.picocli" % "picocli" % "4.7.3"
libraryDependencies += "info.picocli" % "picocli" % "4.7.4-SNAPSHOT"
----

.Ivy
[source,role="secondary"]
----
<dependency org="info.picocli" name="picocli" rev="4.7.3" />
<dependency org="info.picocli" name="picocli" rev="4.7.4-SNAPSHOT" />
----

.Grape
[source,role="secondary"]
----
@Grapes(
@Grab(group='info.picocli', module='picocli', version='4.7.3')
@Grab(group='info.picocli', module='picocli', version='4.7.4-SNAPSHOT')
)
----

.Leiningen
[source,role="secondary"]
----
[info.picocli/picocli "4.7.3"]
[info.picocli/picocli "4.7.4-SNAPSHOT"]
----

.Buildr
[source,role="secondary"]
----
'info.picocli:picocli:jar:4.7.3'
'info.picocli:picocli:jar:4.7.4-SNAPSHOT'
----

.JBang
[source,role="secondary"]
----
//DEPS info.picocli:picocli:4.7.3
//DEPS info.picocli:picocli:4.7.4-SNAPSHOT
----

=== Source

By using picocli in source form, you can avoid having an external dependency on picocli.
Picocli has only one source file: link:https://github.com/remkop/picocli/blob/v4.7.3/src/main/java/picocli/CommandLine.java[CommandLine.java].
Picocli has only one source file: link:https://github.com/remkop/picocli/blob/v4.7.4-SNAPSHOT/src/main/java/picocli/CommandLine.java[CommandLine.java].
This facilitates including picocli in your project: simply copy and paste the code of this file into a file called `CommandLine.java`, add it to your project, and enjoy!
2 changes: 1 addition & 1 deletion docs/picocli-programmatic-api.adoc
@@ -1,7 +1,7 @@
= Programmatic API
//:author: Remko Popma
//:email: rpopma@apache.org
:revnumber: 4.7.3
:revnumber: 4.7.4-SNAPSHOT
:revdate: 2023-04-16
:toc: left
:numbered:
Expand Down
8 changes: 4 additions & 4 deletions docs/quick-guide.adoc
@@ -1,7 +1,7 @@
= Quick Guide
//:author: Remko Popma
//:email: rpopma@apache.org
:revnumber: 4.7.3
:revnumber: 4.7.4-SNAPSHOT
:revdate: 2023-04-16
:toc: left
:numbered:
Expand Down Expand Up @@ -52,7 +52,7 @@ Below we show a small but fully functional example picocli-based command line ap

.Invoking the command
----
$ java -cp "myapp.jar;picocli-4.7.3.jar" ASCIIArt --font-size=9 Hello picocli
$ java -cp "myapp.jar;picocli-4.7.4-SNAPSHOT.jar" ASCIIArt --font-size=9 Hello picocli
# # # # # # #
# # # # #
# # *** # # **** #*** # **# **** **# # #
Expand Down Expand Up @@ -162,7 +162,7 @@ The application can be used as follows:

.Resolving two letter language codes
----
$ java -cp "myapp.jar;picocli-4.7.3.jar" ISOCodeResolver language de cs en sd se
$ java -cp "myapp.jar;picocli-4.7.4-SNAPSHOT.jar" ISOCodeResolver language de cs en sd se
de: German
cs: Czech
en: English
Expand All @@ -172,7 +172,7 @@ se: Northern Sami

.Resolving two letter country codes
----
$ java -cp "myapp.jar;picocli-4.7.3.jar" ISOCodeResolver country cn fr th ro no
$ java -cp "myapp.jar;picocli-4.7.4-SNAPSHOT.jar" ISOCodeResolver country cn fr th ro no
CN: China
FR: France
TH: Thailand
Expand Down
Expand Up @@ -58,7 +58,7 @@ public class DynamicProxyConfigGenerator {
},
footerHeading = "%nExample%n",
footer = {
" java -cp \"myapp.jar;picocli-4.7.3.jar;picocli-codegen-4.7.3.jar\" " +
" java -cp \"myapp.jar;picocli-4.7.4-SNAPSHOT.jar;picocli-codegen-4.7.4-SNAPSHOT.jar\" " +
"picocli.codegen.aot.graalvm.DynamicProxyConfigGenerator my.pkg.MyClass"
},
mixinStandardHelpOptions = true, version = "picocli-codegen gen-proxy-config " + CommandLine.VERSION)
Expand Down
Expand Up @@ -31,7 +31,7 @@ public class JniConfigGenerator {
},
footerHeading = "%nExample%n",
footer = {
" java -cp \"myapp.jar;picocli-4.7.3.jar;picocli-codegen-4.7.3.jar\" " +
" java -cp \"myapp.jar;picocli-4.7.4-SNAPSHOT.jar;picocli-codegen-4.7.4-SNAPSHOT.jar\" " +
"picocli.codegen.aot.graalvm.JniConfigGenerator my.pkg.MyClass"
},
mixinStandardHelpOptions = true, sortOptions = false,
Expand Down
Expand Up @@ -95,7 +95,7 @@ public class ReflectionConfigGenerator {
},
footerHeading = "%nExample%n",
footer = {
" java -cp \"myapp.jar;picocli-4.7.3.jar;picocli-codegen-4.7.3.jar\" " +
" java -cp \"myapp.jar;picocli-4.7.4-SNAPSHOT.jar;picocli-codegen-4.7.4-SNAPSHOT.jar\" " +
"picocli.codegen.aot.graalvm.ReflectionConfigGenerator my.pkg.MyClass"
},
mixinStandardHelpOptions = true, sortOptions = false,
Expand Down
Expand Up @@ -54,7 +54,7 @@ public class ResourceConfigGenerator {
},
footerHeading = "%nExample%n",
footer = {
" java -cp \"myapp.jar;picocli-4.7.3.jar;picocli-codegen-4.7.3.jar\" " +
" java -cp \"myapp.jar;picocli-4.7.4-SNAPSHOT.jar;picocli-codegen-4.7.4-SNAPSHOT.jar\" " +
"picocli.codegen.aot.graalvm.ResourceConfigGenerator my.pkg.MyClass"
},
mixinStandardHelpOptions = true, version = "picocli-codegen gen-resource-config " + CommandLine.VERSION)
Expand Down
Expand Up @@ -190,7 +190,7 @@ private void verboseDetailed(String message, Object... params) {
"",
"Example",
"-------",
" java -Duser.language=de -cp \"myapp.jar;picocli-4.7.3.jar;picocli-codegen-4.7.3.jar\" " +
" java -Duser.language=de -cp \"myapp.jar;picocli-4.7.4-SNAPSHOT.jar;picocli-codegen-4.7.4-SNAPSHOT.jar\" " +
"picocli.codegen.docgen.manpage.ManPageGenerator my.pkg.MyClass"
}
)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/picocli/AutoComplete.java
Expand Up @@ -116,7 +116,7 @@ private static boolean syspropDefinedAndNotFalse(String key) {
"",
"Example",
"-------",
" java -cp \"myapp.jar;picocli-4.7.3.jar\" \\",
" java -cp \"myapp.jar;picocli-4.7.4-SNAPSHOT.jar\" \\",
" picocli.AutoComplete my.pkg.MyClass"
},
exitCodeListHeading = "%nExit Codes:%n",
Expand Down

0 comments on commit 72a49fc

Please sign in to comment.