Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-11 03:25:07 +01:00
Code Issues Projects Releases Wiki Activity

Actually set this on the correct module

Browse Source
This commit is contained in:
Shane Freeder 2023-06-07 21:20:51 +01:00
parent c398436328
commit 483ff6eb79
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 48 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From cf9c35430d3e4bcdb8d2cf66ae81fdfb03ab7d31 Mon Sep 17 00:00:00 2001 From 29f3aab48e28f4628ad6c97d557ef01709912fd7 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200 Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
@ -145,10 +145,10 @@ index 6be22739..a4516ed9 100644
return; return;
} }
diff --git a/chat/pom.xml b/chat/pom.xml diff --git a/chat/pom.xml b/chat/pom.xml
index f695c462..003b3f6c 100644 index f695c462..3a47bbc0 100644
--- a/chat/pom.xml --- a/chat/pom.xml
+++ b/chat/pom.xml +++ b/chat/pom.xml
@@ -4,19 +4,19 @@ @@ -4,20 +4,46 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@ -172,8 +172,35 @@ index f695c462..003b3f6c 100644
+ <name>Waterfall-Chat</name> + <name>Waterfall-Chat</name>
+ <description>Minecraft JSON chat API intended for use with Waterfall</description> + <description>Minecraft JSON chat API intended for use with Waterfall</description>
+ <!-- Waterfall start: TODO: Just convert this project to gradle.
+ Maven is a constant source of headaches, especially when we have crud like
+ lombok inflicted upon the project mangling the build setup. I don't have the will to
+ figure out where the duplicate artifact is coming from, I cannot reproduce this locally,
+ and so, we'll just do this for now.-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.3.0</version>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.3.0</version>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <!-- Waterfall end -->
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId>
diff --git a/config/pom.xml b/config/pom.xml diff --git a/config/pom.xml b/config/pom.xml
index 807223ec..91da386a 100644 index 807223ec..91da386a 100644
--- a/config/pom.xml --- a/config/pom.xml
@ -506,7 +533,7 @@ index c7478c96..e137dfcc 100644
<dependencies> <dependencies>
<dependency> <dependency>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index c118aa69..4b5f748a 100644 index c118aa69..5e249fc0 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -3,18 +3,25 @@ @@ -3,18 +3,25 @@
@ -633,7 +660,23 @@ index c118aa69..4b5f748a 100644
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId> <artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -325,6 +350,7 @@ @@ -276,6 +301,15 @@
</goals>
</execution>
</executions>
+ <!-- Waterfall start: TODO: Just convert this project to gradle.
+ Maven is a constant source of headaches, especially when we have crud like
+ lombok inflicted upon the project mangling the build setup. I don't have the will to
+ figure out where the duplicate artifact is coming from, I cannot reproduce this locally,
+ and so, we'll just do this for now.-->
+ <configuration>
+ <forceCreation>true</forceCreation>
+ </configuration>
+ <!-- Waterfall end -->
</plugin>
<plugin>
<groupId>org.projectlombok</groupId>
@@ -325,6 +359,7 @@
<!-- lombok does not add @return or @param which causes warnings, so ignore --> <!-- lombok does not add @return or @param which causes warnings, so ignore -->
<doclint>none</doclint> <doclint>none</doclint>
<sourcepath>${project.build.directory}/delombok</sourcepath> <sourcepath>${project.build.directory}/delombok</sourcepath>
@ -641,116 +684,6 @@ index c118aa69..4b5f748a 100644
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@@ -333,6 +359,20 @@
<failOnWarnings>true</failOnWarnings>
</configuration>
</plugin>
+ <!-- Waterfall start: TODO: Just convert this project to gradle.
+ Maven is a constant source of headaches, especially when we have crud like
+ lombok inflicted upon the project mangling the build setup. I don't have the will to
+ figure out where the duplicate artifact is coming from, I cannot reproduce this locally,
+ and so, we'll just do this for now.-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.3.0</version>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ </configuration>
+ </plugin>
+ <!-- Waterfall end -->
</plugins>
</build>
</profile>
@@ -356,5 +396,88 @@
</plugins>
</build>
</profile>
+ <!-- Waterfall Start -->
+ <profile>
+ <id>deployment</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok-maven-plugin</artifactId>
+ <version>1.18.28</version>
+ <executions>
+ <execution>
+ <id>delombok</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>delombok</goal>
+ </goals>
+ <configuration>
+ <addOutputDirectory>false</addOutputDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.5.0</version>
+ <configuration>
+ <doclint>none</doclint>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <sourcepath>target/generated-sources/delombok</sourcepath>
+ </configuration>
+ </execution>
+ <execution>
+ <id>aggregate-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <doctitle>Waterfall ${project.version} API</doctitle>
+ <windowtitle>Waterfall ${project.version} API</windowtitle>
+ <sourcepath>
+ api/target/generated-sources/delombok;
+ chat/target/generated-sources/delombok
+ </sourcepath>
+ <source>8</source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.3.0</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!-- Waterfall end -->
</profiles>
</project>
diff --git a/protocol/pom.xml b/protocol/pom.xml diff --git a/protocol/pom.xml b/protocol/pom.xml
index bb2b14fc..221469b9 100644 index bb2b14fc..221469b9 100644
--- a/protocol/pom.xml --- a/protocol/pom.xml