Update m2e to use m2e snapshot (#2390)

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com> Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>
eclipse-jdtls · Jan 10, 2023 · e3f60e8 · e3f60e8
1 parent 34a7b80
commit e3f60e8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target b/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
@@ -17,7 +17,7 @@
             <unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.m2e.logback.feature.feature.group" version="0.0.0"/>
             <unit id="ch.qos.logback.classic" version="0.0.0"/>
-	        <repository location="https://download.eclipse.org/technology/m2e/releases/latest/"/>
+	        <repository location="https://download.eclipse.org/technology/m2e/snapshots/latest/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
@@ -41,4 +41,4 @@
         </location>
     </locations>
     <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-</target>
+</target>
diff --git a/....tests/src/org/eclipse/jdt/ls/core/internal/handlers/WorkspaceDiagnosticsHandlerTest.java b/....tests/src/org/eclipse/jdt/ls/core/internal/handlers/WorkspaceDiagnosticsHandlerTest.java
@@ -256,8 +256,11 @@ public void testMarkerListening() throws Exception {
 		Optional<PublishDiagnosticsParams> pomDiags = allCalls.stream().filter(p -> p.getUri().endsWith("pom.xml")).findFirst();
 		assertTrue("No pom.xml errors were found", pomDiags.isPresent());
 		List<Diagnostic> diags = pomDiags.get().getDiagnostics();
-		assertEquals(diags.toString(), 1, diags.size());
-		assertEquals("Project build error: 'dependencies.dependency.version' for org.apache.commons:commons-lang3:jar is missing.", diags.get(0).getMessage());
+		// https://github.com/redhat-developer/vscode-java/issues/2857
+		// m2e 2.2.0 returns 3 markers
+		assertEquals(diags.toString(), 3, diags.size());
+		Diagnostic diag = diags.stream().filter(d -> d.getMessage().startsWith("Project build error")).findFirst().get();
+		assertEquals("Project build error: 'dependencies.dependency.version' for org.apache.commons:commons-lang3:jar is missing.", diag.getMessage());
 	}
 
 	@Test