Compare commits

...

2 Commits

Author SHA1 Message Date
Zhiwei Xue
b0fd206956 fix(TUP-29360): fix switch log4j level problem (#5534) 2020-11-20 15:39:02 +08:00
Zhiwei Xue
c4b59e6ea5 fix(TUP-29360): Missing log4j2 jar on user routines (#5531) 2020-11-19 19:01:11 +08:00
2 changed files with 28 additions and 11 deletions

View File

@@ -68,6 +68,7 @@ import org.talend.core.language.ECodeLanguage;
import org.talend.core.model.action.DisableLanguageActions;
import org.talend.core.model.components.IComponentsFactory;
import org.talend.core.model.general.ConnectionBean;
import org.talend.core.model.general.ModuleNeeded;
import org.talend.core.model.general.Project;
import org.talend.core.model.metadata.IMetadataConnection;
import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
@@ -137,6 +138,8 @@ import org.talend.repository.ui.login.LoginHelper;
import org.talend.repository.ui.login.connections.ConnectionUserPerReader;
import org.talend.repository.ui.login.connections.network.NetworkErrorRetryDialog;
import org.talend.repository.ui.utils.ColumnNameValidator;
import org.talend.repository.ui.utils.Log4jPrefsSettingManager;
import org.talend.repository.ui.utils.UpdateLog4jJarUtils;
import org.talend.repository.ui.views.IRepositoryView;
import org.talend.utils.json.JSONException;
import org.talend.utils.json.JSONObject;
@@ -996,4 +999,15 @@ public class RepositoryService implements IRepositoryService, IRepositoryContext
((RepoViewCommonNavigator) repView).setShouldCheckRepositoryDirty(shouldFlag);
}
}
@Override
public boolean isProjectLevelLog4j2() {
return Log4jPrefsSettingManager.getInstance().isSelectLog4j2();
}
@Override
public List<ModuleNeeded> getLog4j2Modules() {
return UpdateLog4jJarUtils.getLog4j2Modules();
}
}

View File

@@ -166,16 +166,7 @@ public class UpdateLog4jJarUtils {
log4j1To2Api.setMavenUri("mvn:org.apache.logging.log4j/log4j-1.2-api/"+LOG4J_VERSION);//$NON-NLS-1$
moduleNeededList.add(log4j1To2Api);
}
ModuleNeeded log4jSlf4jImpl = new ModuleNeeded("org.apache.logging.log4j", "log4j-slf4j-impl-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
log4jSlf4jImpl.setMavenUri("mvn:org.apache.logging.log4j/log4j-slf4j-impl/"+LOG4J_VERSION);//$NON-NLS-1$
moduleNeededList.add(log4jSlf4jImpl);
ModuleNeeded log4jApi = new ModuleNeeded("org.apache.logging.log4j", "log4j-api-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
log4jApi.setMavenUri("mvn:org.apache.logging.log4j/log4j-api/"+LOG4J_VERSION);//$NON-NLS-1$
moduleNeededList.add(log4jApi);
ModuleNeeded log4jCore = new ModuleNeeded("org.apache.logging.log4j", "log4j-core-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
log4jCore.setMavenUri("mvn:org.apache.logging.log4j/log4j-core/"+LOG4J_VERSION);//$NON-NLS-1$
moduleNeededList.add(log4jCore);
moduleNeededList.addAll(getLog4j2Modules());
} else {
boolean usedjclOverSlf4jBefore = false;
@@ -212,7 +203,19 @@ public class UpdateLog4jJarUtils {
}
public static List<ModuleNeeded> getLog4j2Modules() {
List<ModuleNeeded> moduleNeededList = new ArrayList<>();
ModuleNeeded log4jSlf4jImpl = new ModuleNeeded("org.apache.logging.log4j", "log4j-slf4j-impl-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
log4jSlf4jImpl.setMavenUri("mvn:org.apache.logging.log4j/log4j-slf4j-impl/"+LOG4J_VERSION);//$NON-NLS-1$
moduleNeededList.add(log4jSlf4jImpl);
ModuleNeeded log4jApi = new ModuleNeeded("org.apache.logging.log4j", "log4j-api-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
log4jApi.setMavenUri("mvn:org.apache.logging.log4j/log4j-api/"+LOG4J_VERSION);//$NON-NLS-1$
moduleNeededList.add(log4jApi);
ModuleNeeded log4jCore = new ModuleNeeded("org.apache.logging.log4j", "log4j-core-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
log4jCore.setMavenUri("mvn:org.apache.logging.log4j/log4j-core/"+LOG4J_VERSION);//$NON-NLS-1$
moduleNeededList.add(log4jCore);
return moduleNeededList;
}
private static List<ModuleNeeded> removeLog4jFromModuleListAndGetModulesUsedBefore(IProcess process,
Collection<ModuleNeeded> jarList) {