minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Fix project setup to prevent recursive dependencies

Browse Source 
Maven's fine with it, but it is bad practice.

OpenInv still modifies plugin.yml in OpenInvPlugin. It should really be done via the Assembly Plugin, but it works and I am lazy.
This commit is contained in:
Jikoo
2016-11-17 12:22:52 -05:00
parent 2e41b4bd45
commit c3f517d7ab
3 changed files with 188 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
OpenInv/pom.xml
View File

@@ -1,5 +1,6 @@
<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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvparent</artifactId> <artifactId>openinvparent</artifactId>
@@ -10,13 +11,174 @@
<name>OpenInv</name> <name>OpenInv</name>
<version>2.5.2</version> <version>2.5.2</version>
<profiles>
<profile>
<id>latest</id>
<dependencies>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_11_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>modern</id>
<dependencies>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_7_R4</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R3</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_9_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_9_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_10_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_11_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>all</id>
<dependencies>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_4_5</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_4_6</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_4_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_5_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_5_R3</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_6_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_6_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_6_R3</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_7_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_7_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_7_R3</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_7_R4</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R3</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_9_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_9_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_10_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_11_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile>
</profiles>
<build> <build>
<directory>../target</directory> <directory>../target</directory>
<finalName>${project.name}</finalName> <finalName>${project.name}</finalName>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>../OpenInvPlugin/src/main/resources</directory>
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>
</resources> </resources>
@@ -28,8 +190,8 @@
<version>2.4.3</version> <version>2.4.3</version>
<configuration> <configuration>
<!-- <!--
This keeps the final file clean, but may cause issues for people not familiar with the setup. ~ This keeps the final file clean, but may cause issues for people not familiar with the setup.
If you're having trouble with the final product missing files, remove or tweak this configuration. ~ If you're having trouble with the final product missing files, remove or tweak this configuration.
--> -->
<minimizeJar>true</minimizeJar> <minimizeJar>true</minimizeJar>
<filters> <filters>
@@ -52,6 +214,6 @@
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

0
OpenInv/src/main/resources/plugin.yml → OpenInvPlugin/src/main/resources/plugin.yml
View File

175
pom.xml
View File

@@ -10,15 +10,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<modules>
<module>OpenInvCore</module>
<module>OpenInvPlugin</module>
<module>OpenInv</module>
<module>OpenInvCraftbukkit1_11_R1</module>
</modules>
<profiles> <profiles>
<!--
~ N.B.: All dependencies for profiles are set in ./OpenInv/pom.xml
~
~ This is to prevent recursive dependencies. It's not ideal, but it works.
-->
<profile> <profile>
<id>latest</id> <id>latest</id>
<activation> <activation>
@@ -30,13 +29,6 @@
<modules> <modules>
<module>OpenInvCraftbukkit1_11_R1</module> <module>OpenInvCraftbukkit1_11_R1</module>
</modules> </modules>
<dependencies>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_11_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile> </profile>
<profile> <profile>
@@ -57,48 +49,6 @@
<module>OpenInvCraftbukkit1_10_R1</module> <module>OpenInvCraftbukkit1_10_R1</module>
<module>OpenInvCraftbukkit1_11_R1</module> <module>OpenInvCraftbukkit1_11_R1</module>
</modules> </modules>
<dependencies>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_7_R4</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R3</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_9_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_9_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_10_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_11_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile> </profile>
<profile> <profile>
@@ -130,103 +80,22 @@
<module>OpenInvCraftbukkit1_10_R1</module> <module>OpenInvCraftbukkit1_10_R1</module>
<module>OpenInvCraftbukkit1_11_R1</module> <module>OpenInvCraftbukkit1_11_R1</module>
</modules> </modules>
<dependencies> </profile>
<dependency>
<groupId>com.lishid</groupId> <!--
<artifactId>openinvcraftbukkit1_4_5</artifactId> ~ This profile exists to fix reactor build order.
<version>1.0-SNAPSHOT</version> ~ OpenInv must be built last to aggregate all modules into the final jar.
</dependency> -->
<dependency> <profile>
<groupId>com.lishid</groupId> <id>fixreactororder</id>
<artifactId>openinvcraftbukkit1_4_6</artifactId> <activation>
<version>1.0-SNAPSHOT</version> <property>
</dependency> <name>!breakBuildProcess</name>
<dependency> </property>
<groupId>com.lishid</groupId> </activation>
<artifactId>openinvcraftbukkit1_4_R1</artifactId> <modules>
<version>1.0-SNAPSHOT</version> <module>OpenInv</module>
</dependency> </modules>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_5_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_5_R3</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_6_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_6_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_6_R3</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_7_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_7_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_7_R3</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_7_R4</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_8_R3</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_9_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_9_R2</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_10_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.lishid</groupId>
<artifactId>openinvcraftbukkit1_11_R1</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile> </profile>
</profiles> </profiles>