Skip to content

Commit 4c5b91a

Browse files
frengorfrengor
committed
Move TransitiveDependencyCollector to separate subproject
1 parent 95c5177 commit 4c5b91a

File tree

9 files changed

+146
-41
lines changed

9 files changed

+146
-41
lines changed

‎core/build.gradle.kts

+82-4
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,103 @@
1+
import groovy.xml.MarkupBuilder
2+
import java.security.MessageDigest
3+
import java.text.SimpleDateFormat
4+
import java.util.Base64
5+
16
plugins {
27
id("net.kyori.blossom") version "2.0.1"
38
}
49

5-
dependencies {
6-
compileOnly("org.apache.maven.resolver:maven-resolver-supplier:1.9.15")
7-
compileOnly("org.apache.maven:maven-resolver-provider:3.9.4")
10+
val libbyMavenResolverRepo = layout.buildDirectory.dir("libby-maven-resolver-repo").get()
11+
val libbyMavenResolverJar = provider {}.flatMap { // Use a provider to not resolve shadowTask task too early
12+
project(":libby-maven-resolver").tasks.named("shadowJar").flatMap { (it as Jar).archiveFile }
13+
}
14+
15+
val deleteLibbyMavenResolver = tasks.register<Delete>("deleteLibbyMavenResolver") {
16+
delete(libbyMavenResolverRepo)
17+
isFollowSymlinks = false
18+
}
19+
20+
val copyLibbyMavenResolver = tasks.register<Copy>("copyLibbyMavenResolver") {
21+
dependsOn(":libby-maven-resolver:shadowJar")
22+
dependsOn(deleteLibbyMavenResolver)
23+
}
24+
setupCopy()
25+
26+
tasks.test {
27+
dependsOn(copyLibbyMavenResolver)
828
}
929

1030
sourceSets {
1131
main {
1232
blossom {
1333
javaSources {
1434
property("version", project.version.toString())
35+
property("libbyMavenResolverChecksum", provider {
36+
val md = MessageDigest.getInstance("SHA-256")
37+
val sha256 = md.digest(libbyMavenResolverJar.get().asFile.readBytes())
38+
Base64.getEncoder().encodeToString(sha256)
39+
})
1540
}
1641
}
1742
}
1843
test {
1944
blossom {
2045
javaSources {
2146
property("buildDir", layout.buildDirectory.asFile.get().absolutePath.replace("\\", "\\\\"))
47+
property("libbyMavenResolverRepo", libbyMavenResolverRepo.asFile.absolutePath.replace("\\", "\\\\"))
2248
}
2349
}
2450
}
25-
}
51+
}
52+
53+
tasks.named("generateJavaTemplates") {
54+
dependsOn(":libby-maven-resolver:shadowJar")
55+
}
56+
57+
fun setupCopy() {
58+
val file = libbyMavenResolverJar.map { it.asFile }
59+
val version = project.version.toString()
60+
val partialPath = "${project.group.toString().replace('.', '/')}/libby-maven-resolver/${version}"
61+
val mainFolder = libbyMavenResolverRepo.dir(partialPath)
62+
63+
copyLibbyMavenResolver {
64+
from(libbyMavenResolverJar)
65+
into(mainFolder)
66+
}
67+
68+
if (!version.endsWith("-SNAPSHOT")) {
69+
return
70+
}
71+
72+
// Generate snapshot's maven-metadata.xml
73+
val timestamp = file.map { SimpleDateFormat("yyyyMMdd.HHmmss").format(it.lastModified()) }
74+
copyLibbyMavenResolver {
75+
doFirst {
76+
mainFolder.file("maven-metadata.xml").asFile.printWriter().use {
77+
val builder = MarkupBuilder(it)
78+
builder.doubleQuotes = true
79+
builder.withGroovyBuilder {
80+
"metadata"("modelVersion" to "1.1.0") {
81+
"groupId"(project.group.toString())
82+
"artifactId"("libby-maven-resolver")
83+
"version"(version)
84+
"versioning"() {
85+
"snapshot"() {
86+
"timestamp"(timestamp.get())
87+
"buildNumber"("1")
88+
}
89+
}
90+
}
91+
}
92+
}
93+
}
94+
}
95+
96+
// Rename copied file
97+
val newVer = timestamp.map { version.substring(0, version.length - "-SNAPSHOT".length) + '-' + it + "-1" }
98+
return copyLibbyMavenResolver {
99+
rename {
100+
"libby-maven-resolver-${newVer.get()}.jar"
101+
}
102+
}
103+
}

‎core/src/main/java-templates/com/alessiodp/libby/LibbyProperties.java

+5
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,9 @@ public class LibbyProperties {
1313
* User agent string to use when downloading libraries
1414
*/
1515
public static final String HTTP_USER_AGENT = "libby/" + VERSION;
16+
17+
/**
18+
* Checksum of libby-maven-resolver jar
19+
*/
20+
public static final String LIBBY_MAVEN_RESOLVER_CHECKSUM = "{{ libbyMavenResolverChecksum }}";
1621
}

‎core/src/main/java/com/alessiodp/libby/transitive/TransitiveDependencyHelper.java

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.alessiodp.libby.transitive;
22

3+
import com.alessiodp.libby.LibbyProperties;
34
import com.alessiodp.libby.Library;
45
import com.alessiodp.libby.LibraryManager;
56
import com.alessiodp.libby.Util;
67
import com.alessiodp.libby.classloader.IsolatedClassLoader;
78
import org.jetbrains.annotations.NotNull;
89
import org.jetbrains.annotations.Nullable;
910

10-
import java.io.IOException;
1111
import java.lang.reflect.Constructor;
1212
import java.lang.reflect.Method;
1313
import java.nio.file.Path;
@@ -31,10 +31,15 @@
3131
*/
3232
public class TransitiveDependencyHelper {
3333

34+
/**
35+
* com.alessiodp.libby.transitive.TransitiveDependencyCollector class name for reflections
36+
*/
37+
private static final String TRANSITIVE_DEPENDENCY_COLLECTOR_CLASS = replaceWithDots("com{}alessiodp{}libby{}transitive{}TransitiveDependencyCollector");
38+
3439
/**
3540
* org.eclipse.aether.artifact.Artifact class name for reflections
3641
*/
37-
private static final String ARTIFACT_CLASS = replaceWithDots("org.eclipse.aether.artifact.Artifact");
42+
private static final String ARTIFACT_CLASS = replaceWithDots("org{}eclipse{}aether{}artifact{}Artifact");
3843

3944
/**
4045
* TransitiveDependencyCollector class instance, used in {@link #findTransitiveLibraries(Library)}
@@ -68,21 +73,17 @@ public TransitiveDependencyHelper(@NotNull LibraryManager libraryManager, @NotNu
6873
this.libraryManager = libraryManager;
6974

7075
IsolatedClassLoader classLoader = new IsolatedClassLoader();
71-
String collectorClassName = "com.alessiodp.libby.transitive.TransitiveDependencyCollector";
72-
String collectorClassPath = '/' + collectorClassName.replace('.', '/') + ".class";
73-
74-
for (TransitiveLibraryResolutionDependency dependency : TransitiveLibraryResolutionDependency.values()) {
75-
classLoader.addPath(libraryManager.downloadLibrary(dependency.toLibrary()));
76-
}
7776

78-
final Class<?> transitiveDependencyCollectorClass;
79-
try {
80-
transitiveDependencyCollectorClass = classLoader.defineClass(collectorClassName, requireNonNull(getClass().getResourceAsStream(collectorClassPath), "resourceCollectorClass"));
81-
} catch (IOException e) {
82-
throw new RuntimeException(e);
83-
}
77+
classLoader.addPath(libraryManager.downloadLibrary(Library.builder()
78+
.groupId("com{}alessiodp{}libby")
79+
.artifactId("libby-maven-resolver")
80+
.version(LibbyProperties.VERSION)
81+
.checksumFromBase64(LibbyProperties.LIBBY_MAVEN_RESOLVER_CHECKSUM)
82+
.build()
83+
));
8484

8585
try {
86+
Class<?> transitiveDependencyCollectorClass = classLoader.loadClass(TRANSITIVE_DEPENDENCY_COLLECTOR_CLASS);
8687
Class<?> artifactClass = classLoader.loadClass(ARTIFACT_CLASS);
8788

8889
// com.alessiodp.libby.TransitiveDependencyCollector(Path)

‎core/src/test/java-templates/com/alessiodp/libby/LibbyTestProperties.java

+5
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@ public class LibbyTestProperties {
88
* Build dir path
99
*/
1010
public static final String BUILD_DIR = "{{ buildDir }}";
11+
12+
/**
13+
* Local repo set up by gradle for libby-maven-resolver
14+
*/
15+
public static final String LIBBY_MAVEN_RESOLVER_REPO = "{{ libbyMavenResolverRepo }}";
1116
}

‎core/src/main/java/com/alessiodp/libby/transitive/TransitiveLibraryResolutionDependency.java ‎core/src/test/java/com/alessiodp/libby/transitive/MavenResolverDependencies.java

+2-12
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@
44
import com.alessiodp.libby.Repositories;
55
import org.jetbrains.annotations.NotNull;
66

7-
/**
8-
* Represents the libraries required for Maven transitive dependency resolution and related operations.
9-
* <p>
10-
* This class bundles Maven Resolver Supplier, Maven Resolver Provider and their transitive dependencies.
11-
*/
12-
enum TransitiveLibraryResolutionDependency {
7+
enum MavenResolverDependencies {
138
MAVEN_RESOLVER_SUPPLIER("org{}apache{}maven{}resolver", "maven-resolver-supplier", "1.9.15", "BNncFRDRqBBHWixE0DYfFydh7h9bc3mhC/MBr5WD448"),
149
MAVEN_RESOLVER_API("org{}apache{}maven{}resolver", "maven-resolver-api", "1.9.15", "1Ugp1gooJ7uXYxK9u/YnlR5hMpJ2LuFGFAxRqn3OYL4"),
1510
MAVEN_RESOLVER_UTIL("org{}apache{}maven{}resolver", "maven-resolver-util", "1.9.15", "z9Gnzg0gpWHtZrI18lpvwa5A/f8Zr6k1GrCpZNTlVm8"),
@@ -38,7 +33,7 @@ enum TransitiveLibraryResolutionDependency {
3833

3934
private final String groupId, artifactId, version, checksum;
4035

41-
TransitiveLibraryResolutionDependency(@NotNull String groupId, @NotNull String artifactId, @NotNull String version, @NotNull String checksum) {
36+
MavenResolverDependencies(@NotNull String groupId, @NotNull String artifactId, @NotNull String version, @NotNull String checksum) {
4237
this.groupId = groupId;
4338
this.artifactId = artifactId;
4439
this.version = version;
@@ -53,11 +48,6 @@ public Library toLibrary() {
5348
.version(version)
5449
.checksumFromBase64(checksum)
5550
.repository(Repositories.MAVEN_CENTRAL)
56-
// Relocate all packages used in Libby to avoid conflicts
57-
.relocate("org{}eclipse{}aether{}util", "org.eclipse.aether.util") // maven-resolver-util
58-
.relocate("org{}eclipse{}aether", "org.eclipse.aether") // maven-resolver-api
59-
.relocate("org{}apache{}maven{}repository{}internal", "org.apache.maven.repository.internal") // maven-resolver-provider
60-
6151
.build();
6252
}
6353
}

‎core/src/test/java/com/alessiodp/libby/transitive/TransitiveDownloadingTest.java

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.alessiodp.libby.transitive;
22

3+
import com.alessiodp.libby.LibbyTestProperties;
34
import com.alessiodp.libby.Library;
45
import com.alessiodp.libby.LibraryManagerMock;
56
import com.alessiodp.libby.TestUtils;
@@ -8,6 +9,7 @@
89
import org.junit.jupiter.api.Test;
910

1011
import java.nio.file.Path;
12+
import java.nio.file.Paths;
1113
import java.util.*;
1214

1315
import static org.junit.jupiter.api.Assertions.*;
@@ -20,7 +22,7 @@ public class TransitiveDownloadingTest {
2022
.version("1.9.15")
2123
.resolveTransitiveDependencies(true)
2224
.build();
23-
private static final Library EXCLUDED_LIBRARY = TransitiveLibraryResolutionDependency.MAVEN_RESOLVER_API.toLibrary();
25+
private static final Library EXCLUDED_LIBRARY = MavenResolverDependencies.MAVEN_RESOLVER_API.toLibrary();
2426
private static final Library MAVEN_RESOLVER_SUPPLIER_WITH_EXCLUDED = Library.builder()
2527
.groupId(MAVEN_RESOLVER_SUPPLIER.getGroupId())
2628
.artifactId(MAVEN_RESOLVER_SUPPLIER.getArtifactId())
@@ -33,6 +35,7 @@ public class TransitiveDownloadingTest {
3335
.artifactId("bungeecord-api")
3436
.version("1.20-R0.2-SNAPSHOT")
3537
.repository("https://oss.sonatype.org/content/repositories/snapshots")
38+
.repository("https://hub.spigotmc.org/nexus/content/groups/public/")
3639
.isolatedLoad(true)
3740
.loaderId("bungeecord")
3841
.resolveTransitiveDependencies(true)
@@ -43,6 +46,8 @@ public class TransitiveDownloadingTest {
4346
@BeforeEach
4447
public void setUp() throws Exception {
4548
libraryManager = new LibraryManagerMock();
49+
// Local repo set up by gradle for libby-maven-resolver
50+
libraryManager.addRepository(Paths.get(LibbyTestProperties.LIBBY_MAVEN_RESOLVER_REPO).toUri().toString());
4651
libraryManager.addMavenCentral();
4752
}
4853

@@ -69,29 +74,29 @@ public void snapshotLibraryTransitiveLoad() throws Exception {
6974
public void transitiveWithExcludedLoad() {
7075
libraryManager.loadLibrary(MAVEN_RESOLVER_SUPPLIER_WITH_EXCLUDED);
7176

72-
checkDownloadedDependencies(TransitiveLibraryResolutionDependency.MAVEN_RESOLVER_API);
77+
checkDownloadedDependencies(MavenResolverDependencies.MAVEN_RESOLVER_API);
7378
}
7479

7580
/**
76-
* Compares the libraries required by maven-resolver-supplier with the ones declared in {@link TransitiveLibraryResolutionDependency}.
81+
* Compares the libraries required by maven-resolver-supplier with the ones declared in {@link MavenResolverDependencies}.
7782
*
7883
* @param excludedDependencies Optionally excluded more dependencies
7984
*/
80-
private void checkDownloadedDependencies(TransitiveLibraryResolutionDependency... excludedDependencies) {
81-
Set<TransitiveLibraryResolutionDependency> excluded = new HashSet<>();
85+
private void checkDownloadedDependencies(MavenResolverDependencies... excludedDependencies) {
86+
Set<MavenResolverDependencies> excluded = new HashSet<>();
8287
// Always exclude javax.inject since it is excluded by maven-resolver-supplier
83-
excluded.add(TransitiveLibraryResolutionDependency.JAVAX_INJECT);
88+
excluded.add(MavenResolverDependencies.JAVAX_INJECT);
8489
// Always exclude slf4j-nop since it is not included in maven-resolver-supplier
85-
excluded.add(TransitiveLibraryResolutionDependency.SLF4J_NOP);
90+
excluded.add(MavenResolverDependencies.SLF4J_NOP);
8691
excluded.addAll(Arrays.asList(excludedDependencies));
8792

8893
List<String> loaded = libraryManager.getLoaded();
8994
// Assert that the correct amount of libraries has been loaded
90-
assertEquals(TransitiveLibraryResolutionDependency.values().length - excluded.size(), loaded.size());
95+
assertEquals(MavenResolverDependencies.values().length - excluded.size(), loaded.size());
9196

92-
Arrays.stream(TransitiveLibraryResolutionDependency.values())
97+
Arrays.stream(MavenResolverDependencies.values())
9398
.filter(dep -> !excluded.contains(dep))
94-
.map(TransitiveLibraryResolutionDependency::toLibrary)
99+
.map(MavenResolverDependencies::toLibrary)
95100
.forEach(dep -> {
96101
Path path = libraryManager.getSaveDirectory().resolve(dep.getPath()).toAbsolutePath();
97102
assertTrue(loaded.contains(path.toString()));

‎maven-resolver/build.gradle.kts

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
3+
plugins {
4+
id("com.github.johnrengelman.shadow") version "8.1.1"
5+
}
6+
7+
dependencies {
8+
implementation("org.apache.maven.resolver:maven-resolver-impl:1.9.18")
9+
implementation("org.apache.maven.resolver:maven-resolver-supplier:1.9.18")
10+
}
11+
12+
val shadowJar = tasks.withType<ShadowJar> {
13+
archiveClassifier.set("")
14+
minimize()
15+
}

‎core/src/main/java/com/alessiodp/libby/transitive/TransitiveDependencyCollector.java ‎maven-resolver/src/main/java/com/alessiodp/libby/transitive/TransitiveDependencyCollector.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*
3939
* @see <a href=https://github.com/apache/maven-resolver>maven-resolver</a>.
4040
*/
41-
class TransitiveDependencyCollector {
41+
public class TransitiveDependencyCollector {
4242

4343
/**
4444
* Counter used to generate ids for repositories
@@ -71,6 +71,11 @@ class TransitiveDependencyCollector {
7171
@NotNull
7272
private final Path saveDirectory;
7373

74+
/**
75+
* Creates a new {@code TransitiveDependencyCollector}.
76+
*
77+
* @param saveDirectory The download directory name
78+
*/
7479
public TransitiveDependencyCollector(@NotNull Path saveDirectory) {
7580
this.saveDirectory = saveDirectory;
7681
this.repositorySystemSession = newRepositorySystemSession(repositorySystem);

‎settings.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ setOf(
55
"bungee",
66
"core",
77
"fabric",
8+
"maven-resolver",
89
"nukkit",
910
"paper",
1011
"sponge",

0 commit comments

Comments
 (0)