Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle
#	ncore-properties-template.xml
This commit is contained in:
2025-05-23 17:13:04 +03:00

View File

@ -5,7 +5,7 @@ plugins {
id 'application'
id 'java-library'
id 'war'
id 'gradle-ncore' version('3.0.59')
id 'gradle-ncore' version("$pluginVersion")
}
targetCompatibility = 1.8
@ -15,7 +15,6 @@ ncore {
sourceEncoding = 'UTF-8'
}
repositories {
maven {
url 'https://ncore-repo.red-soft.ru/repository/ncore'
@ -38,8 +37,6 @@ dependencies {
}
group = 'biz.redsoft.sample'
// writing build process to a log file
// --------------------- BUILD LOG SETTINGS ----------------------
def tstamp = new Date().format('yyyy-MM-dd_HH-mm-ss')