Skip to content

Commit e3960d7

Browse files
authored
Merge pull request #22 from maximkr/dependabot/gradle/minor-and-patch-8cc327413f
Bump the minor-and-patch group across 1 directory with 16 updates
2 parents fd4a0b1 + 2ab7e52 commit e3960d7

5 files changed

Lines changed: 31 additions & 46 deletions

File tree

‎build.gradle.kts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
`java`
33
war
4-
id("com.palantir.git-version") version "4.0.0"
4+
id("com.palantir.git-version") version "4.3.0"
55
}
66

77
// Автоматическое версионирование на основе git тегов
@@ -65,11 +65,11 @@ dependencies {
6565

6666
// Остальное как implementation
6767
// Logging - миграция с Log4j 1.2 на SLF4J + Logback
68-
implementation("org.slf4j:slf4j-api:2.0.12")
69-
implementation("ch.qos.logback:logback-classic:1.4.14")
70-
implementation("ch.qos.logback:logback-core:1.4.14")
71-
implementation("org.slf4j:jcl-over-slf4j:2.0.12") // Commons Logging через SLF4J
72-
implementation("org.slf4j:log4j-over-slf4j:2.0.12") // Log4j 1.2 через SLF4J (для legacy кода)
68+
implementation("org.slf4j:slf4j-api:2.0.18")
69+
implementation("ch.qos.logback:logback-classic:1.6.1")
70+
implementation("ch.qos.logback:logback-core:1.6.1")
71+
implementation("org.slf4j:jcl-over-slf4j:2.0.18") // Commons Logging через SLF4J
72+
implementation("org.slf4j:log4j-over-slf4j:2.0.18") // Log4j 1.2 через SLF4J (для legacy кода)
7373

7474
implementation("org.json:json:20240303")
7575
implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1")
@@ -80,12 +80,12 @@ dependencies {
8080
implementation("org.apache.struts:struts-el:1.3.10")
8181
implementation("org.apache.struts:struts-extras:1.3.10")
8282

83-
implementation("org.freemarker:freemarker:2.3.33")
83+
implementation("org.freemarker:freemarker:2.3.34")
8484

85-
implementation("org.apache.lucene:lucene-core:7.6.0")
86-
implementation("org.apache.lucene:lucene-analyzers-common:7.6.0")
87-
implementation("org.apache.lucene:lucene-highlighter:7.6.0")
88-
implementation("org.apache.lucene:lucene-queryparser:7.6.0")
85+
implementation("org.apache.lucene:lucene-core:7.7.3")
86+
implementation("org.apache.lucene:lucene-analyzers-common:7.7.3")
87+
implementation("org.apache.lucene:lucene-highlighter:7.7.3")
88+
implementation("org.apache.lucene:lucene-queryparser:7.7.3")
8989

9090
implementation("org.hibernate:hibernate-core:5.6.15.Final")
9191
implementation("org.hibernate:hibernate-c3p0:5.6.15.Final")
@@ -95,7 +95,7 @@ dependencies {
9595
// Удаляем log4j:log4j:1.2.17 - заменяем на SLF4J + Logback выше
9696
implementation("com.sun.mail:javax.mail:1.6.2")
9797
implementation("org.apache-extras.beanshell:bsh:2.0b6")
98-
implementation("org.quartz-scheduler:quartz:2.3.2")
98+
implementation("org.quartz-scheduler:quartz:2.5.2")
9999
implementation("xerces:xercesImpl:2.12.2")
100100
implementation("org.htmlparser:htmlparser:2.1")
101101
implementation("com.github.kevinsawicki:http-request:6.0")
@@ -106,9 +106,9 @@ dependencies {
106106
implementation("org.codehaus.jackson:jackson-xc:1.9.13")
107107
implementation("org.codehaus.jackson:jackson-jaxrs:1.9.13")
108108
implementation("net.htmlparser.jericho:jericho-html:3.4")
109-
implementation("com.mchange:c3p0:0.9.5.5")
110-
implementation("org.postgresql:postgresql:42.7.7")
111-
implementation("commons-codec:commons-codec:1.17.0")
109+
implementation("com.mchange:c3p0:0.14.1")
110+
implementation("org.postgresql:postgresql:42.7.13")
111+
implementation("commons-codec:commons-codec:1.22.1")
112112
implementation("commons-fileupload:commons-fileupload:1.6.0")
113113
}
114114

‎gradle/wrapper/gradle-wrapper.jar‎

2 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 12 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)