diff options
| author | Matthias Sohn | 2015-02-24 22:44:56 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2015-02-24 22:45:19 +0000 |
| commit | d216ce41435784017c1fe02ea4f1e86ca36fa885 (patch) | |
| tree | 5c468bf23c9e4d08b3d771efc1d887b8c9db165a /pom.xml | |
| parent | b9725a54fd85f2c7561ff23ca821bf1697f441fd (diff) | |
| parent | a8743df19c2574bc3481fa5f811499b5960951a8 (diff) | |
| download | jgit-d216ce41435784017c1fe02ea4f1e86ca36fa885.tar.gz jgit-d216ce41435784017c1fe02ea4f1e86ca36fa885.tar.xz jgit-d216ce41435784017c1fe02ea4f1e86ca36fa885.zip | |
Merge branch 'stable-3.7'
* stable-3.7:
Add log4j and slf4j-log4j bridge to jgit feature
Use slf4j to log instead of printing to System.err
Use Target Platform Definition DSL to generate target platforms
Change-Id: Ic8779868150c910fa55fd20348e35723e6add0f1
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 20 |
1 files changed, 20 insertions, 0 deletions
@@ -189,6 +189,8 @@ <jetty-version>7.6.14.v20131031</jetty-version> <clirr-version>2.6.1</clirr-version> <httpclient-version>4.1.3</httpclient-version> + <slf4j-version>1.7.2</slf4j-version> + <log4j-version>1.2.15</log4j-version> <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version> <!-- Properties to enable jacoco code coverage analysis --> @@ -543,6 +545,24 @@ <artifactId>httpclient</artifactId> <version>${httpclient-version}</version> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j-version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j-version}</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j-version}</version> + </dependency> </dependencies> </dependencyManagement> |