diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2016-07-12 17:12:41 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2016-07-12 17:12:41 +0200 |
| commit | ffddf8d437b5b56706871fc53dbe4e5770f20ea3 (patch) | |
| tree | 150b7342608f863624607c2d5826f6b576c3a681 /pom.xml | |
| parent | 9aa3748e4c228370e83c5dd7788f420f80b7841a (diff) | |
| parent | ceaadf8f9835e01ca8b361885ea357d7b00536b6 (diff) | |
| download | jgit-ffddf8d437b5b56706871fc53dbe4e5770f20ea3.tar.gz jgit-ffddf8d437b5b56706871fc53dbe4e5770f20ea3.zip | |
Merge branch 'stable-4.4'
* stable-4.4:
Log if Repository.useCnt becomes negative
Time based eviction strategy for repository cache
Add method to read time unit from config
Align include.path max depth with native git
Config load should not fail on unsupported or nonexistent include path
Allow using JDK 7 bootclasspath when compiling JGit using Java 8
Extract work queue to allow reusing it
Change-Id: I6aeedb1cb8b0c3068af344a719c80a03ae68fc23
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -188,9 +188,10 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format> <bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest> + <!-- set JDK_HOME to JAVA_HOME path of JDK7 installation in order to compile against JDK 7 class library --> + <JDK_HOME>${JAVA_HOME}</JDK_HOME> <jgit-last-release-version>4.2.0.201601211800-r</jgit-last-release-version> <jsch-version>0.1.53</jsch-version> @@ -264,6 +265,9 @@ <encoding>UTF-8</encoding> <source>1.7</source> <target>1.7</target> + <compilerArguments> + <bootclasspath>${JDK_HOME}${file.separator}jre${file.separator}lib${file.separator}rt.jar${path.separator}${JDK_HOME}${file.separator}jre${file.separator}lib${file.separator}jsse.jar${path.separator}${JDK_HOME}${file.separator}jre${file.separator}lib${file.separator}jce.jar</bootclasspath> + </compilerArguments> </configuration> </plugin> |