Skip to content

Commit

Permalink
update log4j
Browse files Browse the repository at this point in the history
remove jcenter references
update mockneat library
  • Loading branch information
jj committed Dec 17, 2021
1 parent df6ded6 commit ce19deb
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 11 deletions.
11 changes: 5 additions & 6 deletions backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ sourceCompatibility = 11
targetCompatibility = 11

repositories {
jcenter()
mavenCentral()
maven {
url 'https://build.shibboleth.net/nexus/content/groups/public'
artifactUrls = ['https://build.shibboleth.net/nexus/content/repositories/thirdparty-snapshots']
}
mavenLocal()
}

configurations.all {
Expand Down Expand Up @@ -139,8 +138,8 @@ dependencies {
compile "org.springframework.boot:spring-boot-${it}"
}
// To override older version with security issue - https://www.lunasec.io/docs/blog/log4j-zero-day/
implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.15.0'
implementation 'org.apache.logging.log4j:log4j-api:2.15.0'
implementation "org.apache.logging.log4j:log4j-to-slf4j:${project.'log4j.version'}"
implementation "org.apache.logging.log4j:log4j-api:${project.'log4j.version'}"

// TODO: figure out what this should really be
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
Expand All @@ -157,7 +156,7 @@ dependencies {
compile group: 'org.jadira.usertype', name: 'usertype.core', version: '6.0.1.GA'

//For easy data mocking capabilities
compile 'net.andreinc.mockneat:mockneat:0.1.4'
compile 'net.andreinc:mockneat:0.4.7'

compile 'org.codehaus.groovy:groovy-all:3.0.7'

Expand Down Expand Up @@ -365,4 +364,4 @@ dockerRun {
daemonize true
command '--spring.profiles.include=very-dangerous,dev', '--shibui.default-password={noop}password'
clean true
}
}
2 changes: 1 addition & 1 deletion beacon/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sourceCompatibility = 11
targetCompatibility = 11

repositories {
jcenter()
mavenCentral()
}

dependencyManagement {
Expand Down
4 changes: 2 additions & 2 deletions beacon/spring/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sourceCompatibility = 11
targetCompatibility = 11

repositories {
jcenter()
mavenCentral()
}

jar {
Expand All @@ -26,4 +26,4 @@ dependencyManagement {
dependencies {
compile project(':beacon:core')
compile "org.springframework.boot:spring-boot-starter"
}
}
11 changes: 11 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,14 @@ release {

afterReleaseBuild.dependsOn project.getTasksByName('githubRelease', false)
afterReleaseBuild.dependsOn project.getTasksByName('dockerTagsPush', true)

// force log4j version
allprojects {
configurations.all {
resolutionStrategy.eachDependency { d ->
if (d.requested.group == 'org.apache.logging.log4j') {
d.useVersion project.'log4j.version'
}
}
}
}
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ i2.github.owner=TIER
i2.github.repo=shib-idp-ui
i2.github.apiEndpoint=https://github.internet2.edu/api/v3

log4j.version=2.16.0
4 changes: 2 additions & 2 deletions pac4j-module/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sourceCompatibility = 11
targetCompatibility = 11

repositories {
jcenter()
mavenCentral()
maven {
url 'https://build.shibboleth.net/nexus/content/groups/public'
artifactUrls = ['https://build.shibboleth.net/nexus/content/repositories/thirdparty-snapshots']
Expand Down Expand Up @@ -51,4 +51,4 @@ dependencies {
testCompile "org.spockframework:spock-spring:1.3-groovy-2.5"

annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
}
}

0 comments on commit ce19deb

Please sign in to comment.