diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2022-01-05 14:54:39 +0100 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2022-01-05 15:59:09 +0100 |
| commit | f7662a756e325570dd82594613db403a60fd44cb (patch) | |
| tree | e239244d4dca5993370216f995dbff432ff6e4bb /pom.xml | |
| parent | fa82b80c9bce223af71e57151ab62b18bf005064 (diff) | |
| parent | 486afbc08d4689105019f77bf1ca0d1a2fc5ab0f (diff) | |
| download | jgit-f7662a756e325570dd82594613db403a60fd44cb.tar.gz jgit-f7662a756e325570dd82594613db403a60fd44cb.zip | |
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13:
Use slf4j-simple instead of log4j for logging
Update orbit to R20211213173813
Change-Id: I219ef3901c1d908b91bf9c8f00431b22686ff7a5
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 27 |
1 files changed, 1 insertions, 26 deletions
@@ -167,7 +167,6 @@ <httpclient-version>4.5.13</httpclient-version> <httpcore-version>4.4.14</httpcore-version> <slf4j-version>1.7.30</slf4j-version> - <log4j-version>1.2.15</log4j-version> <maven-javadoc-plugin-version>3.3.1</maven-javadoc-plugin-version> <tycho-extras-version>2.5.0</tycho-extras-version> <gson-version>2.8.8</gson-version> @@ -722,35 +721,11 @@ <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-simple</artifactId> <version>${slf4j-version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>${gson-version}</version> |