Consider only artifacts with "osgi.bundle" classifier (#156 fixes #155)

Author: nedtwigg

CHANGES.md

@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+### Fixed
+- Fix version parsing in eclipseMavenCentral ([#156](https://github.com/diffplug/goomph/pull/156))
+
 ## [3.32.0] - 2021-09-03
 ### Added
 - New plugin `com.diffplug.configuration-cache-for-platform-specific-build` which makes the `OS.getNative()` and `SwtPlatform.xxx` methods work without breaking the Gradle configuration cache. ([#153](https://github.com/diffplug/goomph/pull/153))

src/main/java/com/diffplug/gradle/eclipse/MavenCentralMapping.java

@@ -44,7 +44,7 @@ public class MavenCentralMapping {
 	private static final String JDT = "org.eclipse.jdt";
 	private static final String PDE = "org.eclipse.pde";
 	private static final String EMF = "org.eclipse.emf";
-	
+
 	public static boolean isEclipseGroup(String group) {
 		return group.equals(PLATFORM) || group.equals(JDT) || group.equals(PDE) || group.equals(EMF);
 	}
@@ -72,10 +72,13 @@ static Map<String, String> parse(InputStream inputStream) throws ParserConfigura
 		for (int i = 0; i < artifacts.getChildNodes().getLength(); ++i) {
 			Node artifact = artifacts.getChildNodes().item(i);
 			if ("artifact".equals(artifact.getNodeName())) {
-				String id = artifact.getAttributes().getNamedItem("id").getNodeValue();
-				String version = artifact.getAttributes().getNamedItem("version").getNodeValue();
-				Version parsed = Version.parseVersion(version);
-				map.put(id, parsed.getMajor() + "." + parsed.getMinor() + "." + parsed.getMicro());
+				String classifier = artifact.getAttributes().getNamedItem("classifier").getNodeValue();
+				if ("osgi.bundle".equals(classifier)) {
+					String id = artifact.getAttributes().getNamedItem("id").getNodeValue();
+					String version = artifact.getAttributes().getNamedItem("version").getNodeValue();
+					Version parsed = Version.parseVersion(version);
+					map.put(id, parsed.getMajor() + "." + parsed.getMinor() + "." + parsed.getMicro());
+				}
 			}
 		}
 		return map;

src/test/java/com/diffplug/gradle/eclipse/MavenCentralMappingTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2020 DiffPlug
+ * Copyright (C) 2015-2021 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 
 public class MavenCentralMappingTest {
 	@Test
-	public void testParsing() throws IOException, ParserConfigurationException, SAXException {
+	public void testParsing463() throws IOException, ParserConfigurationException, SAXException {
 		try (InputStream input = MavenCentralMappingTest.class.getResourceAsStream("/artifacts-4.6.3.xml")) {
 			assert463(MavenCentralMapping.parse(input));
 		}
@@ -42,7 +42,23 @@ private void assert463(Map<String, String> bundleToVersion) {
 		Assertions.assertThat(bundleToVersion)
 				.containsEntry("org.eclipse.debug.core", "3.10.100")
 				.containsEntry("org.eclipse.equinox.p2.metadata", "2.3.100")
-				.hasSize(895);
+				.containsEntry("org.eclipse.help", "3.7.0")
+				.hasSize(743);
+	}
+
+	@Test
+	public void testParsing4140() throws IOException, ParserConfigurationException, SAXException {
+		try (InputStream input = MavenCentralMappingTest.class.getResourceAsStream("/artifacts-4.14.0.xml")) {
+			assert4140(MavenCentralMapping.parse(input));
+		}
+	}
+
+	private void assert4140(Map<String, String> bundleToVersion) {
+		Assertions.assertThat(bundleToVersion)
+				.containsEntry("org.eclipse.debug.core", "3.14.100")
+				.containsEntry("org.eclipse.equinox.p2.metadata", "2.4.600")
+				.containsEntry("org.eclipse.help", "3.8.600")
+				.hasSize(785);
 	}
 
 	@Test