twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 04:32:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Put pom in correct location for Paperclip install to maven local feature

Browse Source
This commit is contained in:
Jason Penilla
2021-06-14 18:50:13 -07:00
parent efc6fa6a04
commit fdd125c43e
4 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/Build-system-changes.patch
View File

@@ -47,9 +47,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
))
for (tld in listOf("net", "com", "org")) {
attributes(mapOf(
@@ -0,0 +0,0 @@ tasks.jar {
@@ -0,0 +0,0 @@ configure<PublishingExtension> {
}
}
+val generatePom = tasks.named<GenerateMavenPom>("generatePomFileForMavenPublication")
+
tasks.shadowJar {
+ // Needed for Paperclip's install to maven local feature
+ from(generatePom) {
+ into("META-INF/maven/io.papermc.paper/paper")
+ rename { "pom.xml" }
+ }
+
listOf(
- "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",
+ "jline", "org.apache.commons.codec", "org.apache.commons.io", // Paper - don't relocate fastutil

12
patches/server/Setup-Gradle-project.patch
View File

@@ -21,7 +21,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +0,0 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import io.papermc.paperweight.util.Git
@@ -33,6 +32,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+plugins {
+ java
+ `maven-publish`
+ id("com.github.johnrengelman.shadow")
+}
+
@@ -86,6 +86,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ }
+}
+
+configure<PublishingExtension> {
+ publications.create<MavenPublication>("maven") {
+ // todo: confirm this is correct
+ from(components["java"])
+ artifact(tasks.reobfJar) {
+ classifier = "reobf"
+ }
+ }
+}
+
+tasks.shadowJar {
+ listOf(
+ "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",