diff --git a/build.gradle.kts b/build.gradle.kts index be0ea40..6b86116 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java` war - id("com.palantir.git-version") version "4.0.0" + id("com.palantir.git-version") version "4.3.0" } // Автоматическое версионирование на основе git тегов @@ -65,11 +65,11 @@ dependencies { // Остальное как implementation // Logging - миграция с Log4j 1.2 на SLF4J + Logback - implementation("org.slf4j:slf4j-api:2.0.12") - implementation("ch.qos.logback:logback-classic:1.4.14") - implementation("ch.qos.logback:logback-core:1.4.14") - implementation("org.slf4j:jcl-over-slf4j:2.0.12") // Commons Logging через SLF4J - implementation("org.slf4j:log4j-over-slf4j:2.0.12") // Log4j 1.2 через SLF4J (для legacy кода) + implementation("org.slf4j:slf4j-api:2.0.18") + implementation("ch.qos.logback:logback-classic:1.6.1") + implementation("ch.qos.logback:logback-core:1.6.1") + implementation("org.slf4j:jcl-over-slf4j:2.0.18") // Commons Logging через SLF4J + implementation("org.slf4j:log4j-over-slf4j:2.0.18") // Log4j 1.2 через SLF4J (для legacy кода) implementation("org.json:json:20240303") implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1") @@ -80,12 +80,12 @@ dependencies { implementation("org.apache.struts:struts-el:1.3.10") implementation("org.apache.struts:struts-extras:1.3.10") - implementation("org.freemarker:freemarker:2.3.33") + implementation("org.freemarker:freemarker:2.3.34") - implementation("org.apache.lucene:lucene-core:7.6.0") - implementation("org.apache.lucene:lucene-analyzers-common:7.6.0") - implementation("org.apache.lucene:lucene-highlighter:7.6.0") - implementation("org.apache.lucene:lucene-queryparser:7.6.0") + implementation("org.apache.lucene:lucene-core:7.7.3") + implementation("org.apache.lucene:lucene-analyzers-common:7.7.3") + implementation("org.apache.lucene:lucene-highlighter:7.7.3") + implementation("org.apache.lucene:lucene-queryparser:7.7.3") implementation("org.hibernate:hibernate-core:5.6.15.Final") implementation("org.hibernate:hibernate-c3p0:5.6.15.Final") @@ -95,7 +95,7 @@ dependencies { // Удаляем log4j:log4j:1.2.17 - заменяем на SLF4J + Logback выше implementation("com.sun.mail:javax.mail:1.6.2") implementation("org.apache-extras.beanshell:bsh:2.0b6") - implementation("org.quartz-scheduler:quartz:2.3.2") + implementation("org.quartz-scheduler:quartz:2.5.2") implementation("xerces:xercesImpl:2.12.2") implementation("org.htmlparser:htmlparser:2.1") implementation("com.github.kevinsawicki:http-request:6.0") @@ -106,9 +106,9 @@ dependencies { implementation("org.codehaus.jackson:jackson-xc:1.9.13") implementation("org.codehaus.jackson:jackson-jaxrs:1.9.13") implementation("net.htmlparser.jericho:jericho-html:3.4") - implementation("com.mchange:c3p0:0.9.5.5") - implementation("org.postgresql:postgresql:42.7.7") - implementation("commons-codec:commons-codec:1.17.0") + implementation("com.mchange:c3p0:0.14.1") + implementation("org.postgresql:postgresql:42.7.13") + implementation("commons-codec:commons-codec:1.22.1") implementation("commons-fileupload:commons-fileupload:1.6.0") } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60..eddabd2 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a84e18..1e922f4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index ef07e01..249efbb 100755 --- a/gradlew +++ b/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # 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" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index 5eed7ee..8508ef6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -19,12 +19,12 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,30 +65,18 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH= -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -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! -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 - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%