diff options
author | Matthias Sohn | 2016-07-12 15:23:17 +0000 |
---|---|---|
committer | Matthias Sohn | 2016-07-12 15:23:33 +0000 |
commit | 21163f6f3703a459df82d04904c3d62183d69bfb (patch) | |
tree | 91003e9b50e06fc5bbf5c3a12d4543e573bee67a /pom.xml | |
parent | da310749c6c8721e448d81a6317b19be27e30ea9 (diff) | |
parent | 2b659e68ad25f9da664c7ef537c115ad60b0b84c (diff) | |
download | egit-21163f6f3703a459df82d04904c3d62183d69bfb.tar.gz egit-21163f6f3703a459df82d04904c3d62183d69bfb.tar.xz egit-21163f6f3703a459df82d04904c3d62183d69bfb.zip |
Merge branch 'stable-4.4'
* stable-4.4:
Allow using JDK 7 bootclasspath when compiling egit using Java 8
Fix wrong toc.xml in documentation bundle
Update wikitext used to generated documentation from wiki to 2.9
Change-Id: I02000f4cebb81cf82720fe29c397d167072cda3c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -77,6 +77,8 @@ <coretest.vmparams></coretest.vmparams> <uitest.vmparams>-Dorg.eclipse.swtbot.search.timeout=30000 -Dorg.eclipse.swtbot.screenshots.dir=target/screenshots -Xmx1024m -XX:MaxPermSize=150m</uitest.vmparams> <eclipse-with-smartimport>http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M6-201603170200</eclipse-with-smartimport> + <!-- 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> </properties> <profiles> @@ -366,6 +368,8 @@ <arg>-properties</arg> <arg>${project.basedir}/.settings/org.eclipse.jdt.core.prefs</arg> <arg>-nowarn</arg> + <arg>-bootclasspath</arg> + <arg>${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</arg> </compilerArgs> </configuration> </plugin> |