Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2025-02-18 14:01:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed used of flatten plugin

Browse Source
This commit is contained in:
Indyuce 2022-12-30 14:19:30 +01:00
parent 35d90ae55b
commit 481d9da579
3 changed files with 5 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
MMOCore-API/pom.xml
View File

@ -5,35 +5,18 @@
<parent> <parent>
<artifactId>MMOCore</artifactId> <artifactId>MMOCore</artifactId>
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<version>${revision}</version> <version>1.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>MMOCore-API</artifactId> <artifactId>MMOCore-API</artifactId>
<properties>
<maven.compiler.source>16</maven.compiler.source>
<maven.compiler.target>16</maven.compiler.target>
</properties>
<build> <build>
<finalName>${project.name}-${project.version}</finalName> <finalName>${project.name}-${project.version}</finalName>
<sourceDirectory>src/main/java</sourceDirectory> <sourceDirectory>src/main/java</sourceDirectory>
<defaultGoal>clean package install</defaultGoal> <defaultGoal>clean package install</defaultGoal>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>16</source>
<target>16</target>
<encoding>UTF-8</encoding>
<compilerArgument>-proc:none</compilerArgument>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>

46
MMOCore-Dist/pom.xml
View File

@ -5,17 +5,12 @@
<parent> <parent>
<artifactId>MMOCore</artifactId> <artifactId>MMOCore</artifactId>
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<version>${revision}</version> <version>1.12</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>MMOCore-Dist</artifactId> <artifactId>MMOCore-Dist</artifactId>
<properties>
<maven.compiler.source>16</maven.compiler.source>
<maven.compiler.target>16</maven.compiler.target>
</properties>
<build> <build>
<!-- <!--
@ -39,7 +34,7 @@
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
<configuration> <configuration>
<finalName>MMOCore-${revision}</finalName> <finalName>MMOCore-${pom.version}</finalName>
<outputDirectory>../target/</outputDirectory> <outputDirectory>../target/</outputDirectory>
</configuration> </configuration>
</plugin> </plugin>
@ -64,41 +59,6 @@
</executions> </executions>
</plugin> </plugin>
<!--
This plugin makes sure that there are no placeholders in the final
pom.xml version string because having ${revision} would cause issues when
using MythicLib-dist as a dependency
The flatten plugin must run AFTER the shade plugin, otherwise an issue pops up.
To do that, run the flatten plugin on the 'package' phase
https://stackoverflow.com/questions/52552329/use-maven-flatten-plugin-and-maven-shade-plugin-at-the-same-time
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<updatePomFile>true</updatePomFile>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>package</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
@ -107,7 +67,7 @@
<dependency> <dependency>
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<artifactId>MMOCore-API</artifactId> <artifactId>MMOCore-API</artifactId>
<version>${revision}</version> <version>1.12</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

3
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<artifactId>MMOCore</artifactId> <artifactId>MMOCore</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>${revision}</version> <version>1.12</version>
<modules> <modules>
<module>MMOCore-API</module> <module>MMOCore-API</module>
@ -16,7 +16,6 @@
<description>Offer your players a brand new RPG experience!!</description> <description>Offer your players a brand new RPG experience!!</description>
<properties> <properties>
<revision>1.11.2-SNAPSHOT</revision>
<downloadSources>false</downloadSources> <downloadSources>false</downloadSources>
<downloadJavadocs>false</downloadJavadocs> <downloadJavadocs>false</downloadJavadocs>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>