diff --git a/README.md b/README.md index 846202f9..c127717a 100644 --- a/README.md +++ b/README.md @@ -167,18 +167,18 @@ io.foldright cffu - 1.0.0-Alpha30 + 1.0.0-Alpha31 ``` - For `Gradle` projects: Gradle Kotlin DSL ```groovy - implementation("io.foldright:cffu:1.0.0-Alpha30") + implementation("io.foldright:cffu:1.0.0-Alpha31") ``` Gradle Groovy DSL ```groovy - implementation 'io.foldright:cffu:1.0.0-Alpha30' + implementation 'io.foldright:cffu:1.0.0-Alpha31' ``` > `cffu`也支持`Kotlin`扩展方法的使用方式，参见[`cffu-kotlin/README.md`](cffu-kotlin/README.md)；使用方式的对比示例参见[`docs/usage-mode-demo.md`](docs/usage-mode-demo.md)。 @@ -515,16 +515,16 @@ public class MultipleActionsDemo { - 业务功能的正确性问题 - 系统稳定性问题，如导致线程中等待操作不能返回、耗尽线程池 -`cffu`提供了超时执行安全的新实现方法 [`cffuOrTimeout()`](https://foldright.io/api-docs/cffu/1.0.0-Alpha30/io/foldright/cffu/CompletableFutureUtils.html#cffuOrTimeout(C,long,java.util.concurrent.TimeUnit)) -/ [`cffuCompleteOnTimeout()`](https://foldright.io/api-docs/cffu/1.0.0-Alpha30/io/foldright/cffu/CompletableFutureUtils.html#cffuCompleteOnTimeout(C,T,long,java.util.concurrent.TimeUnit))。 +`cffu`提供了超时执行安全的新实现方法 [`cffuOrTimeout()`](https://foldright.io/api-docs/cffu/1.0.0-Alpha31/io/foldright/cffu/CompletableFutureUtils.html#cffuOrTimeout(C,long,java.util.concurrent.TimeUnit)) +/ [`cffuCompleteOnTimeout()`](https://foldright.io/api-docs/cffu/1.0.0-Alpha31/io/foldright/cffu/CompletableFutureUtils.html#cffuCompleteOnTimeout(C,T,long,java.util.concurrent.TimeUnit))。 更多说明参见： - 演示问题的[`DelayDysfunctionDemo.java`](https://github.com/foldright/cffu/blob/main/cffu-core/src/test/java/io/foldright/demo/CfDelayDysfunctionDemo.java) - `cffu backport`方法的`JavaDoc` - - [`orTimeout()`](https://foldright.io/api-docs/cffu/1.0.0-Alpha30/io/foldright/cffu/CompletableFutureUtils.html#orTimeout(C,long,java.util.concurrent.TimeUnit)) - - [`completeOnTimeout()`](https://foldright.io/api-docs/cffu/1.0.0-Alpha30/io/foldright/cffu/CompletableFutureUtils.html#completeOnTimeout(C,T,long,java.util.concurrent.TimeUnit)) + - [`orTimeout()`](https://foldright.io/api-docs/cffu/1.0.0-Alpha31/io/foldright/cffu/CompletableFutureUtils.html#orTimeout(C,long,java.util.concurrent.TimeUnit)) + - [`completeOnTimeout()`](https://foldright.io/api-docs/cffu/1.0.0-Alpha31/io/foldright/cffu/CompletableFutureUtils.html#completeOnTimeout(C,T,long,java.util.concurrent.TimeUnit)) ### 2.7 支持超时的`join`的方法 @@ -591,18 +591,18 @@ public class MultipleActionsDemo { io.foldright cffu - 1.0.0-Alpha30 + 1.0.0-Alpha31 ``` - For `Gradle` projects: Gradle Kotlin DSL ```groovy - implementation("io.foldright:cffu:1.0.0-Alpha30") + implementation("io.foldright:cffu:1.0.0-Alpha31") ``` Gradle Groovy DSL ```groovy - implementation 'io.foldright:cffu:1.0.0-Alpha30' + implementation 'io.foldright:cffu:1.0.0-Alpha31' ``` - `cffu bom`: - For `Maven` projects: @@ -611,7 +611,7 @@ public class MultipleActionsDemo { io.foldright cffu-bom - 1.0.0-Alpha30 + 1.0.0-Alpha31 pom import @@ -620,11 +620,11 @@ public class MultipleActionsDemo { Gradle Kotlin DSL ```groovy - implementation(platform("io.foldright:cffu-bom:1.0.0-Alpha30")) + implementation(platform("io.foldright:cffu-bom:1.0.0-Alpha31")) ``` Gradle Groovy DSL ```groovy - implementation platform('io.foldright:cffu-bom:1.0.0-Alpha30') + implementation platform('io.foldright:cffu-bom:1.0.0-Alpha31') ``` - [📌 `TransmittableThreadLocal(TTL)`](https://github.com/alibaba/transmittable-thread-local)的[`cffu executor wrapper SPI`实现](cffu-ttl-executor-wrapper)： - For `Maven` projects: @@ -633,7 +633,7 @@ public class MultipleActionsDemo { io.foldright cffu-ttl-executor-wrapper - 1.0.0-Alpha30 + 1.0.0-Alpha31 runtime ``` @@ -641,11 +641,11 @@ public class MultipleActionsDemo { Gradle Kotlin DSL ```groovy - runtimeOnly("io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha30") + runtimeOnly("io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha31") ``` Gradle Groovy DSL ```groovy - runtimeOnly 'io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha30' + runtimeOnly 'io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha31' ``` # 📚 更多资料 diff --git a/README_EN.md b/README_EN.md index 1f9d736c..c1083542 100644 --- a/README_EN.md +++ b/README_EN.md @@ -605,18 +605,18 @@ Current version of `Java API` documentation: https://foldright.io/api-docs/cffu/ io.foldright cffu - 1.0.0-Alpha30 + 1.0.0-Alpha31 ``` - For `Gradle` projects: Gradle Kotlin DSL ```groovy - implementation("io.foldright:cffu:1.0.0-Alpha30") + implementation("io.foldright:cffu:1.0.0-Alpha31") ``` Gradle Groovy DSL ```groovy - implementation 'io.foldright:cffu:1.0.0-Alpha30' + implementation 'io.foldright:cffu:1.0.0-Alpha31' ``` - [📌 `TransmittableThreadLocal(TTL)`](https://github.com/alibaba/transmittable-thread-local) implementation for [`cffu executor wrapper SPI`](cffu-ttl-executor-wrapper)： - For `Maven` projects: @@ -625,7 +625,7 @@ Current version of `Java API` documentation: https://foldright.io/api-docs/cffu/ io.foldright cffu-ttl-executor-wrapper - 1.0.0-Alpha30 + 1.0.0-Alpha31 runtime ``` @@ -633,11 +633,11 @@ Current version of `Java API` documentation: https://foldright.io/api-docs/cffu/ Gradle Kotlin DSL ```groovy - runtimeOnly("io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha30") + runtimeOnly("io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha31") ``` Gradle Groovy DSL ```groovy - runtimeOnly 'io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha30' + runtimeOnly 'io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha31' ``` # 📚 See also diff --git a/cffu-bom/pom.xml b/cffu-bom/pom.xml index 900c69e7..8adf2963 100644 --- a/cffu-bom/pom.xml +++ b/cffu-bom/pom.xml @@ -10,7 +10,7 @@ --> io.foldright cffu-bom - 1.x-SNAPSHOT + 1.0.0-Alpha31 pom ${project.artifactId} cffu bom diff --git a/cffu-core/pom.xml b/cffu-core/pom.xml index 60a09cc7..06627cbf 100644 --- a/cffu-core/pom.xml +++ b/cffu-core/pom.xml @@ -4,7 +4,7 @@ io.foldright cffu-parent - 1.x-SNAPSHOT + 1.0.0-Alpha31 ../pom.xml diff --git a/cffu-kotlin/README.md b/cffu-kotlin/README.md index 9f0cc07d..2b48bee3 100644 --- a/cffu-kotlin/README.md +++ b/cffu-kotlin/README.md @@ -19,16 +19,16 @@ This module provides the extension methods to leverage Kotlin language. io.foldright cffu-kotlin - 1.0.0-Alpha30 + 1.0.0-Alpha31 ``` - For `Gradle` projects: Gradle Kotlin DSL ```groovy - implementation("io.foldright:cffu-kotlin:1.0.0-Alpha30") + implementation("io.foldright:cffu-kotlin:1.0.0-Alpha31") ``` Gradle Groovy DSL ```groovy - implementation 'io.foldright:cffu-kotlin:1.0.0-Alpha30' + implementation 'io.foldright:cffu-kotlin:1.0.0-Alpha31' ``` diff --git a/cffu-kotlin/pom.xml b/cffu-kotlin/pom.xml index 23341785..8e4d34f3 100644 --- a/cffu-kotlin/pom.xml +++ b/cffu-kotlin/pom.xml @@ -4,7 +4,7 @@ io.foldright cffu-parent - 1.x-SNAPSHOT + 1.0.0-Alpha31 ../pom.xml diff --git a/cffu-listenable-future/README.md b/cffu-listenable-future/README.md index 6e928a47..a83ca0c0 100644 --- a/cffu-listenable-future/README.md +++ b/cffu-listenable-future/README.md @@ -15,16 +15,16 @@ io.foldright cffu-listenable-future - 1.0.0-Alpha30 + 1.0.0-Alpha31 ``` - For `Gradle` projects: Gradle Kotlin DSL ```groovy - implementation("io.foldright:cffu-listenable-future:1.0.0-Alpha30") + implementation("io.foldright:cffu-listenable-future:1.0.0-Alpha31") ``` Gradle Groovy DSL ```groovy - implementation 'io.foldright:cffu-listenable-future:1.0.0-Alpha30' + implementation 'io.foldright:cffu-listenable-future:1.0.0-Alpha31' ``` diff --git a/cffu-listenable-future/pom.xml b/cffu-listenable-future/pom.xml index 9652c1e2..e8000590 100644 --- a/cffu-listenable-future/pom.xml +++ b/cffu-listenable-future/pom.xml @@ -4,7 +4,7 @@ io.foldright cffu-parent - 1.x-SNAPSHOT + 1.0.0-Alpha31 ../pom.xml diff --git a/cffu-ttl-executor-wrapper/README.md b/cffu-ttl-executor-wrapper/README.md index a0645c2a..4890cf4f 100644 --- a/cffu-ttl-executor-wrapper/README.md +++ b/cffu-ttl-executor-wrapper/README.md @@ -18,18 +18,18 @@ This dependency should only be used at `Runtime`. io.foldright cffu-ttl-executor-wrapper runtime - 1.0.0-Alpha30 + 1.0.0-Alpha31 ``` - For `Gradle` projects: Gradle Kotlin DSL ```groovy - runtimeOnly("io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha30") + runtimeOnly("io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha31") ``` Gradle Groovy DSL ```groovy - runtimeOnly 'io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha30' + runtimeOnly 'io.foldright:cffu-ttl-executor-wrapper:1.0.0-Alpha31' ``` `cffu-ttl-executor-wrapper` has published to maven central, find the latest version at diff --git a/cffu-ttl-executor-wrapper/pom.xml b/cffu-ttl-executor-wrapper/pom.xml index e345edd6..630bf4db 100644 --- a/cffu-ttl-executor-wrapper/pom.xml +++ b/cffu-ttl-executor-wrapper/pom.xml @@ -4,7 +4,7 @@ io.foldright cffu-parent - 1.x-SNAPSHOT + 1.0.0-Alpha31 ../pom.xml diff --git a/demos/cffu-demo/pom.xml b/demos/cffu-demo/pom.xml index 0c7c0602..abdb1546 100644 --- a/demos/cffu-demo/pom.xml +++ b/demos/cffu-demo/pom.xml @@ -4,7 +4,7 @@ io.foldright.cffu-demos demos-parent - 1.x-SNAPSHOT + 1.0.0-Alpha31 ../pom.xml diff --git a/demos/cffu-kotlin-demo/pom.xml b/demos/cffu-kotlin-demo/pom.xml index 1a966385..ccf3af70 100644 --- a/demos/cffu-kotlin-demo/pom.xml +++ b/demos/cffu-kotlin-demo/pom.xml @@ -4,7 +4,7 @@ io.foldright.cffu-demos demos-parent - 1.x-SNAPSHOT + 1.0.0-Alpha31 ../pom.xml diff --git a/demos/pom.xml b/demos/pom.xml index fc411f31..5a6e4efa 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.foldright.cffu-demos demos-parent - 1.x-SNAPSHOT + 1.0.0-Alpha31 pom diff --git a/pom.xml b/pom.xml index 845832d3..7e57e2ba 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.foldright cffu-parent - 1.x-SNAPSHOT + 1.0.0-Alpha31 pom ${project.artifactId} cffu parent diff --git a/scripts/bump_cffu_version.sh b/scripts/bump_cffu_version.sh index 47f8ed99..527d942a 100755 --- a/scripts/bump_cffu_version.sh +++ b/scripts/bump_cffu_version.sh @@ -17,7 +17,10 @@ source "$SELF_DIR/bash-buddy/lib/maven_utils.sh" readonly old_version="$1" readonly new_version="$2" -# shellcheck disable=SC2046 -sed -i "s/1.x-SNAPSHOT/$new_version/g" $(rg "1.x-SNAPSHOT" -l -g '!scripts/') -# shellcheck disable=SC2046 -sed -i "s/$old_version/$new_version/g" $(rg "$old_version" -l -g '!scripts/') +{ rg "1.x-SNAPSHOT" -Fl -g '!scripts/' || true; } | + tr '\n' '\0' | + xargs --no-run-if-empty --null --verbose sed -i "s/1\.x-SNAPSHOT/$new_version/g" + +{ rg "$old_version" -Fl -g '!scripts/' || true; } | + tr '\n' '\0' | + xargs --no-run-if-empty --null --verbose sed -i "s/$old_version/$new_version/g"