diff --git a/NOTICE.md b/NOTICE.md index 55e8ac14d25..245e9c98386 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -48,7 +48,7 @@ Apache Commons Lang (2.4) * License: Apache License, 2.0 -Apache Log4j (1.2.17) +Apache Log4j / Reload4j (1.2.25) * License: Apache License 2.0 @@ -60,7 +60,7 @@ ASM (9.4) * License: BSD-3-Clause -classgraph (4.8.149) +classgraph (4.8.162) * License: MIT * Project: https://github.com/classgraph/classgraph @@ -70,7 +70,7 @@ Google Gson (2.9.x) * License: Apache License, 2.0 -Google Guava (32.1.2) +Google Guava (32.1.3) * License: Apache License 2.0 diff --git a/org.eclipse.xtend.sdk.feature/feature.xml b/org.eclipse.xtend.sdk.feature/feature.xml index 662d6e14908..006644ab787 100644 --- a/org.eclipse.xtend.sdk.feature/feature.xml +++ b/org.eclipse.xtend.sdk.feature/feature.xml @@ -33,8 +33,8 @@ SPDX-License-Identifier: EPL-2.0 - - + + diff --git a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF index 411b3ede1c8..7dbcbb9f6e0 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.5.0,9.6.0)", org.eclipse.xtend.lib, com.google.guava;bundle-version="[32.1.2,33.0.0)", - io.github.classgraph;bundle-version="4.8.149" + io.github.classgraph.classgraph;bundle-version="4.8.162" Import-Package: 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 394a2990059..0af4e289244 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -152,17 +152,17 @@ com.google.guava guava-gwt - 32.1.2-jre + 32.1.3-jre com.google.guava guava-testlib - 32.1.2-jre + 32.1.3-jre com.google.guava guava - 32.1.2-jre + 32.1.3-jre com.google.inject @@ -177,7 +177,7 @@ io.github.classgraph classgraph - 4.8.149 + 4.8.162 javax.annotation @@ -197,7 +197,7 @@ ch.qos.reload4j reload4j - 1.2.24 + 1.2.25 org.antlr diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml index 1ecdc3d63a0..d909de17185 100644 --- a/org.eclipse.xtext.p2repository/category.xml +++ b/org.eclipse.xtext.p2repository/category.xml @@ -10,8 +10,8 @@ - - + + @@ -20,8 +20,8 @@ - - + + @@ -34,8 +34,8 @@ - - + + diff --git a/org.eclipse.xtext.redist.feature/feature.xml b/org.eclipse.xtext.redist.feature/feature.xml index 1da3831d990..4e27635d22c 100644 --- a/org.eclipse.xtext.redist.feature/feature.xml +++ b/org.eclipse.xtext.redist.feature/feature.xml @@ -28,11 +28,11 @@ SPDX-License-Identifier: EPL-2.0 version="0.0.0"/> - + - + - + - + - + - + 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 c35fdef82fa..abdeaa4131e 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 @@ -22,12 +22,12 @@ - + - + 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 642992806ed..b55c8a002ba 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 @@ -22,12 +22,12 @@ - + - + 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 7bee26c9c6f..ace064a5e37 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 @@ -22,12 +22,12 @@ - + - + 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 42cb06e1225..f41da734016 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 @@ -22,7 +22,7 @@ - + @@ -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 147e0bcd5bf..c663c261d31 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 @@ -22,12 +22,12 @@ - + - + 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 2add176c5ab..aa863fead8d 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 @@ -22,12 +22,12 @@ - + - + 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 bb9fab16eaa..d83a992ed03 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 @@ -89,7 +89,7 @@ class TargetPlatformProject extends ProjectDescriptor { - + @@ -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 e3535e15c4d..3b924f886dc 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 @@ -194,7 +194,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(""); @@ -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 86054ef3ee4..5ba67cf8ee5 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -43,19 +43,19 @@ - + - + - + - + diff --git a/xtext-r202203.target b/xtext-r202203.target index 7174ffddf14..139275cc6c5 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -46,18 +46,18 @@ - + - + - + - + diff --git a/xtext-r202206.target b/xtext-r202206.target index ea8176c288a..e001c599c5e 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -45,18 +45,18 @@ - + - + - + - + diff --git a/xtext-r202209.target b/xtext-r202209.target index 0c2a1fdf94b..dc977d890ad 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -45,19 +45,19 @@ - + - + - + - + diff --git a/xtext-r202212.target b/xtext-r202212.target index f1ae4c747e7..9481a84f5f4 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -45,19 +45,19 @@ - + - + - + - + diff --git a/xtext-r202303.target b/xtext-r202303.target index c36e696424b..5da58db881e 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -45,19 +45,19 @@ - + - + - + - + diff --git a/xtext-r202306.target b/xtext-r202306.target index 6a15c8a508b..087b22c7073 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -45,19 +45,19 @@ - + - + - + - + diff --git a/xtext-r202309.target b/xtext-r202309.target index b7d85d7afc1..4c2d441558d 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -45,19 +45,19 @@ - + - + - + - +