Upstream/SubServers-2
1
0
Fork 0
mirror of https://github.com/ME1312/SubServers-2.git synced 2024-11-24 19:25:30 +01:00
Code Issues Projects Releases Wiki Activity

Ensure folia is not required to compile against us

Browse Source
This commit is contained in:
ME1312 2023-04-09 05:29:41 -04:00
parent ba80e0a16a
commit b23aa18661
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SubServers.Client/Bukkit/pom.xml
View File

@ -89,7 +89,7 @@
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<phase>prepare-package</phase> <phase>process-resources</phase>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
</goals> </goals>
@ -97,9 +97,6 @@
<tasks> <tasks>
<mkdir dir="${project.build.directory}" /> <mkdir dir="${project.build.directory}" />
<copy file="${basedir}/../../LICENSE" todir="${project.build.directory}/classes" /> <copy file="${basedir}/../../LICENSE" todir="${project.build.directory}/classes" />
<copy overwrite="true" todir="${project.build.directory}/classes">
<fileset dir="../../out/compile/target/SubServers.Client.Folia/classes" />
</copy>
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
@ -125,7 +122,7 @@
<manifestFile>src/META-INF/MANIFEST.MF</manifestFile> <manifestFile>src/META-INF/MANIFEST.MF</manifestFile>
</archive> </archive>
<descriptors> <descriptors>
<descriptor>../Common/jar-with-some-dependencies.xml</descriptor> <descriptor>../Folia/jar-with-some-dependencies-plus-folia.xml</descriptor>
</descriptors> </descriptors>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>
</configuration> </configuration>

29
SubServers.Client/Folia/jar-with-some-dependencies-plus-folia.xml Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 https://maven.apache.org/xsd/assembly-2.1.1.xsd">
<id>jar-with-some-dependencies-plus-folia</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<scope>runtime</scope>
<excludes>
<exclude>org.json:json</exclude>
<exclude>org.yaml:snakeyaml</exclude>
</excludes>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
<outputDirectory>/</outputDirectory>
<directory>../../out/compile/target/SubServers.Client.Folia/classes</directory>
<includes>
<include>**</include>
</includes>
</fileSet>
</fileSets>
</assembly>

2
SubServers.Client/Universal/pom.xml
View File

@ -45,7 +45,7 @@
<manifestFile>MANIFEST.MF</manifestFile> <manifestFile>MANIFEST.MF</manifestFile>
</archive> </archive>
<descriptors> <descriptors>
<descriptor>../Common/jar-with-some-dependencies.xml</descriptor> <descriptor>../Folia/jar-with-some-dependencies-plus-folia.xml</descriptor>
</descriptors> </descriptors>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>
</configuration> </configuration>