Skip to content

Attempt at fixing enforce*** #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.gradlex.jvm.dependency.conflict.resolution;

import org.gradle.api.Action;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.component.ComponentSelector;
import org.gradlex.jvm.dependency.conflict.detection.rules.logging.LoggingModuleIdentifiers;

public class Log4J2EnforcementSubstitutionsUsing implements Action<Configuration> {
@Override
public void execute(Configuration configuration) {
configuration.getResolutionStrategy().dependencySubstitution(substitution -> {
// TODO We are missing substitutions here

// TODO this is wrong, it cannot be a substitution for commons-logging. It must be a dependency addition
ComponentSelector jclOverLog4J = substitution.module(LoggingModuleIdentifiers.LOG4J_JCL.asFirstVersion());
substitution.substitute(substitution.module(LoggingModuleIdentifiers.COMMONS_LOGGING.moduleId)).using(jclOverLog4J);
substitution.substitute(substitution.module(LoggingModuleIdentifiers.LOG4J_JCL.moduleId)).using(jclOverLog4J);
substitution.substitute(substitution.module(LoggingModuleIdentifiers.SPRING_JCL.moduleId)).using(jclOverLog4J);

});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@ public void enforceLog4J2() {
selectJCLImplementation(LoggingModuleIdentifiers.LOG4J_JCL.moduleId);
selectLog4J12Implementation(LoggingModuleIdentifiers.LOG4J12API.moduleId);

getConfigurations().all(new Log4J2EnforcementSubstitutionsUsing());

}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public void execute(Configuration configuration) {

substitution.substitute(substitution.module(LoggingModuleIdentifiers.LOG4J_JUL.moduleId)).using(substitution.module(LoggingModuleIdentifiers.JUL_TO_SLF4J.asFirstVersion()));

// TODO this is wrong, it cannot be a substitution for commons-logging. It must be a dependency addition
ComponentSelector jclOverSlf4J = substitution.module(LoggingModuleIdentifiers.JCL_OVER_SLF4J.asFirstVersion());
substitution.substitute(substitution.module(LoggingModuleIdentifiers.COMMONS_LOGGING.moduleId)).using(jclOverSlf4J);
substitution.substitute(substitution.module(LoggingModuleIdentifiers.LOG4J_JCL.moduleId)).using(jclOverSlf4J);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,4 +328,42 @@ ${additional.collect { " runtimeOnly(\"$it\")" }.join("\n")}
then:
outcomeOf(result, ':doIt') == SUCCESS
}

def "issue 119"() {
given:
withBuildScript("""
plugins {
`java-library`
id("org.gradlex.jvm-dependency-conflict-resolution")
}

repositories {
mavenCentral()
}

jvmDependencyConflicts.logging {
enforceLog4J2()
}

dependencies {
implementation("log4j:log4j:1.2.17")
implementation("ch.qos.reload4j:reload4j:1.2.25")
implementation("org.slf4j:slf4j-api:2.0.13")
implementation("commons-logging:commons-logging:1.3.1")
implementation("org.apache.logging.log4j:log4j-api:2.23.1")
implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.23.1")
}

tasks.register("doIt") {
doLast {
println(configurations["runtimeClasspath"].files)
}
}
""")
when:
def result = build(['doIt', 'dependencies', '--configuration', 'runtimeClasspath'])

then:
outcomeOf(result, ':doIt') == SUCCESS
}
}
Loading