Skip to content

Commit

Permalink
Merge branch 'main' into jarek/kraken-250_shed_lock
Browse files Browse the repository at this point in the history
  • Loading branch information
kuangxiang20240501 authored Dec 23, 2024
2 parents 914d63b + c77d99e commit d6b94de
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@ default boolean checkExpectString(PathCheck pathCheck, Object variable) {
variable,
(dataType == null ? null : dataType.getSimpleName()),
"String"));
} else if (StringUtils.isBlank((String) variable)) {
throwException(
pathCheck,
String.format(
EXPECT_INT_MSG,
extractCheckingPath(pathCheck.path()),
variable,
"empty string",
"Non Empty String"));
}
return true;
}
Expand Down
22 changes: 13 additions & 9 deletions release_schedule.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Main Branch
# Main Branch Versions

In main branch it only maintains **snapshot versions** and the first **rc version** of major releases.
In main branch it only maintains **snapshot versions** of major releases.

A new major version’s first snapshot version will start right after the previous major version’s release branch is made and the main branch typically will bumped into a snapshot version like 2.0.0-snapshot.0, 3.0.0-snapshot.0 .
A new major version’s first snapshot version will start right after the previous major version’s release branch is made and the main branch typically will bumped into a snapshot version like 2.0.0-snapshot.0, 3.0.0-snapshot.0 etc.

## 2.0.0
## 2.0.0 release schedule in Main branch

| Version | Release Content | Target Release Date | Actual Release Date |
| -----------------|:---------------------| --------------------:|--------------------:|
Expand All @@ -19,14 +19,18 @@ A new major version’s first snapshot version will start right after the previo
| 2.0.0-snapshot.8 | - to be added | Feb-24-2024 | |
| 2.0.0-snapshot.9 | - to be added | Mar-03-2024 | |
| 2.0.0-snapshot.10 | - to be added | Mar-10-2024 | |
| 2.0.0-rc.0 | - to be added | Mar-17-2024 | |
| 2.0.0-snapshot.11 | - to be added | Mar-17-2024 | |

# v1 Release Branch
# Release Branch Versions

Each major release(x.0.0) will have a dedicated release branch, the timing to create the release branch is when the first rc version(rc.0) of x.0.0 is created in main branch.
- When a release branch is created, it inherits the latest version number from the main.
Each major release(x.0.0) will have a dedicated release branch, the timing to create the release branch for x.0.0 is when the last snapshot release of it is created in main branch.
- The release branch of x.0.0 will be named with v{{x}}, e.g. v1, v2, v3 .....
- After a release branch is created, it will be bumped into the rc.0 version of x.0.0, e.g. 1.0.0-rc.0.
- Since version of rc.0, only critical bug fixes and any security issues are added to the release branch going forward until release x.0.0 is made.
- After release of x.0.0 is made in release branch, any bug fixes or minor features added to the release branch increment the minor version.
- After release of x.0.0 is made in release branch, any further bug fixes or minor features added to the release branch will increment the minor version which will be carefully planned depending customer issues.


## Release Schedule in v1 Release Branch

v1 release branch is maintaining all the releases related with 1.0.0.

Expand Down

0 comments on commit d6b94de

Please sign in to comment.