Skip to content

Commit

Permalink
Get rid of parameters for maven profile activation.
Browse files Browse the repository at this point in the history
  • Loading branch information
@asofold
asofold committed Jan 7, 2018
1 parent 22393db commit 5da5689
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 132 deletions.
61 changes: 0 additions & 61 deletions NCPPlugin/pom.xml
View file
Expand Up @@ -13,13 +13,6 @@
<profiles>
<profile>
<id>ncp_base</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>ncp_base</name>
<value>true</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -52,12 +45,6 @@
</profile>
<profile>
<id>spigot1_7_r4</id>
<activation>
<property>
<name>spigot1_7_r4</name>
<value>true</value>
</property>
</activation>
<dependencies>
<!-- Non minimal below. -->
<dependency>
Expand All @@ -70,12 +57,6 @@
</profile>
<profile>
<id>spigot1_8_r3</id>
<activation>
<property>
<name>spigot1_8_r3</name>
<value>true</value>
</property>
</activation>
<dependencies>
<!-- Non minimal below. -->
<dependency>
Expand All @@ -88,12 +69,6 @@
</profile>
<profile>
<id>spigot1_9_r1</id>
<activation>
<property>
<name>spigot1_9_r1</name>
<value>true</value>
</property>
</activation>
<dependencies>
<!-- Non minimal below. -->
<dependency>
Expand All @@ -106,12 +81,6 @@
</profile>
<profile>
<id>spigot1_9_r2</id>
<activation>
<property>
<name>spigot1_9_r2</name>
<value>true</value>
</property>
</activation>
<dependencies>
<!-- Non minimal below. -->
<dependency>
Expand All @@ -124,12 +93,6 @@
</profile>
<profile>
<id>spigot1_10_r1</id>
<activation>
<property>
<name>spigot1_10_r1</name>
<value>true</value>
</property>
</activation>
<dependencies>
<!-- Non minimal below. -->
<dependency>
Expand All @@ -142,12 +105,6 @@
</profile>
<profile>
<id>spigot1_11_r1</id>
<activation>
<property>
<name>spigot1_11_r1</name>
<value>true</value>
</property>
</activation>
<dependencies>
<!-- Non minimal below. -->
<dependency>
Expand All @@ -160,12 +117,6 @@
</profile>
<profile>
<id>spigot1_12_r1</id>
<activation>
<property>
<name>spigot1_12_r1</name>
<value>true</value>
</property>
</activation>
<dependencies>
<!-- Non minimal below. -->
<dependency>
Expand All @@ -178,12 +129,6 @@
</profile>
<profile>
<id>cbdev</id>
<activation>
<property>
<name>cbdev</name>
<value>true</value>
</property>
</activation>
<dependencies>
<!-- Non minimal below. -->
<dependency>
Expand All @@ -196,12 +141,6 @@
</profile>
<profile>
<id>all</id>
<activation>
<property>
<name>cbdedicated</name>
<value>true</value>
</property>
</activation>
<dependencies>
<!-- Non minimal below. -->
<dependency>
Expand Down
27 changes: 13 additions & 14 deletions README.md
View file
Expand Up @@ -32,22 +32,21 @@ Do set the correct version alongside the file name. On newer version of maven, y

All profiles for reference:

**As of now, you do need to activate the ncp_base profile in addition to whichever other profile you may be using.**
**As of now, you do need to activate the ncp_base profile in addition to whichever other profile you may be using. Activation parameters have been removed, only profiles are used. **

_For some building environments you might need to both set the profiles and set the build parameters - to be on the safe side, just set both._

| Profile | Parameter set to `true` | Description |
| :------------------ | :----------------------------- | :-------------- |
| `-P ncp_base` | `ncp_base` | Default profile without any of the native access modules, might pose compatibility issues with latest Minecraft versions. The reflection based module is included here. |
| `-P all -P ncp_base` | `cbdedicated` and `ncp_base` | All compatibility modules. |
| `-P spigot1_7_r4 -P ncp_base` | `spigot1_7_r4` and `ncp_base` | Just Spigot 1.7 R4 (MC 1.7.10). |
| `-P spigot1_8_r3 -P ncp_base` | `spigot1_8_r3` and `ncp_base` | Just Spigot 1.8 R3 (MC 1.8.4-1.8.8). |
| `-P spigot1_9_r1 -P ncp_base` | `spigot1_9_r1` and `ncp_base` | Just Spigot 1.9 R1 (MC 1.9-1.9.3). |
| `-P spigot1_9_r2 -P ncp_base` | `spigot1_9_r2` and `ncp_base` | Just Spigot 1.9 R2 (MC 1.9.4). |
| `-P spigot1_10_r1 -P ncp_base` | `spigot1_10_r1` and `ncp_base` | Just Spigot 1.10 R1 (MC 1.10-1.10.2). |
| `-P spigot1_11_r1 -P ncp_base` | `spigot1_11_r1` and `ncp_base` | Just Spigot 1.11 R1 (MC 1.11-1.11.2). |
| `-P spigot1_12_r1 -P ncp_base` | `spigot1_12_r1` and `ncp_base` | Just Spigot 1.12 R1 (MC 1.12-1.12.2). |
| `-P cbdev -P ncp_base` | `cbdev` and `ncp_base` | The latest version in development. |
| Profile | Description |
| :------------------ | :-------------- |
| `-P ncp_base` | Default profile without any of the native access modules, might pose compatibility issues with latest Minecraft versions. The reflection based module is included here. |
| `-P all,ncp_base` | All compatibility modules. |
| `-P spigot1_7_r4,ncp_base` | Just Spigot 1.7 R4 (MC 1.7.10). |
| `-P spigot1_8_r3,ncp_base` | Just Spigot 1.8 R3 (MC 1.8.4-1.8.8). |
| `-P spigot1_9_r1,ncp_base` | Just Spigot 1.9 R1 (MC 1.9-1.9.3). |
| `-P spigot1_9_r2,ncp_base` | Just Spigot 1.9 R2 (MC 1.9.4). |
| `-P spigot1_10_r1,ncp_base` | Just Spigot 1.10 R1 (MC 1.10-1.10.2). |
| `-P spigot1_11_r1,ncp_base` | Just Spigot 1.11 R1 (MC 1.11-1.11.2). |
| `-P spigot1_12_r1,ncp_base` | Just Spigot 1.12 R1 (MC 1.12-1.12.2). |
| `-P cbdev,ncp_base` | The latest version in development. |

(On the long run, only the latest module for a major Minecraft release may be be kept, such as 1_8_r3 for all of 1.8.x.)

Expand Down
59 changes: 2 additions & 57 deletions pom.xml
View file
Expand Up @@ -19,10 +19,9 @@
<profile>
<id>ncp_base</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>ncp_base</name>
<value>true</value>
<!-- Prevent use with setting skip_ncp_base e.g.: -Dskip_ncp_base -->
<name>!skip_ncp_base</name>
</property>
</activation>
<modules>
Expand All @@ -37,12 +36,6 @@
</profile>
<profile>
<id>spigot1_7_r4</id>
<activation>
<property>
<name>spigot1_7_r4</name>
<value>true</value>
</property>
</activation>
<modules>
<!-- Non minimal below. -->
<module>NCPCompatCB3100</module>
Expand All @@ -51,12 +44,6 @@
</profile>
<profile>
<id>spigot1_8_r3</id>
<activation>
<property>
<name>spigot1_8_r3</name>
<value>true</value>
</property>
</activation>
<modules>
<!-- Non minimal below. -->
<module>NCPCompatSpigotCB1_8_R3</module>
Expand All @@ -65,12 +52,6 @@
</profile>
<profile>
<id>spigot1_9_r1</id>
<activation>
<property>
<name>spigot1_9_r1</name>
<value>true</value>
</property>
</activation>
<modules>
<!-- Non minimal below. -->
<module>NCPCompatSpigotCB1_9_R1</module>
Expand All @@ -79,12 +60,6 @@
</profile>
<profile>
<id>spigot1_9_r2</id>
<activation>
<property>
<name>spigot1_9_r2</name>
<value>true</value>
</property>
</activation>
<modules>
<!-- Non minimal below. -->
<module>NCPCompatSpigotCB1_9_R2</module>
Expand All @@ -93,12 +68,6 @@
</profile>
<profile>
<id>spigot1_10_r1</id>
<activation>
<property>
<name>spigot1_10_r1</name>
<value>true</value>
</property>
</activation>
<modules>
<!-- Non minimal below. -->
<module>NCPCompatSpigotCB1_10_R1</module>
Expand All @@ -107,12 +76,6 @@
</profile>
<profile>
<id>spigot1_11_r1</id>
<activation>
<property>
<name>spigot1_11_r1</name>
<value>true</value>
</property>
</activation>
<modules>
<!-- Non minimal below. -->
<module>NCPCompatSpigotCB1_11_R1</module>
Expand All @@ -121,12 +84,6 @@
</profile>
<profile>
<id>spigot1_12_r1</id>
<activation>
<property>
<name>spigot1_12_r1</name>
<value>true</value>
</property>
</activation>
<modules>
<!-- Non minimal below. -->
<module>NCPCompatCBDev</module>
Expand All @@ -135,12 +92,6 @@
</profile>
<profile>
<id>cbdev</id>
<activation>
<property>
<name>cbdev</name>
<value>true</value>
</property>
</activation>
<modules>
<!-- Non minimal below. -->
<module>NCPCompatCBDev</module>
Expand All @@ -149,12 +100,6 @@
</profile>
<profile>
<id>all</id>
<activation>
<property>
<name>cbdedicated</name>
<value>true</value>
</property>
</activation>
<modules>
<!-- Non minimal below. -->
<module>NCPCompatCB2512</module>
Expand Down

0 comments on commit 5da5689

Please sign in to comment.