summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2015-01-27 01:43:24 +0100
committerChristian Halstrick <christian.halstrick@sap.com>2015-02-10 09:14:48 +0100
commit6c1f7393882baf8464859136a70199ea96fcae0f (patch)
tree5338cb5159d49d6440cb3ba9dca565e884f2c2ae /pom.xml
parent77030a5e94a90cfae223acc477c216603cf3f149 (diff)
downloadjgit-6c1f7393882baf8464859136a70199ea96fcae0f.tar.gz
jgit-6c1f7393882baf8464859136a70199ea96fcae0f.zip
Move console classes to pgm bundle
Since we updated minimum Java version to Java 7 the console bundle doesn't need to be a separate bundle anymore. Move the contained classes to the pgm bundle which is using these classes. Change-Id: If8e6f2d7405fdfe6f4b178673b4ccf99c67d4b64 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml15
1 files changed, 2 insertions, 13 deletions
diff --git a/pom.xml b/pom.xml
index 94a88e6db9..863866df65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -567,23 +567,10 @@
<profiles>
<profile>
- <id>jgit.java6</id>
- <activation>
- <jdk>[1.6,)</jdk>
- </activation>
- <modules>
- <module>org.eclipse.jgit.console</module>
- </modules>
- </profile>
- <profile>
<id>jgit.java7</id>
<activation>
<jdk>[1.7,)</jdk>
</activation>
- <modules>
- <module>org.eclipse.jgit.java7</module>
- <module>org.eclipse.jgit.java7.test</module>
- </modules>
</profile>
<profile>
<id>jgit.java8</id>
@@ -691,9 +678,11 @@
<module>org.eclipse.jgit.http.apache</module>
<module>org.eclipse.jgit.http.server</module>
<module>org.eclipse.jgit.pgm</module>
+ <module>org.eclipse.jgit.java7</module>
<module>org.eclipse.jgit.junit</module>
<module>org.eclipse.jgit.junit.http</module>
+ <module>org.eclipse.jgit.java7.test</module>
<module>org.eclipse.jgit.test</module>
<module>org.eclipse.jgit.ant.test</module>
<module>org.eclipse.jgit.http.test</module>