Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorOlivier Constant2019-09-27 19:57:56 +0000
committerOlivier Constant2019-09-27 19:57:56 +0000
commit5cfdb64b0077faf441d3a6e1a7e4307d1cad238c (patch)
tree8bfdae31331a80611c2621ca18440315dcc1e694 /releng
parent51a3be125fce9d155218f8d71ac1f0ece62a38b0 (diff)
downloadorg.eclipse.emf.diffmerge.core-5cfdb64b0077faf441d3a6e1a7e4307d1cad238c.tar.gz
org.eclipse.emf.diffmerge.core-5cfdb64b0077faf441d3a6e1a7e4307d1cad238c.tar.xz
org.eclipse.emf.diffmerge.core-5cfdb64b0077faf441d3a6e1a7e4307d1cad238c.zip
[releng] Reverted to Tycho 1.0 to use Java 6
Change-Id: Id16753cbb99ae78ef577b8928bb47dae911a71d8 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml6
2 files changed, 4 insertions, 4 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index 11aa401d..f708a9db 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -12,7 +12,7 @@
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
- <tycho.version>1.4.0</tycho.version>
+ <tycho.version>1.0.0</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version>
</properties>
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml b/releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml
index 81a20947..b00f2093 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml
@@ -21,7 +21,7 @@
<id>JavaSE-1.7</id>
</provides>
<configuration>
- <jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome>
+ <jdkHome>/opt/tools/java/oracle/jdk-7/latest</jdkHome>
<bootClassPath>
<includes>
<include>jre/lib/*</include>
@@ -37,7 +37,7 @@
<id>JavaSE-1.6</id>
</provides>
<configuration>
- <jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome>
+ <jdkHome>/opt/tools/java/oracle/jdk-6/latest</jdkHome>
<bootClassPath>
<includes>
<include>jre/lib/*</include>
@@ -53,7 +53,7 @@
<id>JavaSE-1.5</id>
</provides>
<configuration>
- <jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome>
+ <jdkHome>/opt/tools/java/oracle/jdk-5/latest</jdkHome>
<bootClassPath>
<includes>
<include>jre/lib/*</include>

Back to the top