From 0d0a15a1590bc926e67b813a2ac56980a5541f47 Mon Sep 17 00:00:00 2001 From: "roman.kisluhin" Date: Thu, 15 Feb 2024 13:54:17 +0300 Subject: [PATCH 01/21] gitattributes --- .gitattributes | 77 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 567d4e9..1d79786 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,77 @@ +# Explicitly declare text=auto files you want to always be normalized and converted +# to native line endings on checkout. +*.txt text=auto +*.log text=auto +*.sql text=auto +*.template text=auto +*.properties text=auto +*.rc text=auto +*.ini text=auto +*.tpl text=auto +*.cfg text=auto *.bat text eol=crlf -gradlew text eol=lf +*.cmd text=auto +*.iss text=auto +*.ipr text=auto +*.iml text=auto +*.iws text=auto +*.java text=auto +*.jj text=auto +*.cup text=auto +*.pl text=auto +*.pas text=auto +*.pp text=auto +*.inc text=auto +*.dpk text=auto +*.bpk text=auto +*.dfm text=auto +*.xfm text=auto +*.lfm text=auto +*.dpr text=auto +*.bpr text=auto +*.bpg text=auto +*.lpr text=auto +*.lrs text=auto +*.frc text=auto +*.lpk text=auto +*.lpi text=auto +*.dproj text=auto +*.bdsproj text=auto +*.bdsgroup text=auto +*.groupproj text=auto +*.cbproj text=auto +*.dof text=auto +*.cpp text=auto +*.c text=auto +*.h text=auto +*.awk text=auto +*.sh text=auto +*.csv text=auto +*.url text=auto +*.tld text=auto +*.xml text=auto +*.xsl text=auto +*.xsd text=auto +*.jrxml text=auto +*.dtd text=auto +*.js text=auto +*.json text=auto +*.css text=auto +*.jsp text=auto +*.htm text=auto +*.html text=auto +*.rtx text=auto +*.tsv text=auto +*.etx text=auto +*.sgm text=auto +*.sgml text=auto +*.talk text=auto +*.vcf text=auto +makefile text=auto +COPYING text=auto +.gitattributes text=auto +.gitignore text=auto +*.gradle text=auto +.*src text=auto +*.stg text=auto +*.g text=auto From 2703daa196297aba335a3aeb0b81dd422d7c1f87 Mon Sep 17 00:00:00 2001 From: "roman.kisluhin" Date: Thu, 15 Feb 2024 13:56:07 +0300 Subject: [PATCH 02/21] gitattributes --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b7a32e1..713f4d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -biz.redsoft.ncore.version=1.9.+ +biz.redsoft.ncore.version=1.9.19.74 From 769c884f46a6e3f208bb68e096e71481e9b9cd9b Mon Sep 17 00:00:00 2001 From: "roman.kisluhin" Date: Tue, 9 Apr 2024 18:22:39 +0300 Subject: [PATCH 03/21] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82?= =?UTF-8?q?=D0=B5=D0=BA=D0=B0=20-=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D0=BB=D0=B0=20=D1=81=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0?= =?UTF-8?q?=D0=BC=D0=B8=20=D0=BD=D0=B0=20Windows=2010?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 33e442b..5a1baff 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { classpath 'biz.redsoft.gradle.ncore:gradle-ncore:1.2.+' - classpath 'nu.studer:gradle-credentials-plugin:1.0.4' + classpath 'nu.studer:gradle-credentials-plugin:1.0.7' } } From e76924ac17f9e14ec075c61e6383e6513ce9e6ce Mon Sep 17 00:00:00 2001 From: "roman.kisluhin" Date: Wed, 10 Apr 2024 18:01:07 +0300 Subject: [PATCH 04/21] ncore plugin updated --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5a1baff..884e38d 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath 'biz.redsoft.gradle.ncore:gradle-ncore:1.2.+' + classpath 'biz.redsoft.gradle.ncore:gradle-ncore:1.3.+' classpath 'nu.studer:gradle-credentials-plugin:1.0.7' } } From 864508a236280609549e73f6d82da79ad10d57cc Mon Sep 17 00:00:00 2001 From: "roman.kisluhin" Date: Wed, 19 Jun 2024 17:33:05 +0300 Subject: [PATCH 05/21] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=BB=D0=B8=D0=B2=D0=BA=D1=83=20=D0=BF=D0=B0=D1=82?= =?UTF-8?q?=D1=87=D0=B5=D0=B9=20=D0=BF=D1=80=D0=B8=20sync-full?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dist/bin/sync-full | 23 ++++++++--------------- src/dist/bin/sync-full.bat | 3 --- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/dist/bin/sync-full b/src/dist/bin/sync-full index 9a59b15..bd04f2a 100644 --- a/src/dist/bin/sync-full +++ b/src/dist/bin/sync-full @@ -1,15 +1,8 @@ -#!/bin/bash - -$(dirname $0)/starter patch updates - -if [ $? -ne 0 ] ; then - echo Error patch loading - exit 10 -fi - -$(dirname $0)/starter update -fullSync - -if [ $? -ne 0 ] ; then - echo Error updating database - exit 11 -fi +#!/bin/bash + +$(dirname $0)/starter update -fullSync + +if [ $? -ne 0 ] ; then + echo Error updating database + exit 11 +fi diff --git a/src/dist/bin/sync-full.bat b/src/dist/bin/sync-full.bat index 4fa76e4..62d5b0d 100644 --- a/src/dist/bin/sync-full.bat +++ b/src/dist/bin/sync-full.bat @@ -1,7 +1,4 @@ @echo off -call "%~dp0\starter.bat" patch updates -if ERRORLEVEL == 1 goto :EOF - call "%~dp0\starter.bat" update -fullSync @pause \ No newline at end of file From 60b666f9d550d030d120c7e603a9e0bf26a9baa1 Mon Sep 17 00:00:00 2001 From: "roman.kisluhin" Date: Wed, 19 Jun 2024 17:35:29 +0300 Subject: [PATCH 06/21] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=B0=D1=82=D1=87=D0=B5=D0=B9=20=D0=BF=D1=80=D0=B8=20sync-full?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dist/bin/sync-full | 2 +- src/dist/bin/sync-full.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dist/bin/sync-full b/src/dist/bin/sync-full index bd04f2a..450f55a 100644 --- a/src/dist/bin/sync-full +++ b/src/dist/bin/sync-full @@ -1,6 +1,6 @@ #!/bin/bash -$(dirname $0)/starter update -fullSync +$(dirname $0)/starter update -fullSync -skipUpdate if [ $? -ne 0 ] ; then echo Error updating database diff --git a/src/dist/bin/sync-full.bat b/src/dist/bin/sync-full.bat index 62d5b0d..f0ff8f9 100644 --- a/src/dist/bin/sync-full.bat +++ b/src/dist/bin/sync-full.bat @@ -1,4 +1,4 @@ @echo off -call "%~dp0\starter.bat" update -fullSync +call "%~dp0\starter.bat" update -fullSync -skipUpdate @pause \ No newline at end of file From 432ec83acddb1c812bd0f1209f8668f6600d9add Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Mon, 1 Jul 2024 16:12:56 +0300 Subject: [PATCH 07/21] Update build.gradle --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 884e38d..c3e20f6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - maven { url 'http://nexus.red-soft.biz/repository/public' } + maven { url 'https://ncore-repo.red-soft.ru/repository/public' } mavenLocal() } dependencies { @@ -29,7 +29,7 @@ ncore { repositories { mavenLocal() maven { - url 'http://nexus.red-soft.biz/repository/public' + url 'https://ncore-repo.red-soft.ru/repository/public' if (project.credentials.user != null && project.credentials.password != null) { credentials { username project.credentials.user From cbf9d5c2edd8ff8ab7db6d3104b358d2df09670b Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Mon, 1 Jul 2024 16:13:10 +0300 Subject: [PATCH 08/21] Update dependencies.gradle --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 8db6fd6..1853390 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ repositories { mavenCentral() mavenLocal() maven { - url 'https://nexus.red-soft.ru/repository/public' + url 'https://ncore-repo.red-soft.ru/repository/public' if (project.credentials.user != null && project.credentials.password != null) { credentials { username project.credentials.user From 5edc366eb5b316220da19707fcefa5a0de9ea54d Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Mon, 1 Jul 2024 16:13:17 +0300 Subject: [PATCH 09/21] Update dependencies.gradle --- dependencies.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1853390..6d15e95 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,5 +1,4 @@ repositories { - mavenCentral() mavenLocal() maven { url 'https://ncore-repo.red-soft.ru/repository/public' From bb80491ae053c926bab1d7963e785886d42add00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=9A=D0=B8=D1=81=D0=BB?= =?UTF-8?q?=D1=83=D1=85=D0=B8=D0=BD?= Date: Mon, 30 Sep 2024 17:06:57 +0300 Subject: [PATCH 10/21] creds plugin updated --- creds.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/creds.gradle b/creds.gradle index 2d3b997..29ddb75 100644 --- a/creds.gradle +++ b/creds.gradle @@ -6,7 +6,7 @@ buildscript { mavenLocal() } dependencies { - classpath 'nu.studer:gradle-credentials-plugin:1.0.4' + classpath 'nu.studer:gradle-credentials-plugin:1.0.7' } } From 302367c667aea7611c0cfbd77acb3bed882d3d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=9A=D0=B8=D1=81=D0=BB?= =?UTF-8?q?=D1=83=D1=85=D0=B8=D0=BD?= Date: Mon, 30 Sep 2024 17:25:40 +0300 Subject: [PATCH 11/21] NCore updated --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 713f4d8..66bffe4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -biz.redsoft.ncore.version=1.9.19.74 +biz.redsoft.ncore.version=1.9.19.251 From f61c15b1dae6fde0138fbe93c1f4fcb2c7e83d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=9A=D0=B8=D1=81=D0=BB?= =?UTF-8?q?=D1=83=D1=85=D0=B8=D0=BD?= Date: Tue, 1 Oct 2024 13:09:15 +0300 Subject: [PATCH 12/21] changed *.sh and files w/o ext to eol=lf --- .gitattributes | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1d79786..0a31b33 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,7 +9,7 @@ *.ini text=auto *.tpl text=auto *.cfg text=auto -*.bat text eol=crlf +*.bat text=auto *.cmd text=auto *.iss text=auto *.ipr text=auto @@ -45,7 +45,7 @@ *.c text=auto *.h text=auto *.awk text=auto -*.sh text=auto +*.sh text=auto eol=lf *.csv text=auto *.url text=auto *.tld text=auto @@ -67,7 +67,7 @@ *.sgml text=auto *.talk text=auto *.vcf text=auto -makefile text=auto +makefile text=auto eol=lf COPYING text=auto .gitattributes text=auto .gitignore text=auto @@ -75,3 +75,4 @@ COPYING text=auto .*src text=auto *.stg text=auto *.g text=auto +* eol=lf From dd66fb03db0b45305fc0909ad952952a1790f84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=9A=D0=B8=D1=81=D0=BB?= =?UTF-8?q?=D1=83=D1=85=D0=B8=D0=BD?= Date: Tue, 1 Oct 2024 13:11:36 +0300 Subject: [PATCH 13/21] changed *.sh and files w/o ext to eol=lf --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 0a31b33..6e77258 100644 --- a/.gitattributes +++ b/.gitattributes @@ -75,4 +75,4 @@ COPYING text=auto .*src text=auto *.stg text=auto *.g text=auto -* eol=lf +*. eol=lf From 637ffda0abfa6aa4da6f30c5a7b764ff31c866d2 Mon Sep 17 00:00:00 2001 From: roman Date: Tue, 1 Oct 2024 13:20:35 +0300 Subject: [PATCH 14/21] line endings fiexd --- src/dist/bin/sync-full | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dist/bin/sync-full b/src/dist/bin/sync-full index 450f55a..033c04e 100644 --- a/src/dist/bin/sync-full +++ b/src/dist/bin/sync-full @@ -1,8 +1,8 @@ -#!/bin/bash - -$(dirname $0)/starter update -fullSync -skipUpdate - -if [ $? -ne 0 ] ; then - echo Error updating database - exit 11 -fi +#!/bin/bash + +$(dirname $0)/starter update -fullSync -skipUpdate + +if [ $? -ne 0 ] ; then + echo Error updating database + exit 11 +fi From e6649123d51f8569c2412d0fd2502d138889c8e4 Mon Sep 17 00:00:00 2001 From: roman Date: Tue, 1 Oct 2024 13:22:44 +0300 Subject: [PATCH 15/21] line endings fiexd --- creds.gradle | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/creds.gradle b/creds.gradle index 29ddb75..6fc7f83 100644 --- a/creds.gradle +++ b/creds.gradle @@ -1,13 +1,13 @@ -buildscript { - repositories { - maven { - url 'https://nexus.red-soft.ru/repository/ncore-public' - } - mavenLocal() - } - dependencies { - classpath 'nu.studer:gradle-credentials-plugin:1.0.7' - } -} - -apply plugin: 'nu.studer.credentials' +buildscript { + repositories { + maven { + url 'https://nexus.red-soft.ru/repository/ncore-public' + } + mavenLocal() + } + dependencies { + classpath 'nu.studer:gradle-credentials-plugin:1.0.7' + } +} + +apply plugin: 'nu.studer.credentials' From 667ee2208cc68779f04d65a64ce9f1d7207ff316 Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Mon, 18 Nov 2024 16:47:46 +0300 Subject: [PATCH 16/21] Update Product.java --- src/main/java/biz/redsoft/sample/Product.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/biz/redsoft/sample/Product.java b/src/main/java/biz/redsoft/sample/Product.java index 5f76f02..204471d 100644 --- a/src/main/java/biz/redsoft/sample/Product.java +++ b/src/main/java/biz/redsoft/sample/Product.java @@ -4,9 +4,7 @@ import biz.redsoft.ncore.system.application.Application; import java.util.Map; -/** - * @author Victor Bellavin - */ + public class Product implements biz.redsoft.ncore.product.Product { private static String PRODUCT_NAME = Product.class.getPackage().getName(); From 63f268495e96375af74d72d752f3c754bef767cc Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Mon, 18 Nov 2024 16:48:03 +0300 Subject: [PATCH 17/21] remove author --- src/main/java/biz/redsoft/sample/Version.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/biz/redsoft/sample/Version.java b/src/main/java/biz/redsoft/sample/Version.java index d904c09..069abe8 100644 --- a/src/main/java/biz/redsoft/sample/Version.java +++ b/src/main/java/biz/redsoft/sample/Version.java @@ -10,9 +10,7 @@ import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author Victor Bellavin - */ + public class Version { public static final Logger LOGGER = LoggerFactory.getLogger(Version.class); From e642ed9ad597e484534a3be330d0058a9d41ce82 Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Mon, 18 Nov 2024 16:48:20 +0300 Subject: [PATCH 18/21] remove author --- src/test/java/biz/redsoft/sample/SampleTests.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/test/java/biz/redsoft/sample/SampleTests.java b/src/test/java/biz/redsoft/sample/SampleTests.java index 681fe80..d3059a2 100644 --- a/src/test/java/biz/redsoft/sample/SampleTests.java +++ b/src/test/java/biz/redsoft/sample/SampleTests.java @@ -9,9 +9,7 @@ import java.util.Properties; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -/** - * @author Victor Bellavin - */ + public class SampleTests { @Test public void testProductName() throws IOException { From fc1341cd444d0ea6496890ab96e8f367cddf3369 Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Tue, 19 Nov 2024 15:07:10 +0300 Subject: [PATCH 19/21] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index c3e20f6..45b41d5 100644 --- a/build.gradle +++ b/build.gradle @@ -76,6 +76,7 @@ run.args = ['client', task copyDist(type: Copy) { from distZip + from distTar from war def releaseDir if (project.hasProperty('biz.redsoft.release.dir') && project.getProperty('biz.redsoft.release.dir')) From a669f6e28cb109c8b400f6065d6d74b7a78b3b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=9A=D0=B8=D1=81=D0=BB?= =?UTF-8?q?=D1=83=D1=85=D0=B8=D0=BD?= Date: Tue, 19 Nov 2024 15:57:43 +0300 Subject: [PATCH 20/21] gitattributes changed --- .gitattributes | 151 +++++++++++++++++++++++++------------------------ 1 file changed, 76 insertions(+), 75 deletions(-) diff --git a/.gitattributes b/.gitattributes index 6e77258..dffc51b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,78 +1,79 @@ # Explicitly declare text=auto files you want to always be normalized and converted # to native line endings on checkout. -*.txt text=auto -*.log text=auto -*.sql text=auto -*.template text=auto -*.properties text=auto -*.rc text=auto -*.ini text=auto -*.tpl text=auto -*.cfg text=auto -*.bat text=auto -*.cmd text=auto -*.iss text=auto -*.ipr text=auto -*.iml text=auto -*.iws text=auto -*.java text=auto -*.jj text=auto -*.cup text=auto -*.pl text=auto -*.pas text=auto -*.pp text=auto -*.inc text=auto -*.dpk text=auto -*.bpk text=auto -*.dfm text=auto -*.xfm text=auto -*.lfm text=auto -*.dpr text=auto -*.bpr text=auto -*.bpg text=auto -*.lpr text=auto -*.lrs text=auto -*.frc text=auto -*.lpk text=auto -*.lpi text=auto -*.dproj text=auto -*.bdsproj text=auto -*.bdsgroup text=auto -*.groupproj text=auto -*.cbproj text=auto -*.dof text=auto -*.cpp text=auto -*.c text=auto -*.h text=auto -*.awk text=auto -*.sh text=auto eol=lf -*.csv text=auto -*.url text=auto -*.tld text=auto -*.xml text=auto -*.xsl text=auto -*.xsd text=auto -*.jrxml text=auto -*.dtd text=auto -*.js text=auto -*.json text=auto -*.css text=auto -*.jsp text=auto -*.htm text=auto -*.html text=auto -*.rtx text=auto -*.tsv text=auto -*.etx text=auto -*.sgm text=auto -*.sgml text=auto -*.talk text=auto -*.vcf text=auto -makefile text=auto eol=lf -COPYING text=auto -.gitattributes text=auto -.gitignore text=auto -*.gradle text=auto -.*src text=auto -*.stg text=auto -*.g text=auto +* text=auto +*.txt text +*.log text +*.sql text +*.template text +*.properties text +*.rc text +*.ini text +*.tpl text +*.cfg text +*.bat text +*.cmd text +*.iss text +*.ipr text +*.iml text +*.iws text +*.java text +*.jj text +*.cup text +*.pl text +*.pas text +*.pp text +*.inc text +*.dpk text +*.bpk text +*.dfm text +*.xfm text +*.lfm text +*.dpr text +*.bpr text +*.bpg text +*.lpr text +*.lrs text +*.frc text +*.lpk text +*.lpi text +*.dproj text +*.bdsproj text +*.bdsgroup text +*.groupproj text +*.cbproj text +*.dof text +*.cpp text +*.c text +*.h text +*.awk text +*.sh text eol=lf +*.csv text +*.url text +*.tld text +*.xml text +*.xsl text +*.xsd text +*.jrxml text +*.dtd text +*.js text +*.json text +*.css text +*.jsp text +*.htm text +*.html text +*.rtx text +*.tsv text +*.etx text +*.sgm text +*.sgml text +*.talk text +*.vcf text +makefile text eol=lf +COPYING text +.gitattributes text +.gitignore text +*.gradle text +.*src text +*.stg text +*.g text *. eol=lf From 134997c7f99b29da5052b3b94348a0fa42b8f4ee Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Tue, 25 Feb 2025 17:07:20 +0300 Subject: [PATCH 21/21] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B5=D0=B7?= =?UTF-8?q?=D0=B4=20=D0=BD=D0=B0=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=B3?= =?UTF-8?q?=D1=80=D0=B0=D0=B4=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 88 ++++++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 6 ++ .../biz.redsoft.sample/register.json | 6 +- 4 files changed, 67 insertions(+), 35 deletions(-) diff --git a/build.gradle b/build.gradle index 45b41d5..c0c720a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,22 +1,13 @@ -buildscript { - repositories { - maven { url 'https://ncore-repo.red-soft.ru/repository/public' } - mavenLocal() - } - dependencies { - classpath 'biz.redsoft.gradle.ncore:gradle-ncore:1.3.+' - classpath 'nu.studer:gradle-credentials-plugin:1.0.7' - } +plugins { + id 'nu.studer.credentials' version('1.0.4') + id 'idea' + id 'eclipse' + id 'application' + id 'java-library' + id 'war' + id 'gradle-ncore' version('3.0.65') } -group = 'biz.redsoft.sample' - -apply plugin: 'nu.studer.credentials' -apply plugin: 'idea' -apply plugin: 'application' -apply plugin: 'war' -apply plugin: 'ncore' - apply from: "dependencies.gradle" targetCompatibility = 1.8 @@ -27,26 +18,27 @@ ncore { } repositories { - mavenLocal() maven { url 'https://ncore-repo.red-soft.ru/repository/public' if (project.credentials.user != null && project.credentials.password != null) { - credentials { - username project.credentials.user - password project.credentials.password - } + credentials { + username project.credentials.user + password project.credentials.password + } } } } dependencies { - provided 'javax.servlet:javax.servlet-api:3.1.0' - - testCompile 'org.junit.jupiter:junit-jupiter:5.8.2' + implementation 'javax.servlet:javax.servlet-api:3.1.0' + testCompileClasspath '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) } + // writing build process to a log file // --------------------- BUILD LOG SETTINGS ---------------------- def tstamp = new Date().format('yyyy-MM-dd_HH-mm-ss') @@ -54,16 +46,20 @@ def buildLogDir = "${rootDir}/logs" mkdir("${buildLogDir}") def buildLog = new File("${buildLogDir}/${tstamp}_buildLog.log") -import org.gradle.internal.logging.* + +import org.gradle.internal.logging.LoggingOutputInternal + +import java.util.regex.Matcher + System.setProperty('org.gradle.color.error', 'RED') -gradle.services.get(LoggingOutputInternal).addStandardOutputListener (new StandardOutputListener () { +gradle.services.get(LoggingOutputInternal).addStandardOutputListener(new StandardOutputListener() { void onOutput(CharSequence output) { buildLog << output } }) -gradle.services.get(LoggingOutputInternal).addStandardErrorListener (new StandardOutputListener () { +gradle.services.get(LoggingOutputInternal).addStandardErrorListener(new StandardOutputListener() { void onOutput(CharSequence output) { buildLog << output } @@ -86,15 +82,38 @@ task copyDist(type: Copy) { into "$releaseDir/$project.name/$version" } +def versionPropertiesFilePath = sourceSets.main.resources.srcDirs[0].toString() + File.separator + "META-INF/ncore-product/${project.group}/version.properties" + release { - tagPrefix = 'v' + commitNewVersion.enabled(true) + failOnCommitNeeded = false + failOnPublishNeeded = true + failOnSnapshotDependencies = true + failOnUnversionedFiles = false + failOnUpdateNeeded = false + revertOnFail = true + preCommitText = '' + preTagCommitMessage = '[Gradle Release Plugin] - pre tag commit: ' + tagCommitMessage = '[Gradle Release Plugin] - creating tag: ' + newVersionCommitMessage = '[Gradle Release Plugin] - new version commit: ' + tagTemplate = "${project.name}/v${version}" + versionPropertyFile = versionPropertiesFilePath + versionProperties = [] + snapshotSuffix = '-SNAPSHOT' + buildTasks = ['buildRelease', 'commitNewVersion'] + ignoredSnapshotDependencies = [] + versionPatterns = [ + /(\d+)(\.)(\d+)(\.)(\d+)([^\d]*\u0024)/: { Matcher m, Project p -> + project.getVersion().newVersion().toString() + } + ] + pushReleaseVersionBranch = null } task buildRelease(type: GradleBuild) { tasks = ['clean', 'writeVersion', 'nbackup', 'build', 'copyDist', 'publish'] } -idea { module.scopes.PROVIDED.plus += [configurations.provided] } jar{ manifest{ @@ -105,6 +124,13 @@ jar{ } } -startScripts{ +startScripts { project.startScripts.defaultJvmOpts = ['-Dlogback.configurationFile=./config/logback.xml'] +} + +distTar { + duplicatesStrategy = DuplicatesStrategy.WARN +} +distZip { + duplicatesStrategy = DuplicatesStrategy.WARN } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8979c7f..eedfb1f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip diff --git a/settings.gradle b/settings.gradle index e3718fc..5571488 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,7 @@ +pluginManagement{ + repositories { + maven { url 'https://ncore-repo.red-soft.ru/repository/public' } + } +} + rootProject.name = 'sample' \ No newline at end of file diff --git a/src/main/resources/META-INF/ncore-product/biz.redsoft.sample/register.json b/src/main/resources/META-INF/ncore-product/biz.redsoft.sample/register.json index 7b492c4..3bddad5 100644 --- a/src/main/resources/META-INF/ncore-product/biz.redsoft.sample/register.json +++ b/src/main/resources/META-INF/ncore-product/biz.redsoft.sample/register.json @@ -1,4 +1,4 @@ { - "dependencies": [], - "register": {} -} + "dependencies" : [ ], + "register" : { } +} \ No newline at end of file