add 2023.03 version + improve/fix artifacts mapping

Author: amergey

data/2023.03/bnd-output.txt

@@ -0,0 +1,4 @@
+-standalone true
+-plugin.p2 \
+      aQute.bnd.repository.p2.provider.P2Repository; \
+              url="https://download.eclipse.org/releases/2023-03"

data/2023.03/maven-artifacts.json

@@ -0,0 +1 @@
+235bae2dc3ef05b515032c62df126c94

data/2023.03/potential-maven-artifacts.json

@@ -0,0 +1 @@
+a66fdbef6f53094aed8a2ef497605b8cb02599dc

data/2023.03/repolist.bndrun

@@ -0,0 +1 @@
+c3b2b2a27ea64cd8503b8d29f5ca552ca4bc8a2e36d36e59fb0b1c36b959d620

repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.03/eclipse-full-dependencies-2023.03.pom

@@ -0,0 +1 @@
+a54eb244d1ccc7bcf8229b808d7cf5e093e1741b73b6c8027826c5da242251bd249f2ab88330f7069379a780bf0221325e672a5d1e36d872887d6f118edb4597

repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.03/eclipse-full-dependencies-2023.03.pom.md5

@@ -13,13 +13,18 @@
   <mavenMappings namePattern="(org\.eclipse)(.*)$" groupId="$1.platform" artifactId="$1$2"/>
   <mavenMappings namePattern="com\.ibm\.icu" groupId="com.ibm.icu" artifactId="icu4j" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
   <mavenMappings namePattern="(com\.jcraft)\.(.*)" groupId="$1" artifactId="$2"/>
+  <mavenMappings namePattern="com\.sun\.el\.javax\.el" groupId="com.sun.el" artifactId="el-ri" versionPattern="(.*)" versionTemplate="$1" />
   <mavenMappings namePattern="com\.sun\.el" groupId="org.eclipse.jetty.orbit" artifactId="com.sun.el" versionPattern="(.*)" versionTemplate="$1" />
   <mavenMappings namePattern="javax\.annotation" groupId="jakarta.annotation" artifactId="jakarta.annotation-api"/>
+  <mavenMappings namePattern="javax\.activation" groupId="com.sun.activation" artifactId="jakarta.activation" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
   <mavenMappings namePattern="javax\.el" groupId="javax.el" artifactId="el-api" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
+  <mavenMappings namePattern="javax\.el-api" groupId="jakarta.el" artifactId="jakarta.el-api" versionPattern="(.*)" versionTemplate="$1"/>
+  <mavenMappings namePattern="jakarta\.xml\.bind" groupId="jakarta.xml.bind" artifactId="jakarta.xml.bind-api"/>
   <mavenMappings namePattern="([^.]+)\.servlet$" groupId="$1.servlet" artifactId="$1.servlet-api"/>
   <mavenMappings namePattern="([^.]+)\.servlet\.jsp(.*)" groupId="$1.servlet.jsp" artifactId="$1.servlet.jsp-api"/>
   <mavenMappings namePattern="(javax.inject)" groupId="$1" artifactId="$1" versionPattern="([^.]+)\.0(?:\..*)?" versionTemplate="$1"/>
   <mavenMappings namePattern="org\.apache\.commons\.compress" groupId="org.apache.commons" artifactId="commons-compress" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
+  <mavenMappings namePattern="org\.apache\.commons\.collections" groupId="commons-collections" artifactId="commons-collections" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
   <mavenMappings namePattern="org\.apache\.commons\.commons-fileupload" groupId="commons-fileupload" artifactId="commons-fileupload" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
   <mavenMappings namePattern="org\.apache\.commons\.(commons-[^.]+)" groupId="$1" artifactId="$1"/>
   <mavenMappings namePattern="org\.apache\.(commons)\.([^.]+)" groupId="$1-$2" artifactId="$1-$2" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
@@ -32,14 +37,21 @@
   <mavenMappings namePattern="(org\.objectweb)\.([^.]+)$" groupId="org.ow2.asm" artifactId="$2" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
   <mavenMappings namePattern="(org\.objectweb)\.([^.]+)\.([^.]+)" groupId="org.ow2.asm" artifactId="$2-$3" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
   <mavenMappings namePattern="org.tukaani.xz" groupId="org.tukaani" artifactId="xz" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
-  <mavenMappings namePattern="org.hamcrest.core" groupId="org.hamcrest" artifactId="hamcrest-core" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
+  <mavenMappings namePattern="org\.hamcrest\.(.*)" groupId="org.hamcrest" artifactId="hamcrest-$1" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
   <mavenMappings namePattern="(org\.junit)\.([^.]+)\.([^.]+)" groupId="$1.$2" artifactId="junit-$2-$3"/>
   <mavenMappings namePattern="(org\.junit)\.([^.]+)\.([^.]+)\.([^.]+)" groupId="$1.$2" artifactId="junit-$2-$3-$4"/>
+  <mavenMappings namePattern="(junit)-([^-]+)-([^-]+)" groupId="org.junit.$2" artifactId="junit-$2-$3"/>
+  <mavenMappings namePattern="(junit)-([^-]+)-([^-]+)-([^-]+)" groupId="org.junit.$2" artifactId="junit-$2-$3-$4"/>
   <mavenMappings namePattern="(org)\.(opentest4j)" groupId="$1.$2" artifactId="$2"/>
   <mavenMappings namePattern="(org)\.(apiguardian)" groupId="$1.$2" artifactId="$2-api"/>
+  <mavenMappings namePattern="org.apiguardian.api" groupId="org.apiguardian" artifactId="apiguardian-api"/>
   <mavenMappings namePattern="org.junit" groupId="junit" artifactId="junit"/>
   <mavenMappings namePattern="org\.(sat4j)\.(.*)" groupId="org.ow2.$1" artifactId="org.ow2.$1.$2"/>
-  <mavenMappings namePattern="org.w3c.css.sac" groupId="org.eclipse.birt.runtime" artifactId="org.w3c.css.sac" versionPattern="(.*)" versionTemplate="$1"/>
+  <mavenMappings namePattern="org\.w3c\.css\.sac" groupId="org.eclipse.birt.runtime" artifactId="org.w3c.css.sac" versionPattern="(.*)" versionTemplate="$1"/>
+  <mavenMappings namePattern="org\.w3c\.dom\.events" groupId="org.eclipse.birt.runtime" artifactId="org.w3c.dom.events" versionPattern="(.*)" versionTemplate="$1"/>
+  <mavenMappings namePattern="org\.w3c\.dom\.smil" groupId="org.eclipse.birt.runtime" artifactId="org.w3c.dom.smil" versionPattern="(.*)" versionTemplate="$1"/>
+  <mavenMappings namePattern="org\.w3c\.dom\.svg" groupId="org.eclipse.birt.runtime.3_7_1" artifactId="org.w3c.dom.svg" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
+  <mavenMappings namePattern="org.apache.batik.dom.svg" groupId="org.apache.xmlgraphics" artifactId="batik-svg-dom" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
   <mavenMappings namePattern="org\.apache\.batik\.([^.]+)\.([^.]+)$" groupId="org.apache.xmlgraphics" artifactId="batik-$1-$2" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
   <mavenMappings namePattern="org\.apache\.batik\.([^.]+)$" groupId="org.apache.xmlgraphics" artifactId="batik-$1" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
   <mavenMappings namePattern="org\.apache\.xmlgraphics$" groupId="org.apache.xmlgraphics" artifactId="xmlgraphics-commons" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
@@ -50,7 +62,9 @@
   <mavenMappings namePattern="com.sun.jna" groupId="net.java.dev.jna" artifactId="jna"/>
   <mavenMappings namePattern="javaewah" groupId="com.googlecode.javaewah" artifactId="JavaEWAH"/>
   <mavenMappings namePattern="(org\.bouncycastle)\.(.*)" groupId="$1" artifactId="$2-jdk18on" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
-  <mavenMappings namePattern="(lpg\.runtime)\.(.*)" groupId="$1" artifactId="$2" versionPattern="(.*)" versionTemplate="$1"/>  
+  <mavenMappings namePattern="bcprov" groupId="org.bouncycastle" artifactId="bcprov-jdk18on" versionPattern="([^.]+)\.([^.]+)\.0" versionTemplate="$1.$2"/>
+  <mavenMappings namePattern="bcpg" groupId="org.bouncycastle" artifactId="bcpg-jdk18on" versionPattern="(.*)" versionTemplate="$1"/>
+  <mavenMappings namePattern="(lpg\.runtime)\.(.*)" groupId="$1" artifactId="$2" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3-$4"/>  
   <mavenMappings namePattern="org.apache.xerces" groupId="xerces" artifactId="xercesImpl"/>
   <mavenMappings namePattern="org.apache.xml.resolver" groupId="xml-resolver" artifactId="xml-resolver" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
   <mavenMappings namePattern="(net\.i2p\.crypto)\.(.*)" groupId="$1" artifactId="$2"/>

repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.03/eclipse-full-dependencies-2023.03.pom.sha1

@@ -270,6 +270,38 @@ void testToMavenArtifactJunit() throws Exception {
                 .isEqualTo("4.13.2");
     }
 
+    @Test
+    void testToMavenArtifactJunit5() throws Exception {
+        List<MavenMapping> mavenMappings = ECentralTask.readMavenMappings();
+        MavenArtifact junit = ECentralTask.toMavenArtifact(new BndEntry("junit-jupiter-api", "5.9.2"), mavenMappings)
+                .orElseThrow();
+        assertThat(junit.getGroupId())
+                .as("groupId")
+                .isEqualTo("org.junit.jupiter");
+        assertThat(junit.getArtifactId())
+                .as("artifactId")
+                .isEqualTo("junit-jupiter-api");
+        assertThat(junit.getVersion())
+                .as("version")
+                .isEqualTo("5.9.2");
+    }
+
+    @Test
+    void testToMavenArtifactLpg() throws Exception {
+        List<MavenMapping> mavenMappings = ECentralTask.readMavenMappings();
+        MavenArtifact junit = ECentralTask.toMavenArtifact(new BndEntry("lpg.runtime.java", "2.0.17.v201004271640"), mavenMappings)
+                .orElseThrow();
+        assertThat(junit.getGroupId())
+                .as("groupId")
+                .isEqualTo("lpg.runtime");
+        assertThat(junit.getArtifactId())
+                .as("artifactId")
+                .isEqualTo("java");
+        assertThat(junit.getVersion())
+                .as("version")
+                .isEqualTo("2.0.17-v201004271640");
+    }
+
     @Test
     void testToMavenArtifactFelix() throws Exception {
         List<MavenMapping> mavenMappings = ECentralTask.readMavenMappings();

repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.03/eclipse-full-dependencies-2023.03.pom.sha256

@@ -12,6 +12,19 @@
  */
 class RunTest {
 
+    @Test
+    void run_2023_03() throws Exception {
+        Input input = new Input()
+                .withReleaseName("2023-03")
+                .withArtifactId("eclipse-full-dependencies");
+        ECentralTask task = new ECentralTask(input);
+        task.run();
+        String mavenArtifacts = Files.readString(task.getMavenArtifactsFile(), StandardCharsets.UTF_8);
+        String potentialMavenArtifacts = Files.readString(task.getPotentialMavenArtifactsFile(), StandardCharsets.UTF_8);
+
+        assertThatJson(mavenArtifacts).isEqualTo(potentialMavenArtifacts);
+    }
+
     @Test
     void run_2022_09() throws Exception {
         Input input = new Input()

repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.03/eclipse-full-dependencies-2023.03.pom.sha512

@@ -1,3 +1,7 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=