diff --git a/m2e-core-tests b/m2e-core-tests index 34ea2b6a54..a129b55566 160000 --- a/m2e-core-tests +++ b/m2e-core-tests @@ -1 +1 @@ -Subproject commit 34ea2b6a54ea1df7cf10bbd037f055bbe929977c +Subproject commit a129b55566fa7fdea9f25f695a6ada4885689d60 diff --git a/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF index 54ad7f0ae5..f55e082469 100644 --- a/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Import-Package: javax.inject;version="[1.0.0,2.0.0)", org.osgi.framework;version="1.10.0", org.slf4j;version="[1.7.0,3.0.0)" Require-Bundle: org.eclipse.wildwebdeveloper.xml;bundle-version="[1.3,1.4)", - org.eclipse.lsp4e;bundle-version="0.16.0", - org.eclipse.lsp4j;bundle-version="0.9.0", + org.eclipse.lsp4e;bundle-version="0.18.0", + org.eclipse.lsp4j;bundle-version="0.21.0", org.eclipse.m2e.core, org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", org.eclipse.core.resources diff --git a/org.eclipse.m2e.logback.feature/feature.xml b/org.eclipse.m2e.logback.feature/feature.xml index d4888e76e6..b1e0f5eff9 100644 --- a/org.eclipse.m2e.logback.feature/feature.xml +++ b/org.eclipse.m2e.logback.feature/feature.xml @@ -16,10 +16,6 @@ %copyright - - - - diff --git a/products/m2e-ide/Eclipse-M2E-IDE.launch b/products/m2e-ide/Eclipse-M2E-IDE.launch index 6df8ce657a..571d0a92b6 100644 --- a/products/m2e-ide/Eclipse-M2E-IDE.launch +++ b/products/m2e-ide/Eclipse-M2E-IDE.launch @@ -2,7 +2,7 @@ - + diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target index df72f7e21a..c979d0ef0f 100644 --- a/target-platform/target-platform.target +++ b/target-platform/target-platform.target @@ -9,11 +9,10 @@ - - + @@ -26,7 +25,7 @@ - + @@ -34,8 +33,8 @@ - - + + @@ -59,7 +58,7 @@ - + ch.qos.logback @@ -68,10 +67,9 @@ jar - - jakarta.servlet - jakarta.servlet-api - 5.0.0 + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + 1.3.7 jar @@ -87,19 +85,19 @@ com.google.guava failureaccess - 1.0.1 + 1.0.2 jar com.google.guava guava - 32.1.2-jre + 32.1.3-jre jar commons-cli commons-cli - 1.5.0 + 1.6.0 jar @@ -173,4 +171,4 @@ Import-Package: !* - + \ No newline at end of file