diff --git a/docs/autocomplete.adoc b/docs/autocomplete.adoc index eb3e2bb3..88f282bd 100644 --- a/docs/autocomplete.adoc +++ b/docs/autocomplete.adoc @@ -1,7 +1,7 @@ = Autocomplete for Java Command Line Applications //:author: Remko Popma //:email: rpopma@apache.org -:revnumber: 4.3.2 +:revnumber: 4.3.3-SNAPSHOT :revdate: 2020-05-16 :toc: left :numbered: diff --git a/docs/index.adoc b/docs/index.adoc index 90f5103c..5a4ee89b 100644 --- a/docs/index.adoc +++ b/docs/index.adoc @@ -1,7 +1,7 @@ = picocli - a mighty tiny command line interface //:author: Remko Popma //:email: rpopma@apache.org -:revnumber: 4.3.2 +:revnumber: 4.3.3-SNAPSHOT :revdate: 2020-05-16 :toc: left :numbered: @@ -109,7 +109,7 @@ Below are examples of configuring Gradle or Maven to use picocli as an external ==== Gradle ---- -compile 'info.picocli:picocli:4.3.2' +compile 'info.picocli:picocli:4.3.3-SNAPSHOT' ---- ==== Maven @@ -117,7 +117,7 @@ compile 'info.picocli:picocli:4.3.2' info.picocli picocli - 4.3.2 + 4.3.3-SNAPSHOT ---- @@ -160,7 +160,7 @@ https://immutables.github.io/apt.html[This page] shows the steps to configure Ec info.picocli picocli-codegen - 4.3.2 + 4.3.3-SNAPSHOT @@ -176,8 +176,8 @@ See the https://github.com/remkop/picocli/tree/master/picocli-codegen[`picocli-c ===== Gradle ``` dependencies { - compile 'info.picocli:picocli:4.3.2' - annotationProcessor 'info.picocli:picocli-codegen:4.3.2' + compile 'info.picocli:picocli:4.3.3-SNAPSHOT' + annotationProcessor 'info.picocli:picocli-codegen:4.3.3-SNAPSHOT' } ``` @@ -195,7 +195,7 @@ then replace `annotationProcessor` with `kapt`: apply plugin: 'kotlin-kapt' // required dependencies { // ... - kapt 'info.picocli:picocli-codegen:4.3.2' + kapt 'info.picocli:picocli-codegen:4.3.3-SNAPSHOT' } ``` @@ -6090,14 +6090,14 @@ Maven: info.picocli picocli-spring-boot-starter - 4.3.2 + 4.3.3-SNAPSHOT ``` Gradle: ``` dependencies { - compile "info.picocli:picocli-spring-boot-starter:4.3.2" + compile "info.picocli:picocli-spring-boot-starter:4.3.3-SNAPSHOT" } ``` @@ -6750,7 +6750,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.3.2') +@Grab('info.picocli:picocli-groovy:4.3.3-SNAPSHOT') @GrabConfig(systemClassLoader=true) @Command(name = "myScript", mixinStandardHelpOptions = true, // add --help and --version options @@ -6772,7 +6772,7 @@ assert this.commandLine.commandName == "myScript" ---- WARNING: When upgrading scripts to picocli 4.0, just changing the version number is not enough! -Scripts should use `@Grab('info.picocli:picocli-groovy:4.3.2')`. The old artifact id `@Grab('info.picocli:picocli:4.3.2')` will not work, +Scripts should use `@Grab('info.picocli:picocli-groovy:4.3.3-SNAPSHOT')`. The old artifact id `@Grab('info.picocli:picocli:4.3.3-SNAPSHOT')` will not work, because the `@picocli.groovy.PicocliScript` annotation class and supporting classes have been moved into a separate module, `picocli-groovy`. ==== Older Versions of Groovy @@ -6781,7 +6781,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.3.2') +@Grab('info.picocli:picocli-groovy:4.3.3-SNAPSHOT') @GrabExclude('org.codehaus.groovy:groovy-all') // work around GROOVY-7613 ... ---- @@ -6922,7 +6922,7 @@ See the <> below. Copy and paste it into a file called `Comm === Gradle ---- -compile 'info.picocli:picocli:4.3.2' +compile 'info.picocli:picocli:4.3.3-SNAPSHOT' ---- === Maven @@ -6930,19 +6930,19 @@ compile 'info.picocli:picocli:4.3.2' info.picocli picocli - 4.3.2 + 4.3.3-SNAPSHOT ---- === Scala SBT ---- -libraryDependencies += "info.picocli" % "picocli" % "4.3.2" +libraryDependencies += "info.picocli" % "picocli" % "4.3.3-SNAPSHOT" ---- === Ivy ---- - + ---- === Source diff --git a/docs/picocli-programmatic-api.adoc b/docs/picocli-programmatic-api.adoc index b15c33e9..062d8613 100644 --- a/docs/picocli-programmatic-api.adoc +++ b/docs/picocli-programmatic-api.adoc @@ -1,7 +1,7 @@ = Programmatic API //:author: Remko Popma //:email: rpopma@apache.org -:revnumber: 4.3.2 +:revnumber: 4.3.3-SNAPSHOT :revdate: 2019-11-29 :toc: left :numbered: diff --git a/docs/quick-guide.adoc b/docs/quick-guide.adoc index bb259294..39e9d69c 100644 --- a/docs/quick-guide.adoc +++ b/docs/quick-guide.adoc @@ -1,7 +1,7 @@ = Quick Guide //:author: Remko Popma //:email: rpopma@apache.org -:revnumber: 4.3.2 +:revnumber: 4.3.3-SNAPSHOT :revdate: 2020-05-16 :toc: left :numbered: diff --git a/gradle.properties b/gradle.properties index d5214768..fa44744b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,12 +13,12 @@ junitVersion = 4.12 springBootVersion = 2.2.2.RELEASE # projectPreviousReleaseVersion is non-SNAPSHOT, only published releases -projectPreviousReleaseVersion = 4\\.3\\.1 +projectPreviousReleaseVersion = 4\\.3\\.2 # projectPreviousVersionRegex may be a SNAPSHOT -projectPreviousVersionRegex = 4\\.3\\.2-SNAPSHOT -projectVersion = 4.3.2 +projectPreviousVersionRegex = 4\\.3\\.2 +projectVersion = 4.3.3-SNAPSHOT releaseDate = 2020-05-16 -releaseDatePreviousRegex = 2020\\-05\\-15 +releaseDatePreviousRegex = 2020\\-05\\-16 systemRulesVersion = 1.17.1 diff --git a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/DynamicProxyConfigGenerator.java b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/DynamicProxyConfigGenerator.java index c7aac468..1753e500 100644 --- a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/DynamicProxyConfigGenerator.java +++ b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/DynamicProxyConfigGenerator.java @@ -58,7 +58,7 @@ public class DynamicProxyConfigGenerator { }, footerHeading = "%nExample%n", footer = { - " java -cp \"myapp.jar;picocli-4.3.2.jar;picocli-codegen-4.3.2.jar\" " + + " java -cp \"myapp.jar;picocli-4.3.3-SNAPSHOT.jar;picocli-codegen-4.3.3-SNAPSHOT.jar\" " + "picocli.codegen.aot.graalvm.DynamicProxyConfigGenerator my.pkg.MyClass" }, mixinStandardHelpOptions = true, version = "picocli-codegen gen-proxy-config " + CommandLine.VERSION) diff --git a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/JniConfigGenerator.java b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/JniConfigGenerator.java index a0fd8ab8..58d2980d 100644 --- a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/JniConfigGenerator.java +++ b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/JniConfigGenerator.java @@ -31,7 +31,7 @@ public class JniConfigGenerator { }, footerHeading = "%nExample%n", footer = { - " java -cp \"myapp.jar;picocli-4.3.2.jar;picocli-codegen-4.3.2.jar\" " + + " java -cp \"myapp.jar;picocli-4.3.3-SNAPSHOT.jar;picocli-codegen-4.3.3-SNAPSHOT.jar\" " + "picocli.codegen.aot.graalvm.JniConfigGenerator my.pkg.MyClass" }, mixinStandardHelpOptions = true, sortOptions = false, diff --git a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ReflectionConfigGenerator.java b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ReflectionConfigGenerator.java index 0669a0d2..0a362c07 100644 --- a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ReflectionConfigGenerator.java +++ b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ReflectionConfigGenerator.java @@ -95,7 +95,7 @@ public class ReflectionConfigGenerator { }, footerHeading = "%nExample%n", footer = { - " java -cp \"myapp.jar;picocli-4.3.2.jar;picocli-codegen-4.3.2.jar\" " + + " java -cp \"myapp.jar;picocli-4.3.3-SNAPSHOT.jar;picocli-codegen-4.3.3-SNAPSHOT.jar\" " + "picocli.codegen.aot.graalvm.ReflectionConfigGenerator my.pkg.MyClass" }, mixinStandardHelpOptions = true, sortOptions = false, diff --git a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ResourceConfigGenerator.java b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ResourceConfigGenerator.java index e62fe7b7..315abe29 100644 --- a/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ResourceConfigGenerator.java +++ b/picocli-codegen/src/main/java/picocli/codegen/aot/graalvm/ResourceConfigGenerator.java @@ -54,7 +54,7 @@ public class ResourceConfigGenerator { }, footerHeading = "%nExample%n", footer = { - " java -cp \"myapp.jar;picocli-4.3.2.jar;picocli-codegen-4.3.2.jar\" " + + " java -cp \"myapp.jar;picocli-4.3.3-SNAPSHOT.jar;picocli-codegen-4.3.3-SNAPSHOT.jar\" " + "picocli.codegen.aot.graalvm.ResourceConfigGenerator my.pkg.MyClass" }, mixinStandardHelpOptions = true, version = "picocli-codegen gen-resource-config " + CommandLine.VERSION) diff --git a/picocli-codegen/src/main/java/picocli/codegen/docgen/manpage/ManPageGenerator.java b/picocli-codegen/src/main/java/picocli/codegen/docgen/manpage/ManPageGenerator.java index 97498d4a..651aadfe 100644 --- a/picocli-codegen/src/main/java/picocli/codegen/docgen/manpage/ManPageGenerator.java +++ b/picocli-codegen/src/main/java/picocli/codegen/docgen/manpage/ManPageGenerator.java @@ -123,7 +123,7 @@ public class ManPageGenerator { "", "Example", "-------", - " java -cp \"myapp.jar;picocli-4.3.2.jar;picocli-codegen-4.3.2.jar\" " + + " java -cp \"myapp.jar;picocli-4.3.3-SNAPSHOT.jar;picocli-codegen-4.3.3-SNAPSHOT.jar\" " + "picocli.codegen.docgen.manpage.ManPageGenerator my.pkg.MyClass" } ) diff --git a/src/main/java/picocli/AutoComplete.java b/src/main/java/picocli/AutoComplete.java index 06185dab..0712f9cf 100644 --- a/src/main/java/picocli/AutoComplete.java +++ b/src/main/java/picocli/AutoComplete.java @@ -109,7 +109,7 @@ public class AutoComplete { "", "Example", "-------", - " java -cp \"myapp.jar;picocli-4.3.2.jar\" \\", + " java -cp \"myapp.jar;picocli-4.3.3-SNAPSHOT.jar\" \\", " picocli.AutoComplete my.pkg.MyClass" }, exitCodeListHeading = "%nExit Codes:%n", diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java index aac5118f..d229f69c 100644 --- a/src/main/java/picocli/CommandLine.java +++ b/src/main/java/picocli/CommandLine.java @@ -145,7 +145,7 @@ import static picocli.CommandLine.Help.Column.Overflow.WRAP; public class CommandLine { /** This is picocli version {@value}. */ - public static final String VERSION = "4.3.2"; + public static final String VERSION = "4.3.3-SNAPSHOT"; private final Tracer tracer = new Tracer(); private final CommandSpec commandSpec; @@ -4147,7 +4147,7 @@ public class CommandLine { @Target({ElementType.FIELD, ElementType.METHOD}) public @interface Spec { /** Identifies what kind of {@code CommandSpec} should be injected. - * @since 4.3.2 */ + * @since 4.3.3-SNAPSHOT */ enum Target { /** Injects the {@code CommandSpec} of the command where this {@code @Spec}-annotated program element is declared. */ SELF, @@ -4159,7 +4159,7 @@ public class CommandLine { /** Whether to inject the {@code CommandSpec} of this command (the default) or the {@code CommandSpec} * of the "mixee" command that receives the options and other command elements defined here. * @see Mixin - * @since 4.3.2 */ + * @since 4.3.3-SNAPSHOT */ Target value() default Target.SELF; } @@ -8113,7 +8113,7 @@ public class CommandLine { /** Returns whether this option is inherited from a parent command. * @see Option#scope() - * @since 4.3.2 */ + * @since 4.3.3-SNAPSHOT */ public boolean inherited() { return inherited; } /** Returns the type to convert the option or positional parameter to before {@linkplain #setValue(Object) setting} the value. */ @@ -8688,7 +8688,7 @@ public class CommandLine { /** Returns whether this option is inherited from a parent command. * @see Option#scope() - * @since 4.3.2 */ + * @since 4.3.3-SNAPSHOT */ public boolean inherited() { return inherited; } /** Returns the type to convert the option or positional parameter to before {@linkplain #setValue(Object) setting} the value. */ @@ -8799,7 +8799,7 @@ public class CommandLine { public T hidden(boolean hidden) { this.hidden = hidden; return self(); } /** Sets whether this option is inherited from a parent command, and returns this builder. - * @since 4.3.2 */ + * @since 4.3.3-SNAPSHOT */ public T inherited(boolean inherited) { this.inherited = inherited; return self(); } /** Sets the type to convert the option or positional parameter to before {@linkplain #setValue(Object) setting} the value, and returns this builder. diff --git a/src/test/java/picocli/AutoCompleteTest.java b/src/test/java/picocli/AutoCompleteTest.java index bb1cd715..cfa816aa 100644 --- a/src/test/java/picocli/AutoCompleteTest.java +++ b/src/test/java/picocli/AutoCompleteTest.java @@ -298,7 +298,7 @@ public class AutoCompleteTest { "%n" + "Example%n" + "-------%n" + - " java -cp \"myapp.jar;picocli-4.3.2.jar\" \\%n" + + " java -cp \"myapp.jar;picocli-4.3.3-SNAPSHOT.jar\" \\%n" + " picocli.AutoComplete my.pkg.MyClass%n"); @Test diff --git a/src/test/java/picocli/CommandLineTest.java b/src/test/java/picocli/CommandLineTest.java index 748e4273..931e5aa5 100644 --- a/src/test/java/picocli/CommandLineTest.java +++ b/src/test/java/picocli/CommandLineTest.java @@ -138,7 +138,7 @@ public class CommandLineTest { } @Test public void testVersion() { - assertEquals("4.3.2", CommandLine.VERSION); + assertEquals("4.3.3-SNAPSHOT", CommandLine.VERSION); } @Test public void testArrayPositionalParametersAreReplacedNotAppendedTo() {