Skip to content

Commit 6c32243

Browse files
snjezargrunber
snjeza
authored and
rgrunber
committed
Update M2E to 2.0.0 (Vulnerability in Apache Lucene 8.9)
Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>
1 parent 73b64b9 commit 6c32243

11 files changed

Lines changed: 25 additions & 58 deletions

File tree

‎launch/jdt.ls.remote.server.launch‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
3838
<setAttribute key="selected_features"/>
3939
<setAttribute key="selected_target_bundles">
40-
<setEntry value="ch.qos.logback.classic@default:default"/>
41-
<setEntry value="ch.qos.logback.core@default:default"/>
42-
<setEntry value="ch.qos.logback.slf4j@default:default"/>
4340
<setEntry value="com.google.gson@default:default"/>
4441
<setEntry value="com.google.guava@default:default"/>
4542
<setEntry value="javax.inject@default:default"/>
@@ -93,7 +90,7 @@
9390
<setEntry value="org.eclipse.m2e.core@default:default"/>
9491
<setEntry value="org.eclipse.m2e.jdt@default:default"/>
9592
<setEntry value="org.eclipse.m2e.lifecyclemapping.defaults@default:default"/>
96-
<setEntry value="org.eclipse.m2e.logback.configuration@default:default"/>
93+
<setEntry value="org.apache.commons.codec@default:default"/>
9794
<setEntry value="org.eclipse.m2e.maven.indexer@default:default"/>
9895
<setEntry value="org.eclipse.m2e.maven.runtime.slf4j.simple@default:default"/>
9996
<setEntry value="org.eclipse.m2e.maven.runtime@default:default"/>
@@ -110,7 +107,7 @@
110107
<setEntry value="org.eclipse.xtext.xbase.lib@default:default"/>
111108
<setEntry value="org.gradle.toolingapi@default:default"/>
112109
<setEntry value="org.hamcrest.core@default:default"/>
113-
<setEntry value="org.jboss.tools.maven.apt.core@default:default"/>
110+
<setEntry value="org.eclipse.m2e.apt.core@default:default"/>
114111
<setEntry value="org.junit@default:default"/>
115112
<setEntry value="org.slf4j.api@default:default"/>
116113
</setAttribute>

‎launch/jdt.ls.socket-stream.launch‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
3939
<setAttribute key="selected_features"/>
4040
<setAttribute key="selected_target_bundles">
41-
<setEntry value="ch.qos.logback.classic@default:default"/>
42-
<setEntry value="ch.qos.logback.core@default:default"/>
43-
<setEntry value="ch.qos.logback.slf4j@default:default"/>
4441
<setEntry value="com.google.gson@default:default"/>
4542
<setEntry value="com.google.guava@default:default"/>
4643
<setEntry value="javax.inject@default:default"/>
@@ -94,7 +91,7 @@
9491
<setEntry value="org.eclipse.m2e.core@default:default"/>
9592
<setEntry value="org.eclipse.m2e.jdt@default:default"/>
9693
<setEntry value="org.eclipse.m2e.lifecyclemapping.defaults@default:default"/>
97-
<setEntry value="org.eclipse.m2e.logback.configuration@default:default"/>
94+
<setEntry value="org.apache.commons.codec@default:default"/>
9895
<setEntry value="org.eclipse.m2e.maven.indexer@default:default"/>
9996
<setEntry value="org.eclipse.m2e.maven.runtime.slf4j.simple@default:default"/>
10097
<setEntry value="org.eclipse.m2e.maven.runtime@default:default"/>
@@ -111,7 +108,7 @@
111108
<setEntry value="org.eclipse.xtext.xbase.lib@default:default"/>
112109
<setEntry value="org.gradle.toolingapi@default:default"/>
113110
<setEntry value="org.hamcrest.core@default:default"/>
114-
<setEntry value="org.jboss.tools.maven.apt.core@default:default"/>
111+
<setEntry value="org.eclipse.m2e.apt.core@default:default"/>
115112
<setEntry value="org.junit@default:default"/>
116113
<setEntry value="org.slf4j.api@default:default"/>
117114
</setAttribute>

‎org.eclipse.jdt.ls.core/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
3030
org.eclipse.xtext.xbase.lib,
3131
org.eclipse.core.filesystem;bundle-version="1.7.0",
3232
org.eclipse.jdt.apt.pluggable.core;bundle-version="1.2.0";resolution:=optional,
33-
org.jboss.tools.maven.apt.core;bundle-version="1.3.0";resolution:=optional
33+
org.eclipse.m2e.apt.core;bundle-version="1.3.0";resolution:=optional
3434
Export-Package: org.eclipse.jdt.ls.core.internal;x-friends:="org.eclipse.jdt.ls.tests,org.eclipse.jdt.ls.tests.syntaxserver",
3535
org.eclipse.jdt.ls.core.internal.codemanipulation;x-friends:="org.eclipse.jdt.ls.tests",
3636
org.eclipse.jdt.ls.core.internal.commands;x-friends:="org.eclipse.jdt.ls.tests",

‎org.eclipse.jdt.ls.core/build.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ bin.includes = META-INF/,\
66
lib/jsoup-1.14.2.jar,\
77
lib/remark-1.2.0.jar,\
88
lifecycle-mapping-metadata.xml,\
9-
logback.xml,\
109
plugin.properties,\
1110
gradle/checksums/checksums.json,\
1211
gradle/checksums/versions.json

‎org.eclipse.jdt.ls.core/logback.xml‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JavaLanguageServerPlugin.java‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ public class JavaLanguageServerPlugin extends Plugin {
101101
public static final String HTTPS_PROXY_USER = "https.proxyUser";
102102
public static final String HTTP_PROXY_USER = "http.proxyUser";
103103

104-
private static final String LOGBACK_CONFIG_FILE_PROPERTY = "logback.configurationFile";
105-
private static final String LOGBACK_DEFAULT_FILENAME = "logback.xml";
106-
107104
/**
108105
* Source string send to clients for messages such as diagnostics.
109106
**/
@@ -176,25 +173,6 @@ public void start(BundleContext bundleContext) throws Exception {
176173
JavaLanguageServerPlugin.pluginInstance = this;
177174
setPreferenceNodeId();
178175

179-
// Override logback preferences *before* M2E plugin is activated below
180-
if (isDebug && System.getProperty(LOGBACK_CONFIG_FILE_PROPERTY) == null) {
181-
File stateDir = getStateLocation().toFile();
182-
File configFile = new File(stateDir, LOGBACK_DEFAULT_FILENAME);
183-
if (!configFile.isFile()) {
184-
try (InputStream is = bundleContext.getBundle().getEntry(LOGBACK_DEFAULT_FILENAME).openStream(); FileOutputStream fos = new FileOutputStream(configFile)) {
185-
for (byte[] buffer = new byte[1024 * 4];;) {
186-
int n = is.read(buffer);
187-
if (n < 0) {
188-
break;
189-
}
190-
fos.write(buffer, 0, n);
191-
}
192-
}
193-
}
194-
// ContextInitializer.CONFIG_FILE_PROPERTY
195-
System.setProperty(LOGBACK_CONFIG_FILE_PROPERTY, configFile.getAbsolutePath());
196-
}
197-
198176
if (JDTEnvironmentUtils.isSyntaxServer()) {
199177
disableServices();
200178
preferenceManager = new PreferenceManager();

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/MavenProjectImporter.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
import org.eclipse.m2e.core.MavenPlugin;
5050
import org.eclipse.m2e.core.embedder.MavenModelManager;
5151
import org.eclipse.m2e.core.internal.IMavenConstants;
52-
import org.eclipse.m2e.core.internal.MavenPluginActivator;
5352
import org.eclipse.m2e.core.internal.preferences.MavenConfigurationImpl;
5453
import org.eclipse.m2e.core.project.IMavenProjectImportResult;
5554
import org.eclipse.m2e.core.project.IProjectConfigurationManager;
5655
import org.eclipse.m2e.core.project.LocalProjectScanner;
5756
import org.eclipse.m2e.core.project.MavenProjectInfo;
5857
import org.eclipse.m2e.core.project.ProjectImportConfiguration;
58+
import org.osgi.framework.Bundle;
5959

6060
@SuppressWarnings("restriction")
6161
public class MavenProjectImporter extends AbstractProjectImporter {
@@ -68,6 +68,8 @@ public class MavenProjectImporter extends AbstractProjectImporter {
6868

6969
public static final String POM_FILE = "pom.xml";
7070

71+
private static final String STATE_FILENAME = "workspaceState.ser";
72+
7173
private Set<MavenProjectInfo> projectInfos = null;
7274

7375
private IProjectConfigurationManager configurationManager;
@@ -232,8 +234,14 @@ public void importToWorkspace(IProgressMonitor monitor) throws CoreException, Op
232234
}
233235

234236
private long getLastWorkspaceStateModified() {
235-
File workspaceStateFile = MavenPluginActivator.getDefault().getMavenProjectManager().getWorkspaceStateFile();
236-
return workspaceStateFile.lastModified();
237+
Bundle bundle = Platform.getBundle(IMavenConstants.PLUGIN_ID);
238+
if (bundle != null) {
239+
IPath result = Platform.getStateLocation(bundle);
240+
File bundleStateLocation = result.toFile();
241+
File workspaceStateFile = new File(bundleStateLocation, STATE_FILENAME);
242+
return workspaceStateFile.lastModified();
243+
}
244+
return 0l;
237245
}
238246

239247
private File getProjectDirectory() {
@@ -288,7 +296,7 @@ private Set<MavenProjectInfo> getMavenProjects(File directory, MavenModelManager
288296
}
289297
try {
290298
List<String> folders = directories.stream().map(java.nio.file.Path::toAbsolutePath).map(Object::toString).collect(Collectors.toList());
291-
LocalProjectScanner scanner = new LocalProjectScanner(directory.getParentFile(), folders, false, modelManager);
299+
LocalProjectScanner scanner = new LocalProjectScanner(folders, false, modelManager);
292300
scanner.run(monitor);
293301
return collectProjects(scanner.getProjects());
294302
} catch (InterruptedException e) {

‎org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/StandardPreferenceManager.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import org.eclipse.core.runtime.preferences.InstanceScope;
2424
import org.eclipse.jdt.core.JavaCore;
2525
import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
26+
import org.eclipse.m2e.apt.MavenJdtAptPlugin;
27+
import org.eclipse.m2e.apt.preferences.PreferencesConstants;
2628
import org.eclipse.m2e.core.MavenPlugin;
2729
import org.eclipse.m2e.core.embedder.IMavenConfiguration;
2830
import org.eclipse.m2e.core.internal.IMavenConstants;
@@ -38,7 +40,7 @@
3840
*
3941
*/
4042
public class StandardPreferenceManager extends PreferenceManager {
41-
private static final String M2E_APT_ID = "org.jboss.tools.maven.apt";
43+
private static final String M2E_APT_ID = MavenJdtAptPlugin.PLUGIN_ID;
4244
private IMavenConfiguration mavenConfig;
4345

4446
public StandardPreferenceManager() {
@@ -55,7 +57,7 @@ public static void initializeMavenPreferences() {
5557

5658
IEclipsePreferences m2eAptPrefs = DefaultScope.INSTANCE.getNode(M2E_APT_ID);
5759
if (m2eAptPrefs != null) {
58-
m2eAptPrefs.put(M2E_APT_ID + ".mode", "jdt_apt");
60+
m2eAptPrefs.put(PreferencesConstants.MODE, "jdt_apt");
5961
}
6062

6163
IEclipsePreferences store = InstanceScope.INSTANCE.getNode(IMavenConstants.PLUGIN_ID);

‎org.eclipse.jdt.ls.product/languageServer.product‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
</vm>
2222

2323
<plugins>
24+
<plugin id="org.apache.commons.codec"/>
2425
<plugin id="org.apache.felix.scr"/>
2526
<plugin id="org.eclipse.ant.core"/>
2627
<plugin id="org.eclipse.buildship.core"/>
@@ -52,18 +53,17 @@
5253
<plugin id="org.eclipse.jdt.launching"/>
5354
<plugin id="org.eclipse.jdt.launching.macosx"/>
5455
<plugin id="org.eclipse.jdt.ls.core"/>
56+
<plugin id="org.eclipse.m2e.apt.core"/>
5557
<plugin id="org.eclipse.m2e.core"/>
5658
<plugin id="org.eclipse.m2e.jdt"/>
5759
<plugin id="org.eclipse.m2e.lifecyclemapping.defaults"/>
58-
<plugin id="org.eclipse.m2e.logback.configuration"/>
5960
<plugin id="org.eclipse.m2e.maven.runtime"/>
6061
<plugin id="org.eclipse.m2e.workspace.cli"/>
6162
<plugin id="org.eclipse.osgi"/>
6263
<plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
6364
<plugin id="org.eclipse.osgi.services"/>
6465
<plugin id="org.eclipse.text"/>
6566
<plugin id="org.eclipse.xtext.xbase.lib"/>
66-
<plugin id="org.jboss.tools.maven.apt.core"/>
6767
</plugins>
6868

6969
<configurations>

‎org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
2121
<unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
2222
<unit id="org.eclipse.m2e.logback.feature.feature.group" version="0.0.0"/>
23-
<repository location="https://download.eclipse.org/technology/m2e/releases/1.18.2/"/>
23+
<repository location="https://download.eclipse.org/technology/m2e/snapshots/latest/"/>
2424
</location>
2525
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
2626
<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
@@ -37,10 +37,6 @@
3737
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
3838
<repository location="https://download.eclipse.org/releases/2021-09/202109151000/"/>
3939
</location>
40-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
41-
<unit id="org.jboss.tools.maven.apt.core" version="0.0.0"/>
42-
<repository location="https://jbosstools.github.io/m2e-apt/updates/1.5.4/"/>
43-
</location>
4440
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4541
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.11.0/"/>
4642
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>

0 commit comments

Comments
 (0)