Skip to content

Commit 412dd09

Browse files
committed
Merge branch 'main' into renovate/log4j2-monorepo
2 parents 963cd7f + bef272f commit 412dd09

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

samples/sample-all-deactivated/build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
implementation("cglib:cglib-nodep:3.3.0")
1111
implementation("cglib:cglib:3.3.0")
1212
implementation("ch.qos.logback:logback-classic:1.5.18")
13-
implementation("com.github.librepdf:openpdf:2.0.5")
13+
implementation("com.github.librepdf:openpdf:2.2.2")
1414
implementation("com.github.spotbugs:spotbugs-annotations:4.9.3")
1515
implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1")
1616
implementation("com.google.code.findbugs:annotations:3.0.1")
@@ -128,13 +128,13 @@ dependencies {
128128
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.25.0")
129129
implementation("org.apache.logging.log4j:log4j-to-slf4j:2.25.0")
130130
implementation("org.apache.solr:solr-commons-csv:3.5.0")
131-
implementation("org.apache.tomcat.embed:tomcat-embed-core:11.0.7")
132-
implementation("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.7")
131+
implementation("org.apache.tomcat.embed:tomcat-embed-core:11.0.8")
132+
implementation("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.8")
133133
implementation("org.apache.tomcat:servlet-api:6.0.53")
134-
implementation("org.apache.tomcat:tomcat-annotations-api:11.0.7")
135-
implementation("org.apache.tomcat:tomcat-servlet-api:11.0.7")
136-
implementation("org.apache.tomcat:tomcat-websocket-api:11.0.7")
137-
implementation("org.apache.tomcat:tomcat-websocket-client-api:11.0.7")
134+
implementation("org.apache.tomcat:tomcat-annotations-api:11.0.8")
135+
implementation("org.apache.tomcat:tomcat-servlet-api:11.0.8")
136+
implementation("org.apache.tomcat:tomcat-websocket-api:11.0.8")
137+
implementation("org.apache.tomcat:tomcat-websocket-client-api:11.0.8")
138138
implementation("org.apache.velocity:velocity-engine-core:2.4.1")
139139
implementation("org.apache.velocity:velocity:1.7")
140140
implementation("org.bouncycastle:bc-fips-debug:2.1.0")
@@ -244,7 +244,7 @@ dependencies {
244244
implementation("org.jzy3d:jzy3d-jGL-awt:2.2.1")
245245
implementation("org.lz4:lz4-java:1.8.0")
246246
implementation("org.ow2.asm:asm:9.8")
247-
implementation("org.postgresql:postgresql:42.7.6")
247+
implementation("org.postgresql:postgresql:42.7.7")
248248
implementation("org.slf4j:jcl-over-slf4j:2.0.17")
249249
implementation("org.slf4j:jul-to-slf4j:2.0.17")
250250
implementation("org.slf4j:log4j-over-slf4j:2.0.17")

samples/sample-all-deactivated/build.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ compileClasspath - Compile classpath for source set 'main'.
99
+--- cglib:cglib-nodep:3.3.0 FAILED
1010
+--- cglib:cglib:3.3.0 FAILED
1111
+--- ch.qos.logback:logback-classic:1.5.18 FAILED
12-
+--- com.github.librepdf:openpdf:2.0.5 FAILED
12+
+--- com.github.librepdf:openpdf:2.2.2 FAILED
1313
+--- com.github.spotbugs:spotbugs-annotations:4.9.3 FAILED
1414
+--- com.github.stephenc.jcip:jcip-annotations:1.0-1 FAILED
1515
+--- com.google.code.findbugs:annotations:3.0.1 FAILED
@@ -136,13 +136,13 @@ compileClasspath - Compile classpath for source set 'main'.
136136
+--- org.apache.logging.log4j:log4j-slf4j2-impl:2.25.0 FAILED
137137
+--- org.apache.logging.log4j:log4j-to-slf4j:2.25.0 FAILED
138138
+--- org.apache.solr:solr-commons-csv:3.5.0 FAILED
139-
+--- org.apache.tomcat.embed:tomcat-embed-core:11.0.7 FAILED
140-
+--- org.apache.tomcat.embed:tomcat-embed-websocket:11.0.7 FAILED
139+
+--- org.apache.tomcat.embed:tomcat-embed-core:11.0.8 FAILED
140+
+--- org.apache.tomcat.embed:tomcat-embed-websocket:11.0.8 FAILED
141141
+--- org.apache.tomcat:servlet-api:6.0.53 FAILED
142-
+--- org.apache.tomcat:tomcat-annotations-api:11.0.7 FAILED
143-
+--- org.apache.tomcat:tomcat-servlet-api:11.0.7 FAILED
144-
+--- org.apache.tomcat:tomcat-websocket-api:11.0.7 FAILED
145-
+--- org.apache.tomcat:tomcat-websocket-client-api:11.0.7 FAILED
142+
+--- org.apache.tomcat:tomcat-annotations-api:11.0.8 FAILED
143+
+--- org.apache.tomcat:tomcat-servlet-api:11.0.8 FAILED
144+
+--- org.apache.tomcat:tomcat-websocket-api:11.0.8 FAILED
145+
+--- org.apache.tomcat:tomcat-websocket-client-api:11.0.8 FAILED
146146
+--- org.apache.velocity:velocity-engine-core:2.4.1 FAILED
147147
+--- org.apache.velocity:velocity:1.7 FAILED
148148
+--- org.bouncycastle:bc-fips-debug:2.1.0 FAILED
@@ -252,7 +252,7 @@ compileClasspath - Compile classpath for source set 'main'.
252252
+--- org.jzy3d:jzy3d-jGL-awt:2.2.1 FAILED
253253
+--- org.lz4:lz4-java:1.8.0 FAILED
254254
+--- org.ow2.asm:asm:9.8 FAILED
255-
+--- org.postgresql:postgresql:42.7.6 FAILED
255+
+--- org.postgresql:postgresql:42.7.7 FAILED
256256
+--- org.slf4j:jcl-over-slf4j:2.0.17 FAILED
257257
+--- org.slf4j:jul-to-slf4j:2.0.17 FAILED
258258
+--- org.slf4j:log4j-over-slf4j:2.0.17 FAILED

samples/sample-all/build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
implementation("cglib:cglib-nodep:3.3.0")
1414
implementation("cglib:cglib:3.3.0")
1515
implementation("ch.qos.logback:logback-classic:1.5.18")
16-
implementation("com.github.librepdf:openpdf:2.0.5")
16+
implementation("com.github.librepdf:openpdf:2.2.2")
1717
implementation("com.github.spotbugs:spotbugs-annotations:4.9.3")
1818
implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1")
1919
implementation("com.google.code.findbugs:annotations:3.0.1")
@@ -131,13 +131,13 @@ dependencies {
131131
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.25.0")
132132
implementation("org.apache.logging.log4j:log4j-to-slf4j:2.25.0")
133133
implementation("org.apache.solr:solr-commons-csv:3.5.0")
134-
implementation("org.apache.tomcat.embed:tomcat-embed-core:11.0.7")
135-
implementation("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.7")
134+
implementation("org.apache.tomcat.embed:tomcat-embed-core:11.0.8")
135+
implementation("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.8")
136136
implementation("org.apache.tomcat:servlet-api:6.0.53")
137-
implementation("org.apache.tomcat:tomcat-annotations-api:11.0.7")
138-
implementation("org.apache.tomcat:tomcat-servlet-api:11.0.7")
139-
implementation("org.apache.tomcat:tomcat-websocket-api:11.0.7")
140-
implementation("org.apache.tomcat:tomcat-websocket-client-api:11.0.7")
137+
implementation("org.apache.tomcat:tomcat-annotations-api:11.0.8")
138+
implementation("org.apache.tomcat:tomcat-servlet-api:11.0.8")
139+
implementation("org.apache.tomcat:tomcat-websocket-api:11.0.8")
140+
implementation("org.apache.tomcat:tomcat-websocket-client-api:11.0.8")
141141
implementation("org.apache.velocity:velocity-engine-core:2.4.1")
142142
implementation("org.apache.velocity:velocity:1.7")
143143
implementation("org.bouncycastle:bc-fips-debug:2.1.0")
@@ -247,7 +247,7 @@ dependencies {
247247
implementation("org.jzy3d:jzy3d-jGL-awt:2.2.1")
248248
implementation("org.lz4:lz4-java:1.8.0")
249249
implementation("org.ow2.asm:asm:9.8")
250-
implementation("org.postgresql:postgresql:42.7.6")
250+
implementation("org.postgresql:postgresql:42.7.7")
251251
implementation("org.slf4j:jcl-over-slf4j:2.0.17")
252252
implementation("org.slf4j:jul-to-slf4j:2.0.17")
253253
implementation("org.slf4j:log4j-over-slf4j:2.0.17")

samples/sample-all/build.out

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ compileClasspath - Compile classpath for source set 'main'.
3030
+--- ch.qos.logback:logback-classic:1.5.18 -> org.slf4j:slf4j-simple:2.0.17
3131
| +--- org.slf4j:slf4j-api:2.0.17 (*)
3232
| \--- org.slf4j:slf4j-bom:2.0.17 (*)
33-
+--- com.github.librepdf:openpdf:2.0.5 -> com.lowagie:itext:4.2.2
33+
+--- com.github.librepdf:openpdf:2.2.2 -> com.lowagie:itext:4.2.2
3434
| \--- com.itextpdf:itextpdf:5.5.6
3535
+--- com.github.spotbugs:spotbugs-annotations:4.9.3
3636
| \--- com.google.code.findbugs:jsr305:3.0.2
@@ -194,13 +194,13 @@ compileClasspath - Compile classpath for source set 'main'.
194194
+--- org.apache.logging.log4j:log4j-slf4j2-impl:2.25.0 -> org.slf4j:slf4j-simple:2.0.17 (*)
195195
+--- org.apache.logging.log4j:log4j-to-slf4j:2.25.0 (*)
196196
+--- org.apache.solr:solr-commons-csv:3.5.0 (*)
197-
+--- org.apache.tomcat.embed:tomcat-embed-core:11.0.7 -> jakarta.servlet:jakarta.servlet-api:6.1.0
198-
+--- org.apache.tomcat.embed:tomcat-embed-websocket:11.0.7 -> jakarta.websocket:jakarta.websocket-api:2.2.0
197+
+--- org.apache.tomcat.embed:tomcat-embed-core:11.0.8 -> jakarta.servlet:jakarta.servlet-api:6.1.0
198+
+--- org.apache.tomcat.embed:tomcat-embed-websocket:11.0.8 -> jakarta.websocket:jakarta.websocket-api:2.2.0
199199
+--- org.apache.tomcat:servlet-api:6.0.53 -> javax.servlet:javax.servlet-api:4.0.1
200-
+--- org.apache.tomcat:tomcat-annotations-api:11.0.7 -> jakarta.annotation:jakarta.annotation-api:3.0.0
201-
+--- org.apache.tomcat:tomcat-servlet-api:11.0.7 -> jakarta.servlet:jakarta.servlet-api:6.1.0
202-
+--- org.apache.tomcat:tomcat-websocket-api:11.0.7 -> jakarta.websocket:jakarta.websocket-api:2.2.0
203-
+--- org.apache.tomcat:tomcat-websocket-client-api:11.0.7 -> jakarta.websocket:jakarta.websocket-client-api:2.2.0
200+
+--- org.apache.tomcat:tomcat-annotations-api:11.0.8 -> jakarta.annotation:jakarta.annotation-api:3.0.0
201+
+--- org.apache.tomcat:tomcat-servlet-api:11.0.8 -> jakarta.servlet:jakarta.servlet-api:6.1.0
202+
+--- org.apache.tomcat:tomcat-websocket-api:11.0.8 -> jakarta.websocket:jakarta.websocket-api:2.2.0
203+
+--- org.apache.tomcat:tomcat-websocket-client-api:11.0.8 -> jakarta.websocket:jakarta.websocket-client-api:2.2.0
204204
+--- org.apache.velocity:velocity-engine-core:2.4.1
205205
| +--- org.apache.commons:commons-lang3:3.17.0
206206
| \--- org.slf4j:slf4j-api:1.7.36 -> 2.0.17 (*)
@@ -347,7 +347,7 @@ compileClasspath - Compile classpath for source set 'main'.
347347
+--- org.jzy3d:jzy3d-jGL-awt:2.2.1 -> org.jzy3d:jGL:2.5
348348
+--- org.lz4:lz4-java:1.8.0
349349
+--- org.ow2.asm:asm:9.8 (*)
350-
+--- org.postgresql:postgresql:42.7.6
350+
+--- org.postgresql:postgresql:42.7.7
351351
+--- org.slf4j:jcl-over-slf4j:2.0.17 (*)
352352
+--- org.slf4j:jul-to-slf4j:2.0.17 (*)
353353
+--- org.slf4j:log4j-over-slf4j:2.0.17 (*)
@@ -358,7 +358,7 @@ compileClasspath - Compile classpath for source set 'main'.
358358
+--- org.slf4j:slf4j-simple:2.0.17 (*)
359359
+--- org.springframework:spring-aop:6.2.7 (*)
360360
+--- org.springframework:spring-jcl:6.2.7 -> org.slf4j:jcl-over-slf4j:2.0.17 (*)
361-
+--- postgresql:postgresql:9.1-901-1.jdbc4 -> org.postgresql:postgresql:42.7.6
361+
+--- postgresql:postgresql:9.1-901-1.jdbc4 -> org.postgresql:postgresql:42.7.7
362362
+--- servletapi:servletapi:2.4-20040521 -> javax.servlet:javax.servlet-api:4.0.1
363363
+--- stax:stax-api:1.0.1
364364
+--- velocity:velocity:1.5 -> org.apache.velocity:velocity-engine-core:2.4.1 (*)

0 commit comments

Comments
 (0)