diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2022-01-06 14:05:00 -0500 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2022-01-06 14:05:00 -0500 |
| commit | df4fa808b3a872fda33418a931dcaf3ab8699f10 (patch) | |
| tree | 1d37a7628c9e416cf62a8eb64330e021f8e2ac08 /pom.xml | |
| parent | e4f6e0af4ac3f83418e98bbfeccb94493c870b83 (diff) | |
| parent | 4c555f0742856bb21efcb2df53c7ceac921ffe80 (diff) | |
| download | jgit-df4fa808b3a872fda33418a931dcaf3ab8699f10.tar.gz jgit-df4fa808b3a872fda33418a931dcaf3ab8699f10.zip | |
Merge changes Ia744cd4a,Id95350c7,I746b7fb7
* changes:
sshd: backport upstream fix for SSHD-1231
[releng] bump japicmp base version and configure sshd bundles
Merge branch 'stable-6.0'
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 29 |
1 files changed, 2 insertions, 27 deletions
@@ -150,7 +150,7 @@ <java.version>11</java.version> <bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest> - <jgit-last-release-version>5.13.0.202109080827-r</jgit-last-release-version> + <jgit-last-release-version>6.0.0.202111291000-r</jgit-last-release-version> <ant-version>1.10.12</ant-version> <apache-sshd-version>2.7.0</apache-sshd-version> <jsch-version>0.1.55</jsch-version> @@ -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> |