mirror of
https://github.com/sigmasternchen/xtext-core
synced 2025-03-15 08:18:55 +00:00
Revert "test with newest platform artifacts"
This reverts commit dd6435e0c8
.
This commit is contained in:
parent
dd6435e0c8
commit
d88be1f672
4 changed files with 3 additions and 13 deletions
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
|
@ -13,7 +13,7 @@ pipeline {
|
|||
parameters {
|
||||
// see https://wiki.eclipse.org/Jenkins#JDK
|
||||
choice(name: 'JDK_VERSION', description: 'Which JDK should be used?', choices: [
|
||||
'temurin-jdk11-latest', 'temurin-jdk17-latest'
|
||||
'temurin-jdk8-latest', 'temurin-jdk11-latest', 'temurin-jdk17-latest'
|
||||
])
|
||||
booleanParam(
|
||||
name: 'TRIGGER_DOWNSTREAM_BUILD',
|
||||
|
|
|
@ -29,8 +29,6 @@ public class JavaVersionTest {
|
|||
|
||||
@Test
|
||||
public void testFromQualifier() {
|
||||
assertEquals(JavaVersion.JAVA17, JavaVersion.fromQualifier("17"));
|
||||
assertEquals(JavaVersion.JAVA17, JavaVersion.fromQualifier("1.17"));
|
||||
assertEquals(JavaVersion.JAVA11, JavaVersion.fromQualifier("11"));
|
||||
assertEquals(JavaVersion.JAVA11, JavaVersion.fromQualifier("1.11"));
|
||||
assertEquals(JavaVersion.JAVA10, JavaVersion.fromQualifier("10"));
|
||||
|
@ -51,7 +49,6 @@ public class JavaVersionTest {
|
|||
|
||||
@Test
|
||||
public void test_getQualifier() {
|
||||
assertEquals("17", JavaVersion.JAVA17.getQualifier());
|
||||
assertEquals("11", JavaVersion.JAVA11.getQualifier());
|
||||
assertEquals("10", JavaVersion.JAVA10.getQualifier());
|
||||
assertEquals("9", JavaVersion.JAVA9.getQualifier());
|
||||
|
@ -68,8 +65,6 @@ public class JavaVersionTest {
|
|||
|
||||
@Test
|
||||
public void test_toJdtClassFileConstant () {
|
||||
assertEquals(3997696, JavaVersion.JAVA17.toJdtClassFileConstant());
|
||||
assertEquals(3604480, JavaVersion.JAVA11.toJdtClassFileConstant());
|
||||
assertEquals(3538944, JavaVersion.JAVA10.toJdtClassFileConstant());
|
||||
assertEquals(3473408, JavaVersion.JAVA9.toJdtClassFileConstant());
|
||||
assertEquals(3407872, JavaVersion.JAVA8.toJdtClassFileConstant());
|
||||
|
|
|
@ -53,11 +53,7 @@ public enum JavaVersion {
|
|||
/**
|
||||
* Well, Java 11
|
||||
*/
|
||||
JAVA11("Java 11", new String[] {"11", "1.11"}, "JavaSE-11", "-1.11", Constants.JAVA11),
|
||||
/**
|
||||
* Well, Java 17, next LTS version
|
||||
*/
|
||||
JAVA17("Java 17", new String[] {"17", "1.17"}, "JavaSE-17", "-1.17", Constants.JAVA17)
|
||||
JAVA11("Java 11", new String[] {"11", "1.11"}, "JavaSE-11", "-1.11", Constants.JAVA11)
|
||||
;
|
||||
|
||||
private static final class Constants {
|
||||
|
@ -70,7 +66,6 @@ public enum JavaVersion {
|
|||
private static final long JAVA9 = ((long)(MAJOR_VERSION_1_5 + 4) << 16) + MINOR_VERSION_0;
|
||||
private static final long JAVA10 = ((long)(MAJOR_VERSION_1_5 + 5) << 16) + MINOR_VERSION_0;
|
||||
private static final long JAVA11 = ((long)(MAJOR_VERSION_1_5 + 6) << 16) + MINOR_VERSION_0;
|
||||
private static final long JAVA17 = ((long)(MAJOR_VERSION_1_5 + 12) << 16) + MINOR_VERSION_0;
|
||||
}
|
||||
|
||||
// if you introduce a new JavaVersion don't forget to adapt
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
<tycho-version>1.7.0</tycho-version>
|
||||
<root-dir>${basedir}/..</root-dir>
|
||||
<JENKINS_URL>https://ci.eclipse.org/xtext</JENKINS_URL>
|
||||
<upstreamBranch>cd_platformUpdateExp</upstreamBranch>
|
||||
<upstreamBranch>master</upstreamBranch>
|
||||
</properties>
|
||||
|
||||
<repositories>
|
||||
|
|
Loading…
Reference in a new issue