45 Commits

Author SHA1 Message Date
85fc8a07b2 Обновить gradle.properties 2025-08-13 13:27:20 +03:00
347e6274e3 Update build.gradle 2025-05-23 18:14:38 +03:00
9c6dc8b714 Update build.gradle 2025-05-23 18:05:30 +03:00
9af601cb30 Update build.gradle 2025-05-23 17:50:27 +03:00
0cb0312aae Update build.gradle 2025-05-23 17:44:22 +03:00
53c72731ec Update build.gradle 2025-05-23 17:33:50 +03:00
6770c43346 Update build.gradle 2025-05-23 17:15:29 +03:00
cbc1f71184 Update gradle.properties 2025-05-23 17:14:57 +03:00
40f41f5858 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	build.gradle
#	ncore-properties-template.xml
2025-05-23 17:13:04 +03:00
2a2a1ed029 merge 1.10 2025-05-23 17:11:52 +03:00
2839e859ab merge 1.10 2025-05-23 17:11:52 +03:00
ccd347ccb1 Update build.gradle 2025-05-23 16:36:46 +03:00
06f9972d76 Update ncore-properties-template.xml 2025-05-20 18:34:40 +03:00
10d2c67860 Update build.gradle 2025-05-20 17:55:00 +03:00
d44acad887 gradle updated 2025-04-01 19:49:19 +03:00
63859ce45d minor 2025-04-01 19:49:06 +03:00
fcd46c5264 Fixed repository url 2025-04-01 16:47:41 +03:00
134997c7f9 Переезд на новый градл 2025-02-25 17:07:20 +03:00
a669f6e28c gitattributes changed 2024-11-19 15:57:43 +03:00
fc1341cd44 Update build.gradle 2024-11-19 15:07:10 +03:00
e642ed9ad5 remove author 2024-11-18 16:48:20 +03:00
63f268495e remove author 2024-11-18 16:48:03 +03:00
667ee2208c Update Product.java 2024-11-18 16:47:46 +03:00
e6649123d5 line endings fiexd 2024-10-01 13:22:44 +03:00
637ffda0ab line endings fiexd 2024-10-01 13:20:35 +03:00
dd66fb03db changed *.sh and files w/o ext to eol=lf 2024-10-01 13:11:36 +03:00
f61c15b1da changed *.sh and files w/o ext to eol=lf 2024-10-01 13:09:15 +03:00
302367c667 NCore updated 2024-09-30 17:25:40 +03:00
bb80491ae0 creds plugin updated 2024-09-30 17:06:57 +03:00
5edc366eb5 Update dependencies.gradle 2024-07-01 16:13:17 +03:00
cbf9d5c2ed Update dependencies.gradle 2024-07-01 16:13:10 +03:00
432ec83acd Update build.gradle 2024-07-01 16:12:56 +03:00
60b666f9d5 Убрал применение патчей при sync-full 2024-06-19 17:35:29 +03:00
864508a236 Убрал проливку патчей при sync-full 2024-06-19 17:33:05 +03:00
e76924ac17 ncore plugin updated 2024-04-10 18:01:07 +03:00
769c884f46 Обновлена библиотека - работала с ошибками на Windows 10 2024-04-09 18:22:39 +03:00
2703daa196 gitattributes 2024-02-15 13:56:07 +03:00
1b4a24aef3 Merge branch 'master' of http://gitlab.red-soft.biz/ncore/ncore-sample 2024-02-15 13:55:13 +03:00
0d0a15a159 gitattributes 2024-02-15 13:54:17 +03:00
3c14c91c61 Добавлено применение зависимостей из dependencies.gradle 2024-01-29 17:15:22 +03:00
986a0c8a6c Добавлен файл зависимостей 2024-01-29 17:14:21 +03:00
d1d294ba6f Update ncore-properties-template.xml 2024-01-17 16:25:28 +03:00
84ba9b9f60 creds added 2023-11-23 13:03:37 +03:00
1e57c6fbcf db archive type changed from 7z to zip 2023-10-25 18:16:45 +03:00
19e47726c9 eol style for gradlew fixed 2023-10-25 17:51:43 +03:00
17 changed files with 413 additions and 206 deletions

80
.gitattributes vendored
View File

@ -1 +1,79 @@
*.bat text eol=crlf
# Explicitly declare text=auto files you want to always be normalized and converted
# to native line endings on checkout.
* 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

View File

@ -0,0 +1,14 @@
<component name="ArtifactManager">
<artifact type="war" name="Gradle : biz.redsoft.sample : sample-1.1.1.1-SNAPSHOT.war">
<output-path>$PROJECT_DIR$/build/libs</output-path>
<properties id="gradle-properties">
<options external-project-path="$PROJECT_DIR$">
<buildTaskPath>:war</buildTaskPath>
<cleanTaskPath>:cleanWar</cleanTaskPath>
</options>
</properties>
<root id="archive" name="sample-1.1.1.1-SNAPSHOT.war">
<element id="artifact" artifact-name="Gradle : biz.redsoft.sample : sample-1.1.1.1-SNAPSHOT.war (exploded)" />
</root>
</artifact>
</component>

43
.idea/compiler.xml generated
View File

@ -12,26 +12,6 @@
<entry name="!?*.clj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile name="Gradle Imported" enabled="true">
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="false">
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncoreAnnotationProcessor/1.0.5/ace0df7e3891cfc64042351df8616cf91e89c800/ncoreAnnotationProcessor-1.0.5.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service/1.0.1/c9779f7372192a96c957a3df1faeeabd07881085/auto-service-1.0.1.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-core/2.13.4/cf934c681294b97ef6d80082faeefbe1edadf56/jackson-core-2.13.4.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-annotations/2.13.4/858c6cc78e1f08a885b1613e1d817c829df70a6e/jackson-annotations-2.13.4.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-databind/2.13.4/98b0edfa8e4084078f10b7b356c300ded4a71491/jackson-databind-2.13.4.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service-annotations/1.0.1/ac86dacc0eb9285ea9d42eee6aad8629ca3a7432/auto-service-annotations-1.0.1.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.auto/auto-common/1.2/ca270191fd7d2a7297da7c8f29184206df10c67d/auto-common-1.2.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.guava/guava/31.0.1-jre/119ea2b2bc205b138974d351777b20f02b92704b/guava-31.0.1-jre.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/b421526c5f297295adef1c886e5246c39d4ac629/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.12.0/d5692f0526415fcc6de94bb5bfbd3afd9dd3b3e5/checker-qual-3.12.0.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.7.1/458d9042f7aa6fa9a634df902b37f544e15aacac/error_prone_annotations-2.7.1.jar" />
<entry name="$PROJECT_DIR$/../../../../../.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.3/ba035118bc8bac37d7eff77700720999acd9986d/j2objc-annotations-1.3.jar" />
</processorPath>
<module name="sample.main" />
</profile>
<profile name="Gradle Imported" enabled="true">
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="false">
@ -52,12 +32,35 @@
</processorPath>
<module name="biz.redsoft.sample.sample.main" />
</profile>
<profile name="Gradle Imported" enabled="true">
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="false">
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/biz.redsoft.ncore/ncoreAnnotationProcessor/1.0.10/52f347369a8b6f7467f9be747d42f1386c632c2c/ncoreAnnotationProcessor-1.0.10.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service/1.0.1/c9779f7372192a96c957a3df1faeeabd07881085/auto-service-1.0.1.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-core/2.13.4/cf934c681294b97ef6d80082faeefbe1edadf56/jackson-core-2.13.4.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-annotations/2.13.4/858c6cc78e1f08a885b1613e1d817c829df70a6e/jackson-annotations-2.13.4.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-databind/2.13.4/98b0edfa8e4084078f10b7b356c300ded4a71491/jackson-databind-2.13.4.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.service/auto-service-annotations/1.0.1/ac86dacc0eb9285ea9d42eee6aad8629ca3a7432/auto-service-annotations-1.0.1.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto/auto-common/1.2/ca270191fd7d2a7297da7c8f29184206df10c67d/auto-common-1.2.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/31.0.1-jre/119ea2b2bc205b138974d351777b20f02b92704b/guava-31.0.1-jre.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/b421526c5f297295adef1c886e5246c39d4ac629/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.12.0/d5692f0526415fcc6de94bb5bfbd3afd9dd3b3e5/checker-qual-3.12.0.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.7.1/458d9042f7aa6fa9a634df902b37f544e15aacac/error_prone_annotations-2.7.1.jar" />
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.3/ba035118bc8bac37d7eff77700720999acd9986d/j2objc-annotations-1.3.jar" />
</processorPath>
<module name="ncore-sample.sample.main" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="biz.redsoft.sample-sample" target="1.8" />
<module name="biz.redsoft.sample.sample" target="1.8" />
<module name="biz.redsoft.sample.sample.main" target="1.8" />
<module name="biz.redsoft.sample.sample.test" target="1.8" />
<module name="ncore-sample.sample.main" target="1.8" />
<module name="sample" target="1.8" />
<module name="sample.test" target="1.8" />
</bytecodeTargetLevel>
</component>
</project>

3
.idea/gradle.xml generated
View File

@ -4,13 +4,14 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="1.8" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>

4
.idea/modules.xml generated
View File

@ -6,7 +6,9 @@
<module fileurl="file://$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.iml" filepath="$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.main.iml" filepath="$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.test.iml" filepath="$PROJECT_DIR$/.idea/modules/biz.redsoft.sample.sample.test.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/sample.main.iml" filepath="$PROJECT_DIR$/.idea/modules/sample.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/2142120877/ncore-sample.sample.main.iml" filepath="$PROJECT_DIR$/.idea/modules/2142120877/ncore-sample.sample.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/2142120877/sample.iml" filepath="$PROJECT_DIR$/.idea/modules/2142120877/sample.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/2142120877/sample.test.iml" filepath="$PROJECT_DIR$/.idea/modules/2142120877/sample.test.iml" />
</modules>
</component>
</project>

View File

@ -5,11 +5,9 @@ plugins {
id 'application'
id 'java-library'
id 'war'
id 'gradle-ncore' version('3.0.59')
id 'gradle-ncore' version("$pluginVersion")
}
//apply from: "dependencies.gradle"
targetCompatibility = 1.8
ncore {
@ -17,10 +15,11 @@ ncore {
sourceEncoding = 'UTF-8'
}
group = 'biz.redsoft.sample'
repositories {
maven {
url 'https://ncore-repo.red-soft.ru/repository/public'
url 'https://ncore-repo.red-soft.ru/repository/ncore'
if (project.credentials.user != null && project.credentials.password != null) {
credentials {
username project.credentials.user
@ -40,8 +39,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')
@ -88,6 +85,7 @@ task copyDist(type: Copy) {
def versionPropertiesFilePath = sourceSets.main.resources.srcDirs[0].toString() + File.separator + "META-INF/ncore-product/${project.group}/version.properties"
release {
def newVersion = project.getVersion().toString().replace("-SNAPSHOT", "")
commitNewVersion.enabled(true)
failOnCommitNeeded = false
failOnPublishNeeded = true
@ -99,22 +97,50 @@ release {
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}"
tagTemplate = "${project.name}/v${newVersion}"
versionPropertyFile = versionPropertiesFilePath
versionProperties = []
snapshotSuffix = '-SNAPSHOT'
buildTasks = ['buildRelease', 'commitNewVersion']
buildTasks = ['ncoreTestDbConnection', 'clean', 'unSnapshotVersion', 'writeVersion', 'commitNewVersion', 'nbackup', 'build', 'copyDist', 'publish', 'dockerFile', 'commitNewVersion']
ignoredSnapshotDependencies = []
versionPatterns = [
/(\d+)(\.)(\d+)(\.)(\d+)([^\d]*\u0024)/: { Matcher m, Project p ->
project.getVersion().newVersion().toString()
}
]
pushReleaseVersionBranch = null
git.requireBranch.set('master')
pushReleaseVersionBranch = 'master'
}
task buildRelease(type: GradleBuild) {
tasks = ['clean', 'writeVersion', 'nbackup', 'build', 'copyDist', 'publish']
//Добавить флаг -Pbiz.redsoft.release=true к таске release для того чтобы публиковалось в releases и false если в snapshots.
//./gradlew release -Pbiz.redsoft.release=true
publishing {
repositories {
maven {
def isRepoCredetionals = project.hasProperty('biz.redsoft.repo.user') && project.hasProperty('biz.redsoft.repo.password')
def isCredentialsInsideBuildScript = project.credentials.user != null && project.credentials.password != null
println(isRepoCredetionals ? "Using repoCredentials for publish..." :
isCredentialsInsideBuildScript ? "Using buildScript credentials for publish..." : "Credentials are not presented!!!")
if (isRepoCredetionals) {
credentials {
username project.'biz.redsoft.repo.user'
password project.'biz.redsoft.repo.password'
}
} else if (isCredentialsInsideBuildScript) {
credentials {
username project.credentials.user
password project.credentials.password
}
}
def suffix = project.findProperty('biz.redsoft.release') ? 'releases' : 'snapshots'
url "https://ncore-repo.red-soft.ru/repository/${suffix}"
}
}
publications {
mavenJava(MavenPublication) {
from components.java
}
}
}
@ -136,6 +162,4 @@ distTar {
}
distZip {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
ncoreRestoreDB.writeToWebProps = false
ncoreRestoreDB.generateUniqueDBPath = false
}

13
creds.gradle Normal file
View File

@ -0,0 +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'

View File

@ -1,12 +1,9 @@
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
}
}
}
dependencies {
implementation("biz.redsoft.ncore:ncore:1.10.275.0")
updates("biz.redsoft.ncore:ncore:1.10.275.0:updates")
codemaker("biz.redsoft.ncore:ncore:1.10.275.0")
implementation("biz.redsoft.ncore:ncore-util:1.10.275.0")
implementation("biz.redsoft.ncore:ncore-cryptoapisec:1.10.275.0")
implementation("biz.redsoft.ncore:ncore-jna:1.10.275.0")
codemaker("biz.redsoft.ncore:ncore-gen:1.10.275.0")
}

View File

@ -1,4 +1,7 @@
biz.redsoft.ncore.version=1.10.50.0
biz.redsoft.ncore.version=1.10.339.9
org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
org.gradle.daemon=true
org.gradle.configureondemand=true
org.gradle.daemon=false
org.gradle.configureondemand=true
pluginVersion=3.0.96
biz.redsoft.public.repo=https://ncore-repo.red-soft.ru/repository/public
biz.redsoft.private.repo=https://ncore-repo.red-soft.ru/repository/ncore

Binary file not shown.

View File

@ -1,5 +1,6 @@
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-7.6.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

302
gradlew vendored
View File

@ -1,78 +1,129 @@
#!/usr/bin/env sh
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## Gradle start up script for UN*X
##
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
MAX_FD=maximum
warn () {
echo "$*"
}
} >&2
die () {
echo
echo "$*"
echo
exit 1
}
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD="$JAVA_HOME/bin/java"
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@ -89,84 +140,105 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"

56
gradlew.bat vendored
View File

@ -1,4 +1,20 @@
@if "%DEBUG%" == "" @echo off
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@ -9,19 +25,23 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -35,7 +55,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@ -45,38 +65,26 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal

View File

@ -1,13 +1,6 @@
#!/bin/bash
$(dirname $0)/starter patch updates
if [ $? -ne 0 ] ; then
echo Error patch loading
exit 10
fi
$(dirname $0)/starter update -fullSync
$(dirname $0)/starter update -fullSync -skipUpdate
if [ $? -ne 0 ] ; then
echo Error updating database

View File

@ -1,7 +1,4 @@
@echo off
call "%~dp0\starter.bat" patch updates
if ERRORLEVEL == 1 goto :EOF
call "%~dp0\starter.bat" update -fullSync
call "%~dp0\starter.bat" update -fullSync -skipUpdate
@pause

View File

@ -10,6 +10,7 @@ import java.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Version {
public static final Logger LOGGER = LoggerFactory.getLogger(Version.class);

View File

@ -1,4 +1,4 @@
{
"dependencies": [],
"register": {}
}
"dependencies" : [ ],
"register" : { }
}