From 079c5a8074f20a8ce6c6e9a1d31a6f5c0d00d609 Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Fri, 19 Sep 2025 15:42:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A8=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B2=D0=B5=D0=B4=D1=91=D0=BD=20=D0=BD=D0=B0?= =?UTF-8?q?=20gradle=209=20=D0=B8=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD?= =?UTF-8?q?=20ncore-gradle=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- build.gradle | 20 +++++++++++++------- dependencies.gradle | 23 +++++++++-------------- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 76ca9c8..820948b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ gen .idea/misc.xml ncore-properties-local.xml *.iml -/out \ No newline at end of file +/out +dependencies.gradle \ No newline at end of file diff --git a/build.gradle b/build.gradle index c931af7..591dcea 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'nu.studer.credentials' version('1.0.4') + id 'nu.studer.credentials' version('1.0.7') id 'idea' id 'eclipse' id 'application' @@ -9,7 +9,14 @@ plugins { id 'maven-publish' } -targetCompatibility = 1.8 +java { + withSourcesJar() + sourceCompatibility = project.properties.'java.version' ?: 17 +} + +test { + failOnNoDiscoveredTests = false +} ncore { coreVersion = project.properties.'biz.redsoft.ncore.version' @@ -34,12 +41,11 @@ repositories { } dependencies { - implementation 'javax.servlet:javax.servlet-api:3.1.0' - testCompileClasspath 'org.junit.jupiter:junit-jupiter:5.8.2' + testCompileOnly 'org.junit.jupiter:junit-jupiter:5.8.2' testImplementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.76' testImplementation 'org.apache.tomcat.embed:tomcat-embed-jasper:9.0.76' - runtimeClasspath files(ncoreGenerateControlDataJar) - runtimeClasspath files(genJar) + runtimeOnly files(ncoreGenerateControlDataJar) + runtimeOnly files(genJar) } @@ -70,7 +76,7 @@ gradle.services.get(LoggingOutputInternal).addStandardErrorListener(new Standard }) // --------------------- BUILD LOG SETTINGS ---------------------- -run.args = ['client', +run.args += ['client', '-config', 'ncore-properties.xml', '-config', 'ncore-properties-local.xml'] diff --git a/dependencies.gradle b/dependencies.gradle index c1992cf..6f41a6d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,15 +1,10 @@ -repositories { - mavenLocal() - maven { - def repo = project.properties.'biz.redsoft.public.repo' - url repo - if (repo.contains("http:/")) - allowInsecureProtocol = true - if (project.credentials.user != null && project.credentials.password != null) { - credentials { - username project.credentials.user - password project.credentials.password - } - } - } +dependencies { + implementation("biz.redsoft.ncore:ncore-JDK17:1.10.339.68") + updates("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:updates") + codemaker("biz.redsoft.ncore:ncore-JDK17:1.10.339.68") + implementation("biz.redsoft.ncore:ncore-util-JDK17:1.10.339.68") + implementation("biz.redsoft.ncore:ncore-cryptoapisec-JDK17:1.10.339.68") + implementation("biz.redsoft.ncore:ncore-jna-JDK17:1.10.339.68") + codemaker("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:gen") + testImplementation("biz.redsoft.ncore:ncore-JDK17:1.10.339.68:tests") } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8bbf5b2..c5308fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ -biz.redsoft.ncore.version=1.10.339.9 -org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError +biz.redsoft.ncore.version=1.10.339.68 +org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError org.gradle.daemon=false org.gradle.configureondemand=true -pluginVersion=3.0.96 +pluginVersion=4.0.18 biz.redsoft.public.repo=https://ncore-repo.red-soft.ru/repository/public -biz.redsoft.private.repo=https://ncore-repo.red-soft.ru/repository/ncore \ No newline at end of file +biz.redsoft.private.repo=https://ncore-repo.red-soft.ru/repository/ncorez \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..d30212c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists