From af622c10f7dc1adea2e315faadc999544723950c Mon Sep 17 00:00:00 2001 From: Remko Popma Date: Fri, 11 Jan 2019 01:10:47 +0900 Subject: [PATCH] Prepare for next development cycle --- build.gradle | 19 +++++++++---------- docs/autocomplete.adoc | 2 +- docs/index.adoc | 14 +++++++------- docs/picocli-3.0-programmatic-api.adoc | 2 +- docs/quick-guide.adoc | 2 +- gradle.properties | 8 ++++---- src/main/java/picocli/CommandLine.java | 2 +- src/test/java/picocli/AutoCompleteTest.java | 4 ++-- src/test/java/picocli/CommandLineTest.java | 2 +- 9 files changed, 27 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 5782bf0f..0db1ba04 100644 --- a/build.gradle +++ b/build.gradle @@ -237,6 +237,14 @@ task copyDocs(type: Copy) { into 'docs' } +allprojects { + ext { + bintrayDryRun = false //[Default: false] Whether to run this as dry-run, without deploying + bintrayPublish = false //[Default: false] Whether version should be auto published after an upload + bintrayOverride = false //[Default: false] Whether to override version artifacts already published + mavenOssSync = false //[Default: true] Determines whether to sync the version to Maven Central. + } +} ext { bintrayPackage = 'picocli' bintrayWebsiteUrl = 'http://picocli.info' @@ -300,14 +308,6 @@ publishing { } } } -allprojects { - ext { - bintrayDryRun = false //[Default: false] Whether to run this as dry-run, without deploying - bintrayPublish = false //[Default: false] Whether version should be auto published after an upload - bintrayOverride = false //[Default: false] Whether to override version artifacts already published - mavenOssSync = false //[Default: true] Determines whether to sync the version to Maven Central. - } -} /* Release procedure: 1. edit version numbers: remove -SNAPSHOT classifier @@ -320,8 +320,7 @@ Release procedure: 7a update README.md (latest version, release notes) 8. commit -m "Release picocli version ..." 9. tag v$version -10.a gradlew bintrayUpload - to publish to bintray.com -10.b gradlew bintrayPublish - to sign, publish and Maven central sync task) +10. gradlew bintrayUpload - to publish to bintray.com 11. edit version numbers: increase minor version and add -SNAPSHOT classifier 12. gradlew bumpVersion diff --git a/docs/autocomplete.adoc b/docs/autocomplete.adoc index 10b1f4cf..446d187a 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: 3.9.1 +:revnumber: 3.9.2-SNAPSHOT :revdate: 2019-01-10 :toc: left :numbered: diff --git a/docs/index.adoc b/docs/index.adoc index 09667755..c16ba4dc 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: 3.9.1 +:revnumber: 3.9.2-SNAPSHOT :revdate: 2019-01-10 :toc: left :numbered: @@ -3216,7 +3216,7 @@ The script body is executed if the user input was valid and did not request usag [source,groovy] ---- -@Grab('info.picocli:picocli:3.9.1') +@Grab('info.picocli:picocli:3.9.2-SNAPSHOT') @Command(name = "myScript", mixinStandardHelpOptions = true, // add --help and --version options description = "@|bold Groovy script|@ @|underline picocli|@ example") @@ -3241,7 +3241,7 @@ CAUTION: When using a Groovy version older than 2.4.7, use this workaround for t [source,groovy] ---- -@Grab('info.picocli:picocli:3.9.1') +@Grab('info.picocli:picocli:3.9.2-SNAPSHOT') @GrabExclude('org.codehaus.groovy:groovy-all') // work around GROOVY-7613 ... ---- @@ -3361,7 +3361,7 @@ See the <> below. Copy and paste it into a file called `Comm === Gradle ---- -compile 'info.picocli:picocli:3.9.1' +compile 'info.picocli:picocli:3.9.2-SNAPSHOT' ---- === Maven @@ -3369,19 +3369,19 @@ compile 'info.picocli:picocli:3.9.1' info.picocli picocli - 3.9.1 + 3.9.2-SNAPSHOT ---- === Scala SBT ---- -libraryDependencies += "info.picocli" % "picocli" % "3.9.1" +libraryDependencies += "info.picocli" % "picocli" % "3.9.2-SNAPSHOT" ---- === Ivy ---- - + ---- === Source diff --git a/docs/picocli-3.0-programmatic-api.adoc b/docs/picocli-3.0-programmatic-api.adoc index c5949bf9..bb4e80f6 100644 --- a/docs/picocli-3.0-programmatic-api.adoc +++ b/docs/picocli-3.0-programmatic-api.adoc @@ -1,7 +1,7 @@ = Programmatic API //:author: Remko Popma //:email: rpopma@apache.org -:revnumber: 3.9.1 +:revnumber: 3.9.2-SNAPSHOT :revdate: 2019-01-10 :toc: left :numbered: diff --git a/docs/quick-guide.adoc b/docs/quick-guide.adoc index a9a9b415..08344895 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: 3.9.1 +:revnumber: 3.9.2-SNAPSHOT :revdate: 2019-01-10 :toc: left :numbered: diff --git a/gradle.properties b/gradle.properties index 714709d8..2376f0f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,12 +8,12 @@ junitDepVersion = 4.11 junitVersion = 4.12 # projectPreviousReleaseVersion is non-SNAPSHOT, only published releases -projectPreviousReleaseVersion = 3\\.9\\.0 +projectPreviousReleaseVersion = 3\\.9\\.1 # projectPreviousVersionRegex may be a SNAPSHOT -projectPreviousVersionRegex = 3\\.9\\.1-SNAPSHOT -projectVersion = 3.9.1 +projectPreviousVersionRegex = 3\\.9\\.1 +projectVersion = 3.9.2-SNAPSHOT releaseDate = 2019-01-10 -releaseDatePreviousRegex = 2019\\-01\\-04 +releaseDatePreviousRegex = 2019\\-01\\-10 systemRulesVersion = 1.17.1 \ No newline at end of file diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java index aff05ae7..1fc16b57 100644 --- a/src/main/java/picocli/CommandLine.java +++ b/src/main/java/picocli/CommandLine.java @@ -141,7 +141,7 @@ import static picocli.CommandLine.Help.Column.Overflow.WRAP; public class CommandLine { /** This is picocli version {@value}. */ - public static final String VERSION = "3.9.1"; + public static final String VERSION = "3.9.2-SNAPSHOT"; private final Tracer tracer = new Tracer(); private final CommandSpec commandSpec; diff --git a/src/test/java/picocli/AutoCompleteTest.java b/src/test/java/picocli/AutoCompleteTest.java index 80293734..3d138cab 100644 --- a/src/test/java/picocli/AutoCompleteTest.java +++ b/src/test/java/picocli/AutoCompleteTest.java @@ -557,7 +557,7 @@ public class AutoCompleteTest { "# =======================\n" + "#\n" + "# Bash completion support for the `picocli.AutoComplete` command,\n" + - "# generated by [picocli](http://picocli.info/) version 3.9.1.\n" + + "# generated by [picocli](http://picocli.info/) version 3.9.2-SNAPSHOT.\n" + "#\n" + "# Installation\n" + "# ------------\n" + @@ -723,7 +723,7 @@ public class AutoCompleteTest { "# =======================\n" + "#\n" + "# Bash completion support for the `nondefault` command,\n" + - "# generated by [picocli](http://picocli.info/) version 3.9.1.\n" + + "# generated by [picocli](http://picocli.info/) version 3.9.2-SNAPSHOT.\n" + "#\n" + "# Installation\n" + "# ------------\n" + diff --git a/src/test/java/picocli/CommandLineTest.java b/src/test/java/picocli/CommandLineTest.java index 142b44f6..16c04f39 100644 --- a/src/test/java/picocli/CommandLineTest.java +++ b/src/test/java/picocli/CommandLineTest.java @@ -146,7 +146,7 @@ public class CommandLineTest { } @Test public void testVersion() { - assertEquals("3.9.1", CommandLine.VERSION); + assertEquals("3.9.2-SNAPSHOT", CommandLine.VERSION); } @Test public void testArrayPositionalParametersAreReplacedNotAppendedTo() {