summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov <akurtako@redhat.com>2014-03-28 15:43:10 +0200
committerAlexander Kurtakov <akurtako@redhat.com>2014-03-28 15:43:10 +0200
commit20fc105021d77b43e52072fc8c2dd4810c68713a (patch)
tree4ae0a18a6b9311e3a4c919bd36697a094ee17131
parente56d50a94bfe60663bd589da61e07b9461f2c5f7 (diff)
downloadjgit-20fc105021d77b43e52072fc8c2dd4810c68713a.tar.gz
jgit-20fc105021d77b43e52072fc8c2dd4810c68713a.zip
Allow full compiles on Java 8.
Make jgit.java6 and jgit.java7 activation based on ranges so modules in jgit.java6 are enabled for Java 1.6+ and modules in jgit.java7 are enabled for Java 1.7+. This enables full compiles on Java 8 and also removes the need to list org.eclipse.jgit.console in both profiles. Change-Id: Iabfcff18737ff435ba8d5e8efc7a581abc9a46ce Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--pom.xml5
1 files changed, 2 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index ecf24001d4..d4acb3e333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -503,7 +503,7 @@
<profile>
<id>jgit.java6</id>
<activation>
- <jdk>1.6</jdk>
+ <jdk>[1.6,)</jdk>
</activation>
<modules>
<module>org.eclipse.jgit.console</module>
@@ -512,10 +512,9 @@
<profile>
<id>jgit.java7</id>
<activation>
- <jdk>1.7</jdk>
+ <jdk>[1.7,)</jdk>
</activation>
<modules>
- <module>org.eclipse.jgit.console</module>
<module>org.eclipse.jgit.java7</module>
<module>org.eclipse.jgit.java7.test</module>
</modules>