From 5a138f0ab506fccd367977e9ce084e32b6e8b629 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Thu, 7 Dec 2023 06:59:33 +0100 Subject: [PATCH 1/2] update to orbit 2024-03 Signed-off-by: Christian Dietrich --- .../full/full.parent/full.target/full.target.target | 2 +- .../lsMavenTychoApp.target/lsMavenTychoApp.target.target | 2 +- .../lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target | 2 +- .../mavenTycho.target/mavenTycho.target.target | 2 +- .../mavenTychoJ17.target/mavenTychoJ17.target.target | 2 +- .../mavenTychoP2.target/mavenTychoP2.target.target | 2 +- .../mavenTychoP2J17.target/mavenTychoP2J17.target.target | 2 +- .../tp/domainmodel.target | 2 +- .../org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend | 2 +- .../org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java | 2 +- xtext-latest.target | 2 +- xtext-r202203.target | 2 +- xtext-r202206.target | 2 +- xtext-r202212.target | 2 +- xtext-r202303.target | 2 +- xtext-r202306.target | 2 +- xtext-r202309.target | 2 +- xtext-r202312.target | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) 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 d2effb65696..f1fbb242e3f 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 @@ -28,7 +28,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 7d6e1c3a11f..aa773003e8e 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 @@ -28,7 +28,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 40404679df4..4353518548c 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 @@ -28,7 +28,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 62e49b7fd34..f9bcd7eec34 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 @@ -28,7 +28,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 2d93fae435a..3b098742d91 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 @@ -40,7 +40,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 d46bc2466a0..0a512ef90a3 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 @@ -28,7 +28,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 dc4cced9694..4aaa74e08ae 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 @@ -28,7 +28,7 @@ - + diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target index 2402d3fdc3e..67a59d63c1c 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target @@ -23,7 +23,7 @@ Just mention the p2 repo so that additional requirements with ranges specified in features and bundles are taken from Orbit (e.g., objectweb.asm) --> - + 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 66fb62af782..905841f9a8d 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 @@ -109,7 +109,7 @@ class TargetPlatformProject extends ProjectDescriptor { «ENDIF» - + diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java index 8a9eb4a470f..0b8d6f9d1b3 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java @@ -254,7 +254,7 @@ public CharSequence target() { _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t"); _builder.append(""); diff --git a/xtext-latest.target b/xtext-latest.target index ad05342c820..b7122a245ad 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -42,7 +42,7 @@ - + diff --git a/xtext-r202203.target b/xtext-r202203.target index 94ea3e07105..66fe6f01f57 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -45,7 +45,7 @@ - + diff --git a/xtext-r202206.target b/xtext-r202206.target index 977e787f14a..9f00d67744d 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -44,7 +44,7 @@ - + diff --git a/xtext-r202212.target b/xtext-r202212.target index 416ed6e99be..291ae31e7ef 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -44,7 +44,7 @@ - + diff --git a/xtext-r202303.target b/xtext-r202303.target index f95696d837c..c4ad1f1478e 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -44,7 +44,7 @@ - + diff --git a/xtext-r202306.target b/xtext-r202306.target index 0c5566e1ac9..9bbec570d4f 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -44,7 +44,7 @@ - + diff --git a/xtext-r202309.target b/xtext-r202309.target index 727d129e812..02c95685394 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -44,7 +44,7 @@ - + diff --git a/xtext-r202312.target b/xtext-r202312.target index 74fbad0daab..9b6efc9f1d0 100644 --- a/xtext-r202312.target +++ b/xtext-r202312.target @@ -44,7 +44,7 @@ - + From c405309f71dd7a6b5682ac556cbd0f091e51c4b6 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Thu, 7 Dec 2023 07:12:45 +0100 Subject: [PATCH 2/2] bump classgraph Signed-off-by: Christian Dietrich --- NOTICE.md | 2 +- org.eclipse.xtext.common.types/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.dev-bom/pom.xml | 2 +- org.eclipse.xtext.p2repository/category.xml | 4 ++-- .../full/full.parent/full.target/full.target.target | 2 +- .../lsMavenTychoApp.target/lsMavenTychoApp.target.target | 2 +- .../lsMavenTychoFatjar.target.target | 2 +- .../mavenTycho.target/mavenTycho.target.target | 2 +- .../mavenTychoJ17.target/mavenTychoJ17.target.target | 2 +- .../mavenTychoP2.target/mavenTychoP2.target.target | 2 +- .../mavenTychoP2J17.target/mavenTychoP2J17.target.target | 2 +- .../eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend | 2 +- .../org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java | 2 +- xtext-latest.target | 2 +- xtext-r202203.target | 2 +- xtext-r202206.target | 2 +- xtext-r202209.target | 2 +- xtext-r202212.target | 2 +- xtext-r202303.target | 2 +- xtext-r202306.target | 2 +- xtext-r202309.target | 2 +- xtext-r202312.target | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NOTICE.md b/NOTICE.md index 24280949aff..14720e948bc 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -60,7 +60,7 @@ ASM (9.6) * License: BSD-3-Clause -classgraph (4.8.164) +classgraph (4.8.165) * 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 0a75a8b2854..34346f47e19 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.164", +Import-Package: io.github.classgraph;version="4.8.165", 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 cdbddfc3ef7..5cac2490a93 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.164 + 4.8.165 javax.annotation diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml index 255326ea6e1..03a3f4d73b7 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 f1fbb242e3f..663accd555e 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 aa773003e8e..033205350a5 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 4353518548c..69e1630ba52 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 f9bcd7eec34..8d869b217da 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 3b098742d91..1047e569dc4 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 0a512ef90a3..4fa19fefe35 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 4aaa74e08ae..97170cde978 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.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 905841f9a8d..cc5911c276b 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/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java index 0b8d6f9d1b3..897ff5ad922 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java @@ -251,7 +251,7 @@ public CharSequence target() { _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); _builder.append(""); diff --git a/xtext-latest.target b/xtext-latest.target index b7122a245ad..1e0186c0b3f 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -55,7 +55,7 @@ - + diff --git a/xtext-r202203.target b/xtext-r202203.target index 66fe6f01f57..1ef0658fd2c 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -57,7 +57,7 @@ - + diff --git a/xtext-r202206.target b/xtext-r202206.target index 9f00d67744d..6aac6559559 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -56,7 +56,7 @@ - + diff --git a/xtext-r202209.target b/xtext-r202209.target index 01cb8d961c1..9f896fa0c2b 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -57,7 +57,7 @@ - + diff --git a/xtext-r202212.target b/xtext-r202212.target index 291ae31e7ef..0b99c5078e7 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -57,7 +57,7 @@ - + diff --git a/xtext-r202303.target b/xtext-r202303.target index c4ad1f1478e..5b6e182e55b 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -57,7 +57,7 @@ - + diff --git a/xtext-r202306.target b/xtext-r202306.target index 9bbec570d4f..430af936fc6 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -57,7 +57,7 @@ - + diff --git a/xtext-r202309.target b/xtext-r202309.target index 02c95685394..c6cce065f94 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -57,7 +57,7 @@ - + diff --git a/xtext-r202312.target b/xtext-r202312.target index 9b6efc9f1d0..6902b048c9c 100644 --- a/xtext-r202312.target +++ b/xtext-r202312.target @@ -57,7 +57,7 @@ - +