Pom changes

Minor changes for the POMs.
Now Minimizing jar.
Untested if this will cause issues. Doubt this is the case
This commit is contained in:
Olivoz 2020-08-28 23:23:14 +02:00 committed by Auxilor
parent 7b3f33077f
commit 984059a84e
6 changed files with 39 additions and 36 deletions

View File

@ -10,15 +10,9 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<artifactId>API</artifactId> <artifactId>API</artifactId>
<name>EcoEnchants API</name> <name>EcoEnchants API</name>
<packaging>jar</packaging>
<version>${project.parent.version}</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>

View File

@ -6,21 +6,18 @@
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>com.willfp.ecoenchants</groupId> <groupId>com.willfp.ecoenchants</groupId>
<version>4.1.0-pre11</version> <version>4.1.0-pre11</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>v1_15_R1</artifactId> <artifactId>v1_15_R1</artifactId>
<properties>
<main.basedir>${project.parent.basedir}</main.basedir>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.willfp.ecoenchants</groupId> <groupId>com.willfp.ecoenchants</groupId>
<artifactId>API</artifactId> <artifactId>API</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>compile</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>

View File

@ -6,21 +6,18 @@
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>com.willfp.ecoenchants</groupId> <groupId>com.willfp.ecoenchants</groupId>
<version>4.1.0-pre11</version> <version>4.1.0-pre11</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>v1_16_R1</artifactId> <artifactId>v1_16_R1</artifactId>
<properties>
<main.basedir>${project.parent.basedir}</main.basedir>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.willfp.ecoenchants</groupId> <groupId>com.willfp.ecoenchants</groupId>
<artifactId>API</artifactId> <artifactId>API</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>compile</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>

View File

@ -6,21 +6,18 @@
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>com.willfp.ecoenchants</groupId> <groupId>com.willfp.ecoenchants</groupId>
<version>4.1.0-pre11</version> <version>4.1.0-pre11</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>v1_16_R2</artifactId> <artifactId>v1_16_R2</artifactId>
<properties>
<main.basedir>${project.parent.basedir}</main.basedir>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.willfp.ecoenchants</groupId> <groupId>com.willfp.ecoenchants</groupId>
<artifactId>API</artifactId> <artifactId>API</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
<scope>compile</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>

View File

@ -21,7 +21,6 @@
</properties> </properties>
<build> <build>
<defaultGoal>clean package install</defaultGoal>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -35,7 +34,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.2.2</version> <version>3.2.4</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -43,6 +42,28 @@
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration> <configuration>
<artifactSet>
<excludes>org.codehaus.plexus:plexus-utils</excludes>
</artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>org.jetbrains.annotations</pattern>
<shadedPattern>com.willfp.ecoenchants.shaded.annotations</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.maven</pattern>
<shadedPattern>com.willfp.ecoenchants.shaded.maven</shadedPattern>
</relocation>
</relocations>
<minimizeJar>true</minimizeJar>
<createDependencyReducedPom>false</createDependencyReducedPom> <createDependencyReducedPom>false</createDependencyReducedPom>
</configuration> </configuration>
</execution> </execution>
@ -70,7 +91,7 @@
<executions> <executions>
<execution> <execution>
<id>install-external-non-maven1-jar</id> <id>install-external-non-maven1-jar</id>
<phase>clean</phase> <phase>compile</phase>
<configuration> <configuration>
<repositoryLayout>default</repositoryLayout> <repositoryLayout>default</repositoryLayout>
<groupId>n3kas.ae</groupId> <groupId>n3kas.ae</groupId>
@ -86,7 +107,7 @@
</execution> </execution>
<execution> <execution>
<id>install-external-non-maven2-jar</id> <id>install-external-non-maven2-jar</id>
<phase>clean</phase> <phase>compile</phase>
<configuration> <configuration>
<repositoryLayout>default</repositoryLayout> <repositoryLayout>default</repositoryLayout>
<groupId>me.vagdedes</groupId> <groupId>me.vagdedes</groupId>
@ -153,12 +174,14 @@
<artifactId>worldguard-bukkit</artifactId> <artifactId>worldguard-bukkit</artifactId>
<version>7.0.4-SNAPSHOT</version> <version>7.0.4-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
<!--
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.destroystokyo.paper</groupId> <groupId>com.destroystokyo.paper</groupId>
<artifactId>paper-api</artifactId> <artifactId>paper-api</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.TechFortress</groupId> <groupId>com.github.TechFortress</groupId>

17
pom.xml
View File

@ -11,11 +11,11 @@
<name>EcoEnchants Parent</name> <name>EcoEnchants Parent</name>
<modules> <modules>
<module>Plugin</module>
<module>v1_15_R1</module>
<module>API</module> <module>API</module>
<module>v1_16_R1</module> <module>NMS/v1_15_R1</module>
<module>v1_16_R2</module> <module>NMS/v1_16_R1</module>
<module>NMS/v1_16_R2</module>
<module>Plugin</module>
</modules> </modules>
<properties> <properties>
@ -28,10 +28,6 @@
<id>spigot-repo</id> <id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository> </repository>
<repository>
<id>maven-central</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository> <repository>
<id>CodeMC</id> <id>CodeMC</id>
<url>https://repo.codemc.org/repository/maven-public</url> <url>https://repo.codemc.org/repository/maven-public</url>
@ -68,9 +64,8 @@
<build> <build>
<defaultGoal>clean package install</defaultGoal> <finalName>${project.name} v${project.version}</finalName>
<finalName>${project.name} v${project.parent.version}</finalName> <defaultGoal>clean install</defaultGoal>
<sourceDirectory>src/main/java</sourceDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>