Skip to content

Commit 423d8f7

Browse files
HansMartinAHansMartinA
committed
Replaced the log4j usage with a basic log4j 2 usage.
1 parent ddd9c1e commit 423d8f7

File tree

10 files changed

+52
-40
lines changed

10 files changed

+52
-40
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
2222
- Renaming of meta-model namespace URI to: `https://mdsd.tools/jamopp/java`
2323
- Upgraded dependency versions to:
2424
- Apache Commons Bytecode Engineering Library 6.7.0
25-
- Apache Log4j 2 2.20.0 including the Log4j 1.x bridge
25+
- Apache Log4j 2 2.20.0
2626

2727
### Deprecated
2828

‎jamopp.p2/pom.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,43 @@
3333
<!-- groupId:artifactId:version -->
3434
<artifact>
3535
<id>tools.mdsd:jamopp.model:6.0.0-SNAPSHOT</id>
36+
<transitive>false</transitive>
37+
</artifact>
38+
<artifact>
3639
<id>tools.mdsd:jamopp.model.edit:6.0.0-SNAPSHOT</id>
40+
<transitive>false</transitive>
41+
</artifact>
42+
<artifact>
3743
<id>tools.mdsd:jamopp.parser.jdt.singlefile:6.0.0-SNAPSHOT</id>
44+
<transitive>false</transitive>
45+
</artifact>
46+
<artifact>
3847
<id>tools.mdsd:jamopp.resource:6.0.0-SNAPSHOT</id>
48+
<transitive>false</transitive>
49+
</artifact>
50+
<artifact>
3951
<id>tools.mdsd:jamopp.parser.jdt:6.0.0-SNAPSHOT</id>
52+
<transitive>false</transitive>
53+
</artifact>
54+
<artifact>
55+
<id>tools.mdsd:jamopp.parser.bcel:6.0.0-SNAPSHOT</id>
56+
<transitive>false</transitive>
57+
</artifact>
58+
<artifact>
4059
<id>tools.mdsd:jamopp.standalone:6.0.0-SNAPSHOT</id>
60+
<transitive>false</transitive>
61+
</artifact>
62+
<artifact>
63+
<id>org.apache.logging.log4j:log4j-api:2.20.0</id>
64+
<transitive>false</transitive>
65+
</artifact>
66+
<artifact>
67+
<id>org.apache.bcel:bcel:6.7.0</id>
68+
<transitive>false</transitive>
69+
</artifact>
70+
<artifact>
71+
<id>org.apache.commons:commons-lang3:3.12.0</id>
72+
<transitive>false</transitive>
4173
</artifact>
4274
</artifacts>
4375
<featureDefinitions>

‎jamopp.parser.jdt.singlefile/pom.xml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,9 @@
5555
<artifactId>jamopp.resolution</artifactId>
5656
<version>6.0.0-SNAPSHOT</version>
5757
</dependency>
58-
<dependency>
59-
<groupId>org.apache.logging.log4j</groupId>
60-
<artifactId>log4j-1.2-api</artifactId>
61-
</dependency>
6258
<dependency>
6359
<groupId>org.apache.logging.log4j</groupId>
6460
<artifactId>log4j-api</artifactId>
6561
</dependency>
66-
<dependency>
67-
<groupId>org.apache.logging.log4j</groupId>
68-
<artifactId>log4j-core</artifactId>
69-
</dependency>
70-
</dependencies>
62+
</dependencies>
7163
</project>

‎jamopp.parser.jdt.singlefile/src/main/java/tools/mdsd/jamopp/parser/jdt/singlefile/JaMoPPJDTSingleFileParser.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
import java.util.List;
2828
import java.util.Map;
2929

30-
import org.apache.log4j.Logger;
30+
import org.apache.logging.log4j.Logger;
31+
import org.apache.logging.log4j.LogManager;
3132
import org.eclipse.emf.common.util.URI;
3233
import org.eclipse.emf.ecore.resource.Resource;
3334
import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -51,7 +52,7 @@
5152
import tools.mdsd.jamopp.resolution.resolver.CentralReferenceResolver;
5253

5354
public class JaMoPPJDTSingleFileParser implements JaMoPPParserAPI {
54-
private static final Logger logger = Logger.getLogger("jamopp."
55+
private static final Logger logger = LogManager.getLogger("jamopp."
5556
+ JaMoPPJDTSingleFileParser.class.getSimpleName());
5657
private final String DEFAULT_ENCODING = StandardCharsets.UTF_8.toString();
5758
private ResourceSet resourceSet;

‎jamopp.resource/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,9 @@
6161
<artifactId>jamopp.parser.jdt.singlefile</artifactId>
6262
<version>6.0.0-SNAPSHOT</version>
6363
</dependency>
64-
<dependency>
65-
<groupId>org.apache.logging.log4j</groupId>
66-
<artifactId>log4j-1.2-api</artifactId>
67-
</dependency>
6864
<dependency>
6965
<groupId>org.apache.logging.log4j</groupId>
7066
<artifactId>log4j-api</artifactId>
7167
</dependency>
72-
<dependency>
73-
<groupId>org.apache.logging.log4j</groupId>
74-
<artifactId>log4j-core</artifactId>
75-
</dependency>
7668
</dependencies>
7769
</project>

‎jamopp.resource/src/main/java/tools/mdsd/jamopp/resource/JavaResource2.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
import java.util.List;
2121
import java.util.Map;
2222

23-
import org.apache.log4j.Logger;
23+
import org.apache.logging.log4j.Logger;
24+
import org.apache.logging.log4j.LogManager;
2425
import org.eclipse.emf.common.util.URI;
2526
import org.eclipse.emf.ecore.EObject;
2627
import org.eclipse.emf.ecore.EReference;
@@ -48,7 +49,7 @@
4849

4950
public class JavaResource2 extends XMIResourceImpl {
5051
public static final String JAVAXMI_FILE_EXTENSION = LogicalJavaURIGenerator.JAVAXMI_FILE_EXTENSION_NAME;
51-
private static final Logger LOGGER = Logger.getLogger("jamopp." + JavaResource2.class.getSimpleName());
52+
private static final Logger LOGGER = LogManager.getLogger("jamopp." + JavaResource2.class.getSimpleName());
5253
private Map<String, IJavaContextDependentURIFragment> internalURIFragmentMap =
5354
IJavaContextDependentURIFragmentCollector.GLOBAL_INSTANCE
5455
.getContextDependentURIFragmentMap();

‎jamopp.tests/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,10 @@
103103
<artifactId>jamopp.resource</artifactId>
104104
<version>6.0.0-SNAPSHOT</version>
105105
</dependency>
106-
<dependency>
107-
<groupId>org.apache.logging.log4j</groupId>
108-
<artifactId>log4j-1.2-api</artifactId>
109-
</dependency>
110106
<dependency>
111107
<groupId>org.apache.logging.log4j</groupId>
112108
<artifactId>log4j-api</artifactId>
113109
</dependency>
114-
<dependency>
115-
<groupId>org.apache.logging.log4j</groupId>
116-
<artifactId>log4j-core</artifactId>
117-
</dependency>
118110
<dependency>
119111
<groupId>org.junit.jupiter</groupId>
120112
<artifactId>junit-jupiter</artifactId>

‎jamopp.tests/src/test/java/tools/mdsd/jamopp/test/AbstractJaMoPPTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
import java.util.zip.ZipEntry;
4747
import java.util.zip.ZipFile;
4848

49-
import org.apache.log4j.ConsoleAppender;
50-
import org.apache.log4j.Level;
51-
import org.apache.log4j.Logger;
52-
import org.apache.log4j.PatternLayout;
49+
//import org.apache.log4j.ConsoleAppender;
50+
//import org.apache.log4j.Level;
51+
//import org.apache.log4j.Logger;
52+
//import org.apache.log4j.PatternLayout;
5353
import org.eclipse.core.runtime.CoreException;
5454
import org.eclipse.emf.common.util.BasicEList;
5555
import org.eclipse.emf.common.util.EList;
@@ -102,8 +102,8 @@ public abstract class AbstractJaMoPPTests {
102102

103103
@BeforeAll
104104
public static void initLogging() {
105-
Logger logger = Logger.getLogger("jamopp");
106-
logger.setLevel(Level.ALL);
105+
// Logger logger = Logger.getLogger("jamopp");
106+
// logger.setLevel(Level.ALL);
107107
// ConsoleAppender ca = new ConsoleAppender(new PatternLayout("[%d{DATE}] %-5p: %c - %m%n"),
108108
// ConsoleAppender.SYSTEM_OUT);
109109
// logger.addAppender(ca);

‎jamopp.tests/src/test/java/tools/mdsd/jamopp/test/bulk/SingleFileParserBulkTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
import org.apache.commons.compress.archivers.ArchiveException;
3737
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
3838
import org.apache.commons.compress.archivers.examples.Expander;
39-
import org.apache.log4j.Logger;
39+
import org.apache.logging.log4j.Logger;
40+
import org.apache.logging.log4j.LogManager;
4041
import org.eclipse.emf.ecore.resource.Resource;
4142
import org.eclipse.emf.ecore.resource.ResourceSet;
4243
import org.junit.jupiter.api.Disabled;
@@ -48,7 +49,7 @@
4849

4950
@Disabled("Requires initialization of all submodules and dependency resolution.")
5051
public class SingleFileParserBulkTests extends AbstractJaMoPPTests {
51-
private static final Logger LOGGER = Logger.getLogger("jamopp."
52+
private static final Logger LOGGER = LogManager.getLogger("jamopp."
5253
+ SingleFileParserBulkTests.class.getSimpleName());
5354
// TODO: Adjust path.
5455
private static final String BASE_ZIP = "JaMoPP-BulkTest" + File.separator + "Tests" + File.separator

‎jamopp.tests/src/test/java/tools/mdsd/jamopp/test/performance/PerformanceTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import java.nio.file.Paths;
2323
import java.util.HashSet;
2424
import java.util.Set;
25-
import org.apache.log4j.Logger;
25+
import org.apache.logging.log4j.Logger;
26+
import org.apache.logging.log4j.LogManager;
2627
import org.eclipse.emf.ecore.resource.Resource;
2728
import org.eclipse.emf.ecore.resource.ResourceSet;
2829
import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -40,7 +41,7 @@
4041
*/
4142
@Disabled
4243
public class PerformanceTest extends AbstractJaMoPPTests {
43-
private static final Logger LOGGER = Logger.getLogger("jamopp."
44+
private static final Logger LOGGER = LogManager.getLogger("jamopp."
4445
+ SingleFileParserBulkTests.class.getSimpleName());
4546
private final String inputFolder = "target" + File.separator + "src-bulk" + File.separator + "TeaStore";
4647
private final Path parentOutput = Paths.get("output_performance");

0 commit comments

Comments
 (0)