Skip to content

Commit

Permalink
generate 2023.12 bom
Browse files Browse the repository at this point in the history
  • Loading branch information
@amergey
amergey committed Dec 21, 2023
1 parent 2f64f0a commit b5f4818
Show file tree
Hide file tree
Showing 12 changed files with 24,386 additions and 10 deletions.
5,122 changes: 5,122 additions & 0 deletions data/2023.12/bnd-output.txt
View file

Large diffs are not rendered by default.

2,502 changes: 2,502 additions & 0 deletions data/2023.12/maven-artifacts.json
View file

Large diffs are not rendered by default.

13,657 changes: 13,657 additions & 0 deletions data/2023.12/potential-maven-artifacts.json
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions data/2023.12/repolist.bndrun
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-standalone true
-plugin.p2 \
aQute.bnd.repository.p2.provider.P2Repository; \
url="https://download.eclipse.org/releases/2023-12"
3,033 changes: 3,033 additions & 0 deletions ...fr/jmini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ...mini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9bf845a4059ab90399a22c6981cb28b
1 change: 1 addition & 0 deletions ...ini/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a0fe57d80196ff79373bb7240158199dda9dfd71
1 change: 1 addition & 0 deletions ...i/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.sha256
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3376ec4397f99651b7860d2c206c73105ee01f3c2e008db41bf6bfd2b4301029
1 change: 1 addition & 0 deletions ...i/ecentral/eclipse-full-dependencies/2023.12/eclipse-full-dependencies-2023.12.pom.sha512
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
09c7144a21055b390fa8b0fa8939b6a47c26d552524605560d1f3a2b572abb5166322761e5f334078db2c19f3a5e6f81c943ee1ad660500a0d34c9c85ab0c3db
9 changes: 7 additions & 2 deletions src/main/resources/mavenMappings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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"/>
Expand Down
52 changes: 44 additions & 8 deletions src/test/java/fr/jmini/utils/ecentral/ECentralTaskTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/fr/jmini/utils/ecentral/RunTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit b5f4818

Please sign in to comment.