Skip to content

Commit beefc62

Browse files
amergeyamergey
committed
generate 2023.09 bom
1 parent 960c113 commit beefc62

13 files changed

+24770
-5
lines changed

‎data/2023.09/bnd-output.txt

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

‎data/2023.09/maven-artifacts.json

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

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

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

‎data/2023.09/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-09"

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ asciidoctorjVersion=2.2.0
55

66
assertjVersion=3.23.1
77
jsonUnitVersion=2.36.0
8-
bndVersion=5.3.0
9-
junitVersion=5.7.1
8+
bndVersion=6.4.0
9+
junitVersion=5.10.0
1010
gsonVersion=2.8.7
1111
mvnUtils=1.0.0
1212

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

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

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

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

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

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

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

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

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

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

‎src/main/resources/mavenMappings.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@
1313
<mavenMappings namePattern="(org\.eclipse)(.*)$" groupId="$1.platform" artifactId="$1$2"/>
1414
<mavenMappings namePattern="com\.ibm\.icu" groupId="com.ibm.icu" artifactId="icu4j" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
1515
<mavenMappings namePattern="(com\.jcraft)\.(.*)" groupId="$1" artifactId="$2"/>
16+
<mavenMappings namePattern="(com\.fasterxml\.jackson\.[^.]+)\.(.*)" groupId="$1" artifactId="$2"/>
1617
<mavenMappings namePattern="com\.sun\.el\.javax\.el" groupId="com.sun.el" artifactId="el-ri" versionPattern="(.*)" versionTemplate="$1" />
1718
<mavenMappings namePattern="com\.sun\.el" groupId="org.eclipse.jetty.orbit" artifactId="com.sun.el" versionPattern="(.*)" versionTemplate="$1" />
1819
<mavenMappings namePattern="javassist" groupId="org.javassist" artifactId="javassist" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3-$4"/>
1920
<mavenMappings namePattern="javax\.annotation" groupId="jakarta.annotation" artifactId="jakarta.annotation-api"/>
2021
<mavenMappings namePattern="javax\.activation" groupId="com.sun.activation" artifactId="jakarta.activation" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
2122
<mavenMappings namePattern="javax\.el" groupId="javax.el" artifactId="el-api" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
23+
<mavenMappings namePattern="org\.jdom" groupId="org.jdom" artifactId="jdom" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
24+
<mavenMappings namePattern="jakarta\.ws\.rs-api" groupId="jakarta.ws.rs" artifactId="jakarta.ws.rs-api" versionPattern="([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
2225
<mavenMappings namePattern="javax\.ws\.rs" groupId="jakarta.ws.rs" artifactId="jakarta.ws.rs-api" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)" versionTemplate="$1.$2.$3"/>
2326
<mavenMappings namePattern="javax\.el-api" groupId="jakarta.el" artifactId="jakarta.el-api" versionPattern="(.*)" versionTemplate="$1"/>
2427
<mavenMappings namePattern="jakarta\.xml\.bind" groupId="jakarta.xml.bind" artifactId="jakarta.xml.bind-api"/>
@@ -63,7 +66,7 @@
6366
<mavenMappings namePattern="org\.apache\.batik\.([^.]+)$" groupId="org.apache.xmlgraphics" artifactId="batik-$1" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
6467
<mavenMappings namePattern="org\.apache\.xmlgraphics$" groupId="org.apache.xmlgraphics" artifactId="xmlgraphics-commons" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
6568
<mavenMappings namePattern="com.google.gson" groupId="com.google.code.gson" artifactId="gson"/>
66-
<mavenMappings namePattern="com\.google\.guava$" groupId="com.google.guava" artifactId="guava" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2-jre"/>
69+
<mavenMappings namePattern="com\.google\.guava$" groupId="com.google.guava" artifactId="guava" versionPattern="([^.]+)\.([^.]+)\.([^.]+)\.([^.]+)?" versionTemplate="$1.$2.$3-jre"/>
6770
<mavenMappings namePattern="(com\.google\.guava)\.(.*)" groupId="$1" artifactId="$2"/>
6871
<mavenMappings namePattern="com.sun.jna.platform" groupId="net.java.dev.jna" artifactId="jna-platform"/>
6972
<mavenMappings namePattern="com.sun.jna" groupId="net.java.dev.jna" artifactId="jna"/>

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

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,50 @@ void testToMavenArtifactJavax() throws Exception {
252252
assertThat(icu.getVersion())
253253
.as("version")
254254
.isEqualTo("3.0.0");
255+
256+
icu = ECentralTask.toMavenArtifact(new BndEntry("jakarta.ws.rs-api", "2.1.6"), mavenMappings)
257+
.orElseThrow();
258+
assertThat(icu.getGroupId())
259+
.as("groupId")
260+
.isEqualTo("jakarta.ws.rs");
261+
assertThat(icu.getArtifactId())
262+
.as("artifactId")
263+
.isEqualTo("jakarta.ws.rs-api");
264+
assertThat(icu.getVersion())
265+
.as("version")
266+
.isEqualTo("2.1.6");
267+
}
268+
269+
@Test
270+
void testToMavenArtifactJackson() throws Exception {
271+
List<MavenMapping> mavenMappings = ECentralTask.readMavenMappings();
272+
MavenArtifact icu = ECentralTask.toMavenArtifact(new BndEntry("com.fasterxml.jackson.core.jackson-annotations", "2.15.2"), mavenMappings)
273+
.orElseThrow();
274+
assertThat(icu.getGroupId())
275+
.as("groupId")
276+
.isEqualTo("com.fasterxml.jackson.core");
277+
assertThat(icu.getArtifactId())
278+
.as("artifactId")
279+
.isEqualTo("jackson-annotations");
280+
assertThat(icu.getVersion())
281+
.as("version")
282+
.isEqualTo("2.15.2");
283+
}
284+
285+
@Test
286+
void testToMavenArtifactJdom() throws Exception {
287+
List<MavenMapping> mavenMappings = ECentralTask.readMavenMappings();
288+
MavenArtifact icu = ECentralTask.toMavenArtifact(new BndEntry("org.jdom", "1.1.3.v20230812-160"), mavenMappings)
289+
.orElseThrow();
290+
assertThat(icu.getGroupId())
291+
.as("groupId")
292+
.isEqualTo("org.jdom");
293+
assertThat(icu.getArtifactId())
294+
.as("artifactId")
295+
.isEqualTo("jdom");
296+
assertThat(icu.getVersion())
297+
.as("version")
298+
.isEqualTo("1.1.3");
255299
}
256300

257301
@Test
@@ -477,7 +521,7 @@ void testToMavenArtifactApacheCommons() throws Exception {
477521
@Test
478522
void testToMavenArtifactGuava() throws Exception {
479523
List<MavenMapping> mavenMappings = ECentralTask.readMavenMappings();
480-
MavenArtifact guava = ECentralTask.toMavenArtifact(new BndEntry("com.google.guava", "31.1.0.jre"), mavenMappings)
524+
MavenArtifact guava = ECentralTask.toMavenArtifact(new BndEntry("com.google.guava", "32.1.2.jre"), mavenMappings)
481525
.orElseThrow();
482526
assertThat(guava.getGroupId())
483527
.as("groupId")
@@ -487,7 +531,7 @@ void testToMavenArtifactGuava() throws Exception {
487531
.isEqualTo("guava");
488532
assertThat(guava.getVersion())
489533
.as("version")
490-
.isEqualTo("31.1-jre");
534+
.isEqualTo("32.1.2-jre");
491535

492536
guava = ECentralTask.toMavenArtifact(new BndEntry("com.google.guava.failureaccess", "1.0.1"), mavenMappings)
493537
.orElseThrow();

‎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_09() throws Exception {
17+
Input input = new Input()
18+
.withReleaseName("2023-09")
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_06() throws Exception {
1730
Input input = new Input()

0 commit comments

Comments
 (0)