Skip to content

Commit

Permalink
Merge pull request #659 from vitruv-tools/658-deserialization-of-untr…
Browse files Browse the repository at this point in the history
…usted-data-in-log4j-5

changed the log4j dependency to org.apache.logging.log4j
  • Loading branch information
arlange authored Jan 13, 2025
2 parents 8053e02 + 6ebd68a commit 7afcdf3
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
10 changes: 6 additions & 4 deletions applications/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase.lib</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.registry</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@
<artifactId>org.eclipse.emf.compare</artifactId>
<version>3.5.3.202212280858</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.24.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.common</artifactId>
Expand Down
9 changes: 5 additions & 4 deletions vsum/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,11 @@
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>

<dependency>
<groupId>sdq-commons</groupId>
<artifactId>edu.kit.ipd.sdq.commons.util.emf</artifactId>
Expand Down

0 comments on commit 7afcdf3

Please sign in to comment.