SpringCloud/stream-applications
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	stream-applications-build/pom.xml
This commit is contained in:
Corneil du Plessis
2023-06-09 15:45:25 +02:00
parent 7dc4d4a3f5 701a681def
commit 704a6ef4b1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
get-build-version-params.sh
View File

@@ -7,7 +7,7 @@ if (( sourced == 0 )); then
exit 1
fi
# get the target release version and type
export BUILD_VERSION=$(cat $SCDIR/version/RELEASE_VERSION)
export BUILD_VERSION=$(cat ./version/RELEASE_VERSION)
echo "BUILD_VERSION: $BUILD_VERSION"
set +e
IS_SNAPSHOT=$(echo $BUILD_VERSION | grep -E "^.*-SNAPSHOT$")
@@ -40,5 +40,5 @@ fi
echo "IS_VERSION_CHANGE: $IS_VERSION_CHANGE"
# get the next dev version
export NEXT_DEV_VERSION=$(cat $SCDIR/version/NEXT_DEV_VERSION)
export NEXT_DEV_VERSION=$(cat ./version/NEXT_DEV_VERSION)
echo "NEXT_DEV_VERSION: $NEXT_DEV_VERSION"

4
stream-applications-build/pom.xml
View File

@@ -35,11 +35,11 @@
<nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
<disable.nohttp.checks>true</disable.nohttp.checks>
<spring-javaformat-checkstyle.version>0.0.35</spring-javaformat-checkstyle.version>
<spring-boot.version>3.1.0</spring-boot.version>
<spring-boot.version>3.0.7</spring-boot.version>
<spring-kafka.version>3.0.7</spring-kafka.version>
<spring-rabbit.version>3.0.4</spring-rabbit.version>
<spring.version>6.0.9</spring.version>
<spring-integration.version>6.0.5</spring-integration.version>
<spring-cloud.version>2022.0.3</spring-cloud.version>
<spring-cloud-starters.version>4.0.3</spring-cloud-starters.version>