Skip to content

Commit 0c04af6

Browse files
amergeyamergey
committed
generate 2023.12 bom
1 parent 2f64f0a commit 0c04af6

12 files changed

+24308
-10
lines changed

‎data/2023.12/bnd-output.txt

Lines changed: 5122 additions & 0 deletions
Large diffs are not rendered by default.

‎data/2023.12/maven-artifacts.json

Lines changed: 2467 additions & 0 deletions
Large diffs are not rendered by default.

‎data/2023.12/potential-maven-artifacts.json

Lines changed: 13657 additions & 0 deletions
Large diffs are not rendered by default.

‎data/2023.12/repolist.bndrun

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-standalone true
2+
-plugin.p2 \
3+
aQute.bnd.repository.p2.provider.P2Repository; \
4+
url="https://download.eclipse.org/releases/2023-12"

‎repo/fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom

Lines changed: 2991 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fde35f131f1634b84b1b481294729efd

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
69eecd479d82649dc00fcfc8d6f65354cf373985

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1f9390752b1721aacb08818a1c824ab5551e25f08b994fa4df709268072acaeb

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1dc10c1407ed9ae57db5a272af330ab32ba68db30c188006e44405d8a44f16521c7f3b48ed8ca489186903065c9a359dcdc9f2739c625e6b3aad46628d5436ab

‎src/main/resources/mavenMappings.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,22 @@
1818
<mavenMappings namePattern="com\.sun\.el" groupId="org.eclipse.jetty.orbit" artifactId="com.sun.el" versionPattern="(.*)" versionTemplate="$1" />
1919
<mavenMappings namePattern="javassist" groupId="org.javassist" artifactId="javassist" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3-$4"/>
2020
<mavenMappings namePattern="javax\.annotation" groupId="jakarta.annotation" artifactId="jakarta.annotation-api"/>
21+
<mavenMappings namePattern="jakarta\.annotation-api" groupId="jakarta.annotation" artifactId="jakarta.annotation-api"/>
2122
<mavenMappings namePattern="javax\.activation" groupId="com.sun.activation" artifactId="jakarta.activation" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
2223
<mavenMappings namePattern="javax\.el" groupId="javax.el" artifactId="el-api" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
24+
<mavenMappings namePattern="jakarta\.el" groupId="jakarta.el" artifactId="jakarta.el-api" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
2325
<mavenMappings namePattern="org\.jdom" groupId="org.jdom" artifactId="jdom" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
2426
<mavenMappings namePattern="jakarta\.ws\.rs-api" groupId="jakarta.ws.rs" artifactId="jakarta.ws.rs-api" versionPattern="([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
2527
<mavenMappings namePattern="javax\.ws\.rs" groupId="jakarta.ws.rs" artifactId="jakarta.ws.rs-api" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
2628
<mavenMappings namePattern="javax\.el-api" groupId="jakarta.el" artifactId="jakarta.el-api" versionPattern="(.*)" versionTemplate="$1"/>
2729
<mavenMappings namePattern="jakarta\.xml\.bind" groupId="jakarta.xml.bind" artifactId="jakarta.xml.bind-api"/>
28-
<mavenMappings namePattern="([^.]+)\.servlet$" groupId="$1.servlet" artifactId="$1.servlet-api"/>
30+
<mavenMappings namePattern="([^.]+)\.servlet$" groupId="$1.servlet" artifactId="$1.servlet-api" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
2931
<mavenMappings namePattern="([^.]+)\.servlet\.jsp(.*)" groupId="$1.servlet.jsp" artifactId="$1.servlet.jsp-api"/>
3032
<mavenMappings namePattern="(javax.inject)" groupId="$1" artifactId="$1" versionPattern="([^.]+)\.0(?:\..*)?" versionTemplate="$1"/>
33+
<mavenMappings namePattern="jakarta\.inject\.jakarta\.inject-api" groupId="jakarta.inject" artifactId="jakarta.inject-api"/>
3134
<mavenMappings namePattern="org\.apache\.commons\.cli" groupId="commons-cli" artifactId="commons-cli" versionPattern="([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
32-
<mavenMappings namePattern="org\.apache\.commons\.compress" groupId="org.apache.commons" artifactId="commons-compress" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
35+
<mavenMappings namePattern="org\.apache\.commons\.commons-compress" groupId="org.apache.commons" artifactId="commons-compress"/>
36+
<mavenMappings namePattern="org\.apache\.commons\.compress" groupId="org.apache.commons" artifactId="commons-compress" versionPattern="([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
3337
<mavenMappings namePattern="org\.apache\.commons\.collections" groupId="commons-collections" artifactId="commons-collections" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
3438
<mavenMappings namePattern="org\.apache\.commons\.commons-fileupload" groupId="commons-fileupload" artifactId="commons-fileupload" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
3539
<mavenMappings namePattern="org\.apache\.commons\.(commons-[^.]+)" groupId="$1" artifactId="$1"/>

‎src/test/java/fr/jmini/utils/ecentral/ECentralTaskTest.java

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -241,29 +241,53 @@ void testToMavenArtifactIo() throws Exception {
241241
@Test
242242
void testToMavenArtifactJavax() throws Exception {
243243
List<MavenMapping> mavenMappings = ECentralTask.readMavenMappings();
244-
MavenArtifact icu = ECentralTask.toMavenArtifact(new BndEntry("jakarta.servlet.jsp", "3.0.0.v20210105-0527"), mavenMappings)
244+
MavenArtifact artifact = ECentralTask.toMavenArtifact(new BndEntry("jakarta.servlet.jsp", "3.0.0.v20210105-0527"), mavenMappings)
245245
.orElseThrow();
246-
assertThat(icu.getGroupId())
246+
assertThat(artifact.getGroupId())
247247
.as("groupId")
248248
.isEqualTo("jakarta.servlet.jsp");
249-
assertThat(icu.getArtifactId())
249+
assertThat(artifact.getArtifactId())
250250
.as("artifactId")
251251
.isEqualTo("jakarta.servlet.jsp-api");
252-
assertThat(icu.getVersion())
252+
assertThat(artifact.getVersion())
253253
.as("version")
254254
.isEqualTo("3.0.0");
255255

256-
icu = ECentralTask.toMavenArtifact(new BndEntry("jakarta.ws.rs-api", "2.1.6"), mavenMappings)
256+
artifact = ECentralTask.toMavenArtifact(new BndEntry("jakarta.ws.rs-api", "2.1.6"), mavenMappings)
257257
.orElseThrow();
258-
assertThat(icu.getGroupId())
258+
assertThat(artifact.getGroupId())
259259
.as("groupId")
260260
.isEqualTo("jakarta.ws.rs");
261-
assertThat(icu.getArtifactId())
261+
assertThat(artifact.getArtifactId())
262262
.as("artifactId")
263263
.isEqualTo("jakarta.ws.rs-api");
264-
assertThat(icu.getVersion())
264+
assertThat(artifact.getVersion())
265265
.as("version")
266266
.isEqualTo("2.1.6");
267+
268+
artifact = ECentralTask.toMavenArtifact(new BndEntry("jakarta.annotation-api", "1.3.5"), mavenMappings)
269+
.orElseThrow();
270+
assertThat(artifact.getGroupId())
271+
.as("groupId")
272+
.isEqualTo("jakarta.annotation");
273+
assertThat(artifact.getArtifactId())
274+
.as("artifactId")
275+
.isEqualTo("jakarta.annotation-api");
276+
assertThat(artifact.getVersion())
277+
.as("version")
278+
.isEqualTo("1.3.5");
279+
280+
artifact = ECentralTask.toMavenArtifact(new BndEntry("jakarta.inject.jakarta.inject-api", "1.0.5"), mavenMappings)
281+
.orElseThrow();
282+
assertThat(artifact.getGroupId())
283+
.as("groupId")
284+
.isEqualTo("jakarta.inject");
285+
assertThat(artifact.getArtifactId())
286+
.as("artifactId")
287+
.isEqualTo("jakarta.inject-api");
288+
assertThat(artifact.getVersion())
289+
.as("version")
290+
.isEqualTo("1.0.5");
267291
}
268292

269293
@Test
@@ -516,6 +540,18 @@ void testToMavenArtifactApacheCommons() throws Exception {
516540
.as("version")
517541
.isEqualTo("1.4");
518542

543+
MavenArtifact commonsCompress = ECentralTask.toMavenArtifact(new BndEntry("org.apache.commons.commons-compress", "1.25.0"), commonsMavenMappings)
544+
.orElseThrow();
545+
assertThat(commonsCompress.getGroupId())
546+
.as("groupId")
547+
.isEqualTo("org.apache.commons");
548+
assertThat(commonsCompress.getArtifactId())
549+
.as("artifactId")
550+
.isEqualTo("commons-compress");
551+
assertThat(commonsCompress.getVersion())
552+
.as("version")
553+
.isEqualTo("1.25.0");
554+
519555
}
520556

521557
@Test

‎src/test/java/fr/jmini/utils/ecentral/RunTest.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,19 @@
1212
*/
1313
class RunTest {
1414

15+
@Test
16+
void run_2023_12() throws Exception {
17+
Input input = new Input()
18+
.withReleaseName("2023-12")
19+
.withArtifactId("eclipse-full-dependencies");
20+
ECentralTask task = new ECentralTask(input);
21+
task.run();
22+
String mavenArtifacts = Files.readString(task.getMavenArtifactsFile(), StandardCharsets.UTF_8);
23+
String potentialMavenArtifacts = Files.readString(task.getPotentialMavenArtifactsFile(), StandardCharsets.UTF_8);
24+
25+
assertThatJson(mavenArtifacts).isEqualTo(potentialMavenArtifacts);
26+
}
27+
1528
@Test
1629
void run_2023_09() throws Exception {
1730
Input input = new Input()

0 commit comments

Comments
 (0)