mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-06 18:51:21 +01:00
3071c68a44
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by 2LStudios and as with ANY update, please do your own testing Waterfall Changes:c74fe8aUpdated Upstream (BungeeCord)91217e0Adjusted README versions (#656)6bf7f90Updated Upstream (BungeeCord) (#655)
149 lines
4.9 KiB
Diff
149 lines
4.9 KiB
Diff
From 60a16fffd914c3eb6cca576b85fe34d02c135768 Mon Sep 17 00:00:00 2001
|
|
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
|
|
Date: Wed, 16 Dec 2020 17:59:15 +0800
|
|
Subject: [PATCH] FlameCord POM Changes
|
|
|
|
|
|
diff --git a/flamecord/pom.xml b/flamecord/pom.xml
|
|
new file mode 100644
|
|
index 00000000..ed4c392c
|
|
--- /dev/null
|
|
+++ b/flamecord/pom.xml
|
|
@@ -0,0 +1,44 @@
|
|
+<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
+ <modelVersion>4.0.0</modelVersion>
|
|
+
|
|
+ <parent>
|
|
+ <groupId>io.github.waterfallmc</groupId>
|
|
+ <artifactId>flamecord-parent</artifactId>
|
|
+ <version>1.17-R0.1-SNAPSHOT</version>
|
|
+ <relativePath>../pom.xml</relativePath>
|
|
+ </parent>
|
|
+
|
|
+ <groupId>dev._2lstudios</groupId>
|
|
+ <artifactId>flamecord-flamecord</artifactId>
|
|
+ <version>1.17-R0.1-SNAPSHOT</version>
|
|
+ <packaging>jar</packaging>
|
|
+
|
|
+ <name>FlameCord-FlameCord</name>
|
|
+ <description>FlameCord adds security essentials and new configuration options</description>
|
|
+
|
|
+ <dependencies>
|
|
+ <dependency>
|
|
+ <groupId>io.github.waterfallmc</groupId>
|
|
+ <artifactId>flamecord-config</artifactId>
|
|
+ <version>${project.version}</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>io.github.waterfallmc</groupId>
|
|
+ <artifactId>flamecord-chat</artifactId>
|
|
+ <version>${project.version}</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
+ </dependencies>
|
|
+
|
|
+ <build>
|
|
+ <finalName>${project.name}</finalName>
|
|
+ <resources>
|
|
+ <resource>
|
|
+ <filtering>true</filtering>
|
|
+ <directory>${basedir}/src/main/resources</directory>
|
|
+ </resource>
|
|
+ </resources>
|
|
+ </build>
|
|
+</project>
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 26e85fb8..b305e245 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -63,6 +63,9 @@
|
|
<module>query</module>
|
|
<!--<module>slf4j</module>-->
|
|
<module>native</module>
|
|
+ <!-- FlameCord start - Add modules -->
|
|
+ <module>flamecord</module>
|
|
+ <!-- FlameCord end -->
|
|
</modules>
|
|
|
|
<scm>
|
|
diff --git a/protocol/pom.xml b/protocol/pom.xml
|
|
index 433fbfe0..22319300 100644
|
|
--- a/protocol/pom.xml
|
|
+++ b/protocol/pom.xml
|
|
@@ -64,5 +64,14 @@
|
|
<version>1.3.0</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
+
|
|
+ <!-- FlameCord start - Add our dependencies -->
|
|
+ <dependency>
|
|
+ <groupId>dev._2lstudios</groupId>
|
|
+ <artifactId>flamecord-flamecord</artifactId>
|
|
+ <version>${project.version}</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
+ <!-- FlameCord end -->
|
|
</dependencies>
|
|
</project>
|
|
diff --git a/proxy/pom.xml b/proxy/pom.xml
|
|
index 7bfe7d6b..d9a375e7 100644
|
|
--- a/proxy/pom.xml
|
|
+++ b/proxy/pom.xml
|
|
@@ -150,6 +150,51 @@
|
|
<scope>runtime</scope>
|
|
</dependency>
|
|
<!-- Waterfall end -->
|
|
+
|
|
+ <!-- FlameCord start - Add our dependencies -->
|
|
+ <dependency>
|
|
+ <groupId>dev._2lstudios</groupId>
|
|
+ <artifactId>flamecord-flamecord</artifactId>
|
|
+ <version>${project.version}</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>io.github.waterfallmc</groupId>
|
|
+ <artifactId>flamecord-module-cmd-alert</artifactId>
|
|
+ <version>${project.version}</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>io.github.waterfallmc</groupId>
|
|
+ <artifactId>flamecord-module-cmd-find</artifactId>
|
|
+ <version>${project.version}</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>io.github.waterfallmc</groupId>
|
|
+ <artifactId>flamecord-module-cmd-list</artifactId>
|
|
+ <version>${project.version}</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>io.github.waterfallmc</groupId>
|
|
+ <artifactId>flamecord-module-cmd-send</artifactId>
|
|
+ <version>${project.version}</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>io.github.waterfallmc</groupId>
|
|
+ <artifactId>flamecord-module-cmd-server</artifactId>
|
|
+ <version>${project.version}</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>io.github.waterfallmc</groupId>
|
|
+ <artifactId>flamecord-module-reconnect-yaml</artifactId>
|
|
+ <version>${project.version}</version>
|
|
+ <scope>compile</scope>
|
|
+ </dependency>
|
|
+ <!-- FlameCord end -->
|
|
</dependencies>
|
|
|
|
<build>
|
|
--
|
|
2.32.0.windows.1
|
|
|