diff --git a/NOTICE.md b/NOTICE.md
index 074110079f3..24280949aff 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -60,7 +60,7 @@ ASM (9.6)
* License: BSD-3-Clause
-classgraph (4.8.163)
+classgraph (4.8.164)
* License: MIT
* Project: https://github.com/classgraph/classgraph
diff --git a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
index 813e3196d00..d48eca3c0d3 100644
--- a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle:
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)",
org.eclipse.xtend.lib,
com.google.guava;bundle-version="[32.1.2,33.0.0)"
-Import-Package: io.github.classgraph;version="4.8.163",
+Import-Package: io.github.classgraph;version="4.8.164",
org.apache.commons.logging;version="1.0.4";resolution:=optional,
org.apache.log4j;version="1.2.24"
Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
index e06c2247887..71225f455af 100644
--- a/org.eclipse.xtext.dev-bom/pom.xml
+++ b/org.eclipse.xtext.dev-bom/pom.xml
@@ -177,7 +177,7 @@
io.github.classgraph
classgraph
- 4.8.163
+ 4.8.164
javax.annotation
diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml
index f8abaf7f8f3..255326ea6e1 100644
--- a/org.eclipse.xtext.p2repository/category.xml
+++ b/org.eclipse.xtext.p2repository/category.xml
@@ -34,7 +34,7 @@
-
-
+
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
index eddf84b74a9..4e3eb9595dd 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
@@ -27,7 +27,7 @@
-
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
index 2adef5a0d1a..762c81514f3 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
@@ -27,7 +27,7 @@
-
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
index 6ea4d807642..b8f3781a89d 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
@@ -27,7 +27,7 @@
-
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
index 10465b6efeb..d7ac1dcc260 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
@@ -27,7 +27,7 @@
-
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
index 5ff2cc70095..e469d86f607 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
@@ -39,7 +39,7 @@
-
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
index 64fa1d20cda..fa1af16a6eb 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
@@ -27,7 +27,7 @@
-
+
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
index cc6a880f68a..7b84da2d85c 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
@@ -27,7 +27,7 @@
-
+
diff --git a/org.eclipse.xtext.ui.tests/src-longrunning/org/eclipse/xtext/ui/tests/refactoring/ProgressReportingTest.java b/org.eclipse.xtext.ui.tests/src-longrunning/org/eclipse/xtext/ui/tests/refactoring/ProgressReportingTest.java
index cb1ed2bd3bf..374d87ab43e 100644
--- a/org.eclipse.xtext.ui.tests/src-longrunning/org/eclipse/xtext/ui/tests/refactoring/ProgressReportingTest.java
+++ b/org.eclipse.xtext.ui.tests/src-longrunning/org/eclipse/xtext/ui/tests/refactoring/ProgressReportingTest.java
@@ -15,12 +15,14 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.ltk.core.refactoring.resource.RenameResourceDescriptor;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.StringExtensions;
import org.junit.Assert;
import org.junit.ComparisonFailure;
import org.junit.Test;
+import org.osgi.framework.Version;
/**
* @author Christian Schneider - Initial contribution and API
@@ -34,7 +36,7 @@ public static class TestProgressMonitor extends NullProgressMonitor {
@Override
public void worked(int work) {
accumulatedWork = accumulatedWork + work;
- events.add("Worked " +work + " (" + accumulatedWork + ")");
+ events.add("Worked " + work + " (" + accumulatedWork + ")");
}
@Override
@@ -80,44 +82,57 @@ public void assertLogged(List expectation) {
@Test
public void testProgressReportOfRenameCommonDir() throws Exception {
- String model =
- "package foo.bar\n" +
- "element X {\n" +
- " ref X\n" +
- "}\n";
+ String model = "package foo.bar\n" + "element X {\n" + " ref X\n" + "}\n";
IFile x = file("foo/X.fileawaretestlanguage", model);
- String model2 =
- "package foo\n" +
- "element Y {\n" +
- " ref bar.X\n" +
- "}\n";
+ String model2 = "package foo\n" + "element Y {\n" + " ref bar.X\n" + "}\n";
IFile y = file("foo/Y.fileawaretestlanguage", model2);
ProgressReportingTest.TestProgressMonitor monitor = new ProgressReportingTest.TestProgressMonitor();
performRename(x.getParent(), "baz", monitor);
Assert.assertFalse(x.exists());
Assert.assertFalse(y.exists());
List expectation = new ArrayList<>();
- expectation.add("BeginTask (44)");
- expectation.add("SetTaskName Checking preconditions...");
- expectation.add("InternalWorked 4.0 (4.0)");
- expectation.add("SetTaskName Checking preconditions...");
- expectation.add("InternalWorked 22.22222222222222 (26.22222222222222)");
- expectation.add("SetTaskName Preparing the refactoring...");
- expectation.add("InternalWorked 1.777777777777778 (28.0)");
- expectation.add("SetTaskName Preparing and applying file changes...");
- expectation.add("InternalWorked 0.8355555555555556 (28.835555555555555)");
- expectation.add("InternalWorked 0.8355555555555556 (29.67111111111111)");
- expectation.add("InternalWorked 0.4177777777777778 (30.08888888888889)");
- expectation.add("InternalWorked 0.4177777777777778 (30.506666666666668)");
- expectation.add("InternalWorked 0.4177777777777778 (30.924444444444447)");
- expectation.add("InternalWorked 0.4177777777777778 (31.342222222222226)");
- expectation.add("SetTaskName Creating text changes...");
- expectation.add("InternalWorked 2.088888888888889 (33.431111111111115)");
- expectation.add("InternalWorked 0.8444444444444444 (34.275555555555556)");
- expectation.add("InternalWorked 0.8355555555555556 (35.111111111111114)");
- expectation.add("InternalWorked 2.2222222222222223 (37.333333333333336)");
- expectation.add("InternalWorked 6.666666666666664 (44.0)");
- expectation.add("Done");
+ if (Platform.getBundle("org.eclipse.ltk.core.refactoring").getVersion().compareTo(new Version("3.14.200")) >= 0) {
+ expectation.add("BeginTask (44)");
+ expectation.add("InternalWorked 4.0 (4.0)");
+ expectation.add("InternalWorked 22.2 (26.2)");
+ expectation.add("InternalWorked 1.76 (27.96)");
+ expectation.add("SetTaskName Preparing and applying file changes...");
+ expectation.add("InternalWorked 0.8 (28.76)");
+ expectation.add("InternalWorked 0.84 (29.6)");
+ expectation.add("InternalWorked 0.4 (30.0)");
+ expectation.add("InternalWorked 0.44 (30.44)");
+ expectation.add("InternalWorked 0.4 (30.84)");
+ expectation.add("InternalWorked 0.44 (31.28)");
+ expectation.add("SetTaskName Creating text changes...");
+ expectation.add("InternalWorked 2.08 (33.36)");
+ expectation.add("InternalWorked 0.88 (34.24)");
+ expectation.add("InternalWorked 0.84 (35.080000000000005)");
+ expectation.add("InternalWorked 8.920000000000002 (44.00000000000001)");
+ expectation.add("Done");
+ } else {
+ expectation.add("BeginTask (44)");
+ expectation.add("SetTaskName Checking preconditions...");
+ expectation.add("InternalWorked 4.0 (4.0)");
+ expectation.add("SetTaskName Checking preconditions...");
+ expectation.add("InternalWorked 22.22222222222222 (26.22222222222222)");
+ expectation.add("SetTaskName Preparing the refactoring...");
+ expectation.add("InternalWorked 1.777777777777778 (28.0)");
+ expectation.add("SetTaskName Preparing and applying file changes...");
+ expectation.add("InternalWorked 0.8355555555555556 (28.835555555555555)");
+ expectation.add("InternalWorked 0.8355555555555556 (29.67111111111111)");
+ expectation.add("InternalWorked 0.4177777777777778 (30.08888888888889)");
+ expectation.add("InternalWorked 0.4177777777777778 (30.506666666666668)");
+ expectation.add("InternalWorked 0.4177777777777778 (30.924444444444447)");
+ expectation.add("InternalWorked 0.4177777777777778 (31.342222222222226)");
+ expectation.add("SetTaskName Creating text changes...");
+ expectation.add("InternalWorked 2.088888888888889 (33.431111111111115)");
+ expectation.add("InternalWorked 0.8444444444444444 (34.275555555555556)");
+ expectation.add("InternalWorked 0.8355555555555556 (35.111111111111114)");
+ expectation.add("InternalWorked 2.2222222222222223 (37.333333333333336)");
+ expectation.add("InternalWorked 6.666666666666664 (44.0)");
+ expectation.add("Done");
+
+ }
monitor.assertLogged(expectation);
}
diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
index 1c448ee0b3e..c2683dbf408 100644
--- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
+++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
@@ -108,7 +108,7 @@ class TargetPlatformProject extends ProjectDescriptor {
«ENDIF»
-
+
diff --git a/xtext-latest.target b/xtext-latest.target
index 166f420e42b..e4905b19c96 100644
--- a/xtext-latest.target
+++ b/xtext-latest.target
@@ -1,6 +1,6 @@
-
+
@@ -55,7 +55,7 @@
-
+
diff --git a/xtext-r202203.target b/xtext-r202203.target
index c458abc66f5..516d2b06e54 100644
--- a/xtext-r202203.target
+++ b/xtext-r202203.target
@@ -1,6 +1,6 @@
-
+
@@ -57,7 +57,7 @@
-
+
diff --git a/xtext-r202206.target b/xtext-r202206.target
index d292473720a..00114e4a761 100644
--- a/xtext-r202206.target
+++ b/xtext-r202206.target
@@ -1,6 +1,6 @@
-
+
@@ -56,7 +56,7 @@
-
+
diff --git a/xtext-r202209.target b/xtext-r202209.target
index bcba6eb1350..508c9fe4c37 100644
--- a/xtext-r202209.target
+++ b/xtext-r202209.target
@@ -1,6 +1,6 @@
-
+
@@ -57,7 +57,7 @@
-
+
diff --git a/xtext-r202212.target b/xtext-r202212.target
index ab6cf8e0561..3f5ed27e75e 100644
--- a/xtext-r202212.target
+++ b/xtext-r202212.target
@@ -1,6 +1,6 @@
-
+
@@ -57,7 +57,7 @@
-
+
diff --git a/xtext-r202303.target b/xtext-r202303.target
index 6fbde3529c8..fc901973252 100644
--- a/xtext-r202303.target
+++ b/xtext-r202303.target
@@ -1,6 +1,6 @@
-
+
@@ -57,7 +57,7 @@
-
+
diff --git a/xtext-r202306.target b/xtext-r202306.target
index 99018ae0c8b..f23b47fdc36 100644
--- a/xtext-r202306.target
+++ b/xtext-r202306.target
@@ -1,6 +1,6 @@
-
+
@@ -57,7 +57,7 @@
-
+
diff --git a/xtext-r202309.target b/xtext-r202309.target
index b8a84811d69..7943b95cdb2 100644
--- a/xtext-r202309.target
+++ b/xtext-r202309.target
@@ -1,6 +1,6 @@
-
+
@@ -57,7 +57,7 @@
-
+