From bc059deb5ebadffd3031ee400e46a31826301e8c Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Mon, 16 Jan 2023 13:55:27 +0100 Subject: [PATCH] [eclipse/xtext#2134] test with eclipse 4.27 snapshot Signed-off-by: Christian Dietrich --- gradle/upstream-repositories.gradle | 1 + org.eclipse.xtext.builder.standalone/build.gradle | 2 -- org.eclipse.xtext.common.types.tests/build.gradle | 2 -- org.eclipse.xtext.generator/build.gradle | 2 -- org.eclipse.xtext.java/build.gradle | 2 -- org.eclipse.xtext.purexbase.tests/build.gradle | 4 +--- org.eclipse.xtext.xbase.testing/build.gradle | 2 -- org.eclipse.xtext.xbase.tests/build.gradle | 2 -- 8 files changed, 2 insertions(+), 15 deletions(-) diff --git a/gradle/upstream-repositories.gradle b/gradle/upstream-repositories.gradle index dc25d13bf4..516c248306 100644 --- a/gradle/upstream-repositories.gradle +++ b/gradle/upstream-repositories.gradle @@ -27,6 +27,7 @@ repositories { mavenCentral() if (findProperty('useJenkinsSnapshots') == 'true') { maven { url "$JENKINS_URL/job/lsp4j/$MVN_REPOPATH" } + maven { url "https://repo.eclipse.org/content/repositories/eclipse-snapshots" } maven { url jenkinsPipelineRepo('xtext-lib','autodetect') } maven { url jenkinsPipelineRepo('xtext-core','autodetect') } } else { diff --git a/org.eclipse.xtext.builder.standalone/build.gradle b/org.eclipse.xtext.builder.standalone/build.gradle index b45c3087c4..4b275fc02f 100644 --- a/org.eclipse.xtext.builder.standalone/build.gradle +++ b/org.eclipse.xtext.builder.standalone/build.gradle @@ -7,6 +7,4 @@ dependencies { api 'org.eclipse.platform:org.eclipse.equinox.common' api 'org.eclipse.platform:org.eclipse.core.runtime' api 'org.eclipse.jdt:org.eclipse.jdt.core' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.apt' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.tool' } diff --git a/org.eclipse.xtext.common.types.tests/build.gradle b/org.eclipse.xtext.common.types.tests/build.gradle index a7ad83e0f2..ceee10f0f0 100644 --- a/org.eclipse.xtext.common.types.tests/build.gradle +++ b/org.eclipse.xtext.common.types.tests/build.gradle @@ -8,8 +8,6 @@ dependencies { api 'org.eclipse.platform:org.eclipse.equinox.common' api 'org.eclipse.platform:org.eclipse.core.runtime' api 'org.eclipse.jdt:org.eclipse.jdt.core' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.apt' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.tool' api 'com.google.errorprone:error_prone_annotations' api 'junit:junit' api 'javax.annotation:javax.annotation-api' diff --git a/org.eclipse.xtext.generator/build.gradle b/org.eclipse.xtext.generator/build.gradle index 5d21159357..c765ae497b 100644 --- a/org.eclipse.xtext.generator/build.gradle +++ b/org.eclipse.xtext.generator/build.gradle @@ -10,8 +10,6 @@ dependencies { api 'org.eclipse.platform:org.eclipse.equinox.common' optional 'org.eclipse.platform:org.eclipse.core.runtime' optional 'org.eclipse.jdt:org.eclipse.jdt.core' - optional 'org.eclipse.jdt:org.eclipse.jdt.compiler.apt' - optional 'org.eclipse.jdt:org.eclipse.jdt.compiler.tool' } sourceSets.main.java.srcDir 'packrat' diff --git a/org.eclipse.xtext.java/build.gradle b/org.eclipse.xtext.java/build.gradle index 296971f8b6..d3eccbc6bb 100644 --- a/org.eclipse.xtext.java/build.gradle +++ b/org.eclipse.xtext.java/build.gradle @@ -6,6 +6,4 @@ dependencies { api 'org.eclipse.platform:org.eclipse.equinox.common' api 'org.eclipse.platform:org.eclipse.core.runtime' api 'org.eclipse.jdt:org.eclipse.jdt.core' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.apt' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.tool' } diff --git a/org.eclipse.xtext.purexbase.tests/build.gradle b/org.eclipse.xtext.purexbase.tests/build.gradle index c5a5a8c7af..f3029b1a10 100644 --- a/org.eclipse.xtext.purexbase.tests/build.gradle +++ b/org.eclipse.xtext.purexbase.tests/build.gradle @@ -5,8 +5,6 @@ dependencies { api "org.eclipse.xtext:org.eclipse.xtext.testing:$versions.xtext" api 'org.eclipse.platform:org.eclipse.equinox.common' api 'org.eclipse.platform:org.eclipse.core.runtime' - api 'org.eclipse.jdt:org.eclipse.jdt.core:' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.apt' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.tool' + api 'org.eclipse.jdt:org.eclipse.jdt.core' api 'junit:junit' } diff --git a/org.eclipse.xtext.xbase.testing/build.gradle b/org.eclipse.xtext.xbase.testing/build.gradle index 05b33b8a00..cc4e0a1a3d 100644 --- a/org.eclipse.xtext.xbase.testing/build.gradle +++ b/org.eclipse.xtext.xbase.testing/build.gradle @@ -8,8 +8,6 @@ dependencies { api 'org.eclipse.platform:org.eclipse.equinox.common' api 'org.eclipse.platform:org.eclipse.core.runtime' api 'org.eclipse.jdt:org.eclipse.jdt.core' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.apt' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.tool' } sourceSets.main.java.srcDir 'testdata' diff --git a/org.eclipse.xtext.xbase.tests/build.gradle b/org.eclipse.xtext.xbase.tests/build.gradle index c0a3401cec..32773c7aae 100644 --- a/org.eclipse.xtext.xbase.tests/build.gradle +++ b/org.eclipse.xtext.xbase.tests/build.gradle @@ -11,8 +11,6 @@ dependencies { api 'org.eclipse.platform:org.eclipse.equinox.common' api 'org.eclipse.platform:org.eclipse.core.runtime' api 'org.eclipse.jdt:org.eclipse.jdt.core' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.apt' - api 'org.eclipse.jdt:org.eclipse.jdt.compiler.tool' api 'junit:junit' api 'org.eclipse.emf:org.eclipse.emf.codegen' api 'org.eclipse.emf:org.eclipse.emf.codegen.ecore'