Skip to content

Commit

Permalink
Library updates: Jetty to 10.0.18, Log4J to 2.22.0, H2 to 2.2.224, co…
Browse files Browse the repository at this point in the history 
…mmons-lang3, commons-io, commons-logging, commons-validator, jackson-databind to 2.16.0, jsoup, shiro
  • Loading branch information
@jonesde
jonesde committed Dec 19, 2023
1 parent d76763a commit 62b98b2
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions framework/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.github.ben-manes:gradle-versions-plugin:0.47.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.50.0'
// uncomment to add the Error Prone compiler: classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.8'
}
}
Expand Down Expand Up @@ -96,15 +96,15 @@ dependencies {
api 'org.apache.commons:commons-csv:1.10.0' // Apache 2.0
// NOTE: commons-email depends on com.sun.mail:javax.mail, included below, so use module() here to not get dependencies
api module('org.apache.commons:commons-email:1.5') // Apache 2.0
api 'org.apache.commons:commons-lang3:3.13.0' // Apache 2.0; used by cron-utils
api 'org.apache.commons:commons-lang3:3.14.0' // Apache 2.0; used by cron-utils
api 'commons-beanutils:commons-beanutils:1.9.4' // Apache 2.0
api 'commons-codec:commons-codec:1.16.0' // Apache 2.0
api 'commons-collections:commons-collections:3.2.2' // Apache 2.0
api 'commons-digester:commons-digester:2.1' // Apache 2.0
api 'commons-fileupload:commons-fileupload:1.5' // Apache 2.0
api 'commons-io:commons-io:2.13.0' // Apache 2.0
api 'commons-logging:commons-logging:1.2' // Apache 2.0
api 'commons-validator:commons-validator:1.7' // Apache 2.0
api 'commons-io:commons-io:2.15.1' // Apache 2.0
api 'commons-logging:commons-logging:1.3.0' // Apache 2.0
api 'commons-validator:commons-validator:1.8.0' // Apache 2.0

// Cron Utils
api 'com.cronutils:cron-utils:9.2.1' // Apache 2.0
Expand All @@ -119,7 +119,7 @@ dependencies {
api 'org.freemarker:freemarker:2.3.32' // Apache 2.0

// H2 Database
api 'com.h2database:h2:2.2.222' // MPL 2.0, EPL 1.0
api 'com.h2database:h2:2.2.224' // MPL 2.0, EPL 1.0

// Java Specifications
api 'javax.transaction:jta:1.1'
Expand All @@ -144,11 +144,11 @@ dependencies {
api 'com.beust:jcommander:1.82'

// Jackson Databind (JSON, etc)
api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
api 'com.fasterxml.jackson.core:jackson-databind:2.16.0'

// Jetty HTTP Client and Proxy Servlet
api 'org.eclipse.jetty:jetty-client:10.0.16' // Apache 2.0
api 'org.eclipse.jetty:jetty-proxy:10.0.16' // Apache 2.0
api 'org.eclipse.jetty:jetty-client:10.0.18' // Apache 2.0
api 'org.eclipse.jetty:jetty-proxy:10.0.18' // Apache 2.0

// javax.mail
// NOTE: javax.mail depends on 'javax.activation:activation' which is the old package for 'javax.activation:javax.activation-api' used by jaxb-api
Expand All @@ -158,18 +158,18 @@ dependencies {
api 'joda-time:joda-time:2.12.5' // Apache 2.0

// JSoup (HTML parser, cleaner)
api 'org.jsoup:jsoup:1.16.1' // MIT
api 'org.jsoup:jsoup:1.17.1' // MIT

// Apache Shiro
api module('org.apache.shiro:shiro-core:1.12.0') // Apache 2.0
api module('org.apache.shiro:shiro-web:1.12.0') // Apache 2.0
api module('org.apache.shiro:shiro-core:1.13.0') // Apache 2.0
api module('org.apache.shiro:shiro-web:1.13.0') // Apache 2.0

// SLF4J, Log4j 2 (note Log4j 2 is used by various libraries, best not to replace it even if mostly possible with SLF4J)
api 'org.slf4j:slf4j-api:2.0.9'
implementation 'org.apache.logging.log4j:log4j-core:2.20.0'
implementation 'org.apache.logging.log4j:log4j-api:2.20.0'
runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.20.0'
runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0'
implementation 'org.apache.logging.log4j:log4j-core:2.22.0'
implementation 'org.apache.logging.log4j:log4j-api:2.22.0'
runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.22.0'
runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl:2.22.0'

// SubEtha SMTP (module as depends on old javax.mail location; also uses SLF4J, activation included elsewhere)
api module('org.subethamail:subethasmtp:3.1.7')
Expand All @@ -190,11 +190,11 @@ dependencies {
// ========== test dependencies ==========

// junit-platform-launcher is a dependency from spock-core, included explicitly to get more recent version as needed
testImplementation 'org.junit.platform:junit-platform-launcher:1.10.0'
testImplementation 'org.junit.platform:junit-platform-launcher:1.10.1'
// junit-platform-suite required for test suites to specify test class order, etc
testImplementation 'org.junit.platform:junit-platform-suite:1.10.0'
testImplementation 'org.junit.platform:junit-platform-suite:1.10.1'
// junit-jupiter-api for using JUnit directly, not generally needed for Spock based tests
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
// Spock Framework
testImplementation platform("org.spockframework:spock-bom:2.1-groovy-3.0") // Apache 2.0
testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' // Apache 2.0
Expand All @@ -203,16 +203,16 @@ dependencies {

// ========== executable war dependencies ==========
// Jetty
execWarRuntimeOnly 'org.eclipse.jetty:jetty-server:10.0.16' // Apache 2.0
execWarRuntimeOnly 'org.eclipse.jetty:jetty-webapp:10.0.16' // Apache 2.0
execWarRuntimeOnly 'org.eclipse.jetty:jetty-jndi:10.0.16' // Apache 2.0
execWarRuntimeOnly 'org.eclipse.jetty.websocket:websocket-javax-server:10.0.16' // Apache 2.0
execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-javax-client:10.0.16') { // Apache 2.0
execWarRuntimeOnly 'org.eclipse.jetty:jetty-server:10.0.18' // Apache 2.0
execWarRuntimeOnly 'org.eclipse.jetty:jetty-webapp:10.0.18' // Apache 2.0
execWarRuntimeOnly 'org.eclipse.jetty:jetty-jndi:10.0.18' // Apache 2.0
execWarRuntimeOnly 'org.eclipse.jetty.websocket:websocket-javax-server:10.0.18' // Apache 2.0
execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-javax-client:10.0.18') { // Apache 2.0
exclude group: 'javax.websocket' } // we have the full websocket API, including the client one causes problems
execWarRuntimeOnly 'javax.websocket:javax.websocket-api:1.1'
execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-jetty-server:10.0.16') // Apache 2.0
execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-jetty-server:10.0.18') // Apache 2.0
// only include this if using Endpoint and MessageHandler annotations:
// execWarRuntime ('org.eclipse.jetty:jetty-annotations:10.0.16') // Apache 2.0
// execWarRuntime ('org.eclipse.jetty:jetty-annotations:10.0.18') // Apache 2.0
execWarRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j18-impl:2.18.0'
}

Expand Down

0 comments on commit 62b98b2

Please sign in to comment.