Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2019-09-27 12:45:17 +0000
committerOlivier Constant2019-09-27 13:03:43 +0000
commitdd58af8e67e83f5d664f7cb1bf3955029be4eb41 (patch)
treee62b86dc40af35ee003f3f1327397c0ee41a67ba
parentc05ef7d71bc408ef41f7804828a3067b9b9cb629 (diff)
downloadorg.eclipse.emf.diffmerge.core-dd58af8e67e83f5d664f7cb1bf3955029be4eb41.tar.gz
org.eclipse.emf.diffmerge.core-dd58af8e67e83f5d664f7cb1bf3955029be4eb41.tar.xz
org.eclipse.emf.diffmerge.core-dd58af8e67e83f5d664f7cb1bf3955029be4eb41.zip
[releng] Enforce JDK through Maven toolchain
Change-Id: Iaedd1944993423a7566169092c12b44556451636 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/pom.xml34
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml66
2 files changed, 97 insertions, 3 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index c7b939f2..bb8917bd 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -6,16 +6,23 @@
<packaging>pom</packaging>
<properties>
- <tycho.version>1.0.0</tycho.version>
- <tycho.extras.version>${tycho.version}</tycho.extras.version>
+ <cbi.jarsigner.version>1.1.3</cbi.jarsigner.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<rcptt.version>2.3.0</rcptt.version>
- <cbi.jarsigner.version>1.1.3</cbi.jarsigner.version>
+ <tycho.version>1.4.0</tycho.version>
+ <tycho.extras.version>${tycho.version}</tycho.extras.version>
+ <java.version>1.8</java.version>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
<build>
<plugins>
<plugin>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho.version}</version>
@@ -65,10 +72,31 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <id>JavaSE-${java.version}</id>
+ </jdk>
+ </toolchains>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
<useJDK>BREE</useJDK>
<useProjectSettings>true</useProjectSettings>
</configuration>
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml b/releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml
new file mode 100644
index 00000000..81a20947
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.configuration/toolchains-hipp.xml
@@ -0,0 +1,66 @@
+<toolchains>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <id>JavaSE-1.8</id>
+ </provides>
+ <configuration>
+ <jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome>
+ <bootClassPath>
+ <includes>
+ <include>jre/lib/*</include>
+ <include>jre/lib/ext/*</include>
+ <include>jre/lib/endorsed*</include>
+ </includes>
+ </bootClassPath>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <id>JavaSE-1.7</id>
+ </provides>
+ <configuration>
+ <jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome>
+ <bootClassPath>
+ <includes>
+ <include>jre/lib/*</include>
+ <include>jre/lib/ext/*</include>
+ <include>jre/lib/endorsed*</include>
+ </includes>
+ </bootClassPath>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <id>JavaSE-1.6</id>
+ </provides>
+ <configuration>
+ <jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome>
+ <bootClassPath>
+ <includes>
+ <include>jre/lib/*</include>
+ <include>jre/lib/ext/*</include>
+ <include>jre/lib/endorsed*</include>
+ </includes>
+ </bootClassPath>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <id>JavaSE-1.5</id>
+ </provides>
+ <configuration>
+ <jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome>
+ <bootClassPath>
+ <includes>
+ <include>jre/lib/*</include>
+ <include>jre/lib/ext/*</include>
+ <include>jre/lib/endorsed*</include>
+ </includes>
+ </bootClassPath>
+ </configuration>
+ </toolchain>
+</toolchains>

Back to the top