generate 2023.12 bom

amergey · amergey · commit a1b9b846d591 · 2023-12-22T19:17:33.000+01:00
diff --git a/data/2023.12/bnd-output.txt b/data/2023.12/bnd-output.txt
diff --git a/data/2023.12/maven-artifacts.json b/data/2023.12/maven-artifacts.json
diff --git a/data/2023.12/potential-maven-artifacts.json b/data/2023.12/potential-maven-artifacts.json
diff --git a/data/2023.12/repolist.bndrun b/data/2023.12/repolist.bndrun
@@ -0,0 +1,4 @@
+-standalone true
+-plugin.p2 \
+      aQute.bnd.repository.p2.provider.P2Repository; \
+              url="https://download.eclipse.org/releases/2023-12"
diff --git a/repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom b/repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom
diff --git a/repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.md5 b/repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.md5
@@ -0,0 +1 @@
+26bb84940fa7a8b3e7ac7481dc62cba7
diff --git a/repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.sha1 b/repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.sha1
@@ -0,0 +1 @@
+1e35271738ae58aeffa0456ef375132078c02f74
diff --git a/repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.sha256 b/repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.sha256
@@ -0,0 +1 @@
+1549222853b4b8f5b6af200e36027c218454f049146b700d70e48fbc8f764a48
diff --git a/repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.sha512 b/repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.sha512
@@ -0,0 +1 @@
+dc93629f6383c6b576fd25536394e24a42dacd5374a5b026bca7ea9eefde11497906d065d2d9645022565c919136cd2f405d4ddf80c3e057c616f6730387ce9b
diff --git a/src/main/resources/mavenMappings.txt b/src/main/resources/mavenMappings.txt
@@ -4,6 +4,7 @@
   <mavenMappings namePattern="(org\.eclipse\.jgit)(.*)" groupId="$1" artifactId="$1$2" versionPattern="(.*)" versionTemplate="$1"/>
   <mavenMappings namePattern="(org\.eclipse\.birt)(.*)" groupId="$1" artifactId="$1$2"/>
   <mavenMappings namePattern="(org\.eclipse\.persistence)(.*)" groupId="$1" artifactId="$1$2"/>
+  <mavenMappings namePattern="org\.eclipse\.jetty\.ee8\.(.*)" groupId="org.eclipse.jetty.ee8" artifactId="jetty-ee8-$1" versionPattern="(.*)" versionTemplate="$1"/>
   <mavenMappings namePattern="org\.eclipse\.jetty\.(.*)" groupId="org.eclipse.jetty" artifactId="jetty-$1" versionPattern="(.*)" versionTemplate="$1"/>
   <mavenMappings namePattern="(org.eclipse.xsd)(.*)" groupId="org.eclipse.emf" artifactId="$1$2"/>
   <mavenMappings namePattern="org.eclipse.osgi.services.remoteserviceadmin" groupId="org.eclipse.ecf" artifactId="org.eclipse.osgi.services.remoteserviceadmin"/>
@@ -18,18 +19,22 @@
   <mavenMappings namePattern="com\.sun\.el" groupId="org.eclipse.jetty.orbit" artifactId="com.sun.el" versionPattern="(.*)" versionTemplate="$1" />
   <mavenMappings namePattern="javassist" groupId="org.javassist" artifactId="javassist" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3-$4"/>
   <mavenMappings namePattern="javax\.annotation" groupId="jakarta.annotation" artifactId="jakarta.annotation-api"/>
+  <mavenMappings namePattern="jakarta\.annotation-api" 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="jakarta\.el" groupId="jakarta.el" artifactId="jakarta.el-api" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
   <mavenMappings namePattern="org\.jdom" groupId="org.jdom" artifactId="jdom" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
   <mavenMappings namePattern="jakarta\.ws\.rs-api" groupId="jakarta.ws.rs" artifactId="jakarta.ws.rs-api" versionPattern="([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
   <mavenMappings namePattern="javax\.ws\.rs" groupId="jakarta.ws.rs" artifactId="jakarta.ws.rs-api" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
   <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$" groupId="$1.servlet" artifactId="$1.servlet-api" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
   <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="jakarta\.inject\.jakarta\.inject-api" groupId="jakarta.inject" artifactId="jakarta.inject-api"/>
   <mavenMappings namePattern="org\.apache\.commons\.cli" groupId="commons-cli" artifactId="commons-cli" versionPattern="([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
-  <mavenMappings namePattern="org\.apache\.commons\.compress" groupId="org.apache.commons" artifactId="commons-compress" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
+  <mavenMappings namePattern="org\.apache\.commons\.commons-compress" groupId="org.apache.commons" artifactId="commons-compress"/>
+  <mavenMappings namePattern="org\.apache\.commons\.compress" groupId="org.apache.commons" artifactId="commons-compress" versionPattern="([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
   <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"/>
diff --git a/src/test/java/fr/jmini/utils/ecentral/ECentralTaskTest.java b/src/test/java/fr/jmini/utils/ecentral/ECentralTaskTest.java
@@ -241,29 +241,53 @@ void testToMavenArtifactIo() throws Exception {
     @Test
     void testToMavenArtifactJavax() throws Exception {
         List<MavenMapping> mavenMappings = ECentralTask.readMavenMappings();
-        MavenArtifact icu = ECentralTask.toMavenArtifact(new BndEntry("jakarta.servlet.jsp", "3.0.0.v20210105-0527"), mavenMappings)
+        MavenArtifact artifact = ECentralTask.toMavenArtifact(new BndEntry("jakarta.servlet.jsp", "3.0.0.v20210105-0527"), mavenMappings)
                 .orElseThrow();
-        assertThat(icu.getGroupId())
+        assertThat(artifact.getGroupId())
                 .as("groupId")
                 .isEqualTo("jakarta.servlet.jsp");
-        assertThat(icu.getArtifactId())
+        assertThat(artifact.getArtifactId())
                 .as("artifactId")
                 .isEqualTo("jakarta.servlet.jsp-api");
-        assertThat(icu.getVersion())
+        assertThat(artifact.getVersion())
                 .as("version")
                 .isEqualTo("3.0.0");
 
-        icu = ECentralTask.toMavenArtifact(new BndEntry("jakarta.ws.rs-api", "2.1.6"), mavenMappings)
+        artifact = ECentralTask.toMavenArtifact(new BndEntry("jakarta.ws.rs-api", "2.1.6"), mavenMappings)
                 .orElseThrow();
-        assertThat(icu.getGroupId())
+        assertThat(artifact.getGroupId())
                 .as("groupId")
                 .isEqualTo("jakarta.ws.rs");
-        assertThat(icu.getArtifactId())
+        assertThat(artifact.getArtifactId())
                 .as("artifactId")
                 .isEqualTo("jakarta.ws.rs-api");
-        assertThat(icu.getVersion())
+        assertThat(artifact.getVersion())
                 .as("version")
                 .isEqualTo("2.1.6");
+
+        artifact = ECentralTask.toMavenArtifact(new BndEntry("jakarta.annotation-api", "1.3.5"), mavenMappings)
+                .orElseThrow();
+        assertThat(artifact.getGroupId())
+                .as("groupId")
+                .isEqualTo("jakarta.annotation");
+        assertThat(artifact.getArtifactId())
+                .as("artifactId")
+                .isEqualTo("jakarta.annotation-api");
+        assertThat(artifact.getVersion())
+                .as("version")
+                .isEqualTo("1.3.5");
+
+        artifact = ECentralTask.toMavenArtifact(new BndEntry("jakarta.inject.jakarta.inject-api", "1.0.5"), mavenMappings)
+                .orElseThrow();
+        assertThat(artifact.getGroupId())
+                .as("groupId")
+                .isEqualTo("jakarta.inject");
+        assertThat(artifact.getArtifactId())
+                .as("artifactId")
+                .isEqualTo("jakarta.inject-api");
+        assertThat(artifact.getVersion())
+                .as("version")
+                .isEqualTo("1.0.5");
     }
 
     @Test
@@ -516,6 +540,18 @@ void testToMavenArtifactApacheCommons() throws Exception {
                 .as("version")
                 .isEqualTo("1.4");
 
+        MavenArtifact commonsCompress = ECentralTask.toMavenArtifact(new BndEntry("org.apache.commons.commons-compress", "1.25.0"), commonsMavenMappings)
+                .orElseThrow();
+        assertThat(commonsCompress.getGroupId())
+                .as("groupId")
+                .isEqualTo("org.apache.commons");
+        assertThat(commonsCompress.getArtifactId())
+                .as("artifactId")
+                .isEqualTo("commons-compress");
+        assertThat(commonsCompress.getVersion())
+                .as("version")
+                .isEqualTo("1.25.0");
+
     }
 
     @Test
diff --git a/src/test/java/fr/jmini/utils/ecentral/RunTest.java b/src/test/java/fr/jmini/utils/ecentral/RunTest.java
@@ -12,6 +12,19 @@
  */
 class RunTest {
 
+    @Test
+    void run_2023_12() throws Exception {
+        Input input = new Input()
+                .withReleaseName("2023-12")
+                .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_2023_09() throws Exception {
         Input input = new Input()

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+1e35271738ae58aeffa0456ef375132078c02f74`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+1549222853b4b8f5b6af200e36027c218454f049146b700d70e48fbc8f764a48`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+dc93629f6383c6b576fd25536394e24a42dacd5374a5b026bca7ea9eefde11497906d065d2d9645022565c919136cd2f405d4ddf80c3e057c616f6730387ce9b`