From 68160c8424d999b512f1bcabc78372c6e308bbd4 Mon Sep 17 00:00:00 2001
From: asofold <asofold@web.de>
Date: Tue, 9 Jan 2018 20:50:51 +0100
Subject: [PATCH] Remove ncp_base profile in favor of default moduels and
 dependencies.

---
 NCPPlugin/pom.xml | 70 ++++++++++++++++++++++-------------------------
 pom.xml           | 30 ++++++++------------
 2 files changed, 44 insertions(+), 56 deletions(-)

diff --git a/NCPPlugin/pom.xml b/NCPPlugin/pom.xml
index 3434f6f3..c20dba83 100644
--- a/NCPPlugin/pom.xml
+++ b/NCPPlugin/pom.xml
@@ -10,45 +10,39 @@
 
 	<packaging>jar</packaging>
 
+	<!-- Default dependencies. -->
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.2</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>1.8.8-R0.1-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>fr.neatmonster</groupId>
+			<artifactId>ncpcore</artifactId>
+			<version>1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>fr.neatmonster</groupId>
+			<artifactId>ncpcompatbukkit</artifactId>
+			<version>1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>fr.neatmonster</groupId>
+			<artifactId>ncpcompatprotocollib</artifactId>
+			<version>1.1-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+
+	<!-- Special dependencies activated by profiles. -->
 	<profiles>
-		<profile>
-			<id>ncp_base</id>
-			<activation>
-				<property>
-					<!-- Prevent use with setting skip_ncp_base e.g.: -Dskip_ncp_base -->
-					<name>!skip_ncp_base</name>
-				</property>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>junit</groupId>
-					<artifactId>junit</artifactId>
-					<version>4.8.2</version>
-					<scope>provided</scope>
-				</dependency>
-				<dependency>
-					<groupId>org.bukkit</groupId>
-					<artifactId>bukkit</artifactId>
-					<version>1.8.8-R0.1-SNAPSHOT</version>
-					<scope>provided</scope>
-				</dependency>
-				<dependency>
-					<groupId>fr.neatmonster</groupId>
-					<artifactId>ncpcore</artifactId>
-					<version>1.1-SNAPSHOT</version>
-				</dependency>
-				<dependency>
-					<groupId>fr.neatmonster</groupId>
-					<artifactId>ncpcompatbukkit</artifactId>
-					<version>1.1-SNAPSHOT</version>
-				</dependency>
-				<dependency>
-					<groupId>fr.neatmonster</groupId>
-					<artifactId>ncpcompatprotocollib</artifactId>
-					<version>1.1-SNAPSHOT</version>
-				</dependency>
-			</dependencies>
-		</profile>
 		<profile>
 			<id>spigot1_7_r4</id>
 			<dependencies>
diff --git a/pom.xml b/pom.xml
index 3464bcf5..5650a55a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,25 +15,19 @@
 		<BUILD_SERIES>?</BUILD_SERIES>
 	</properties>
 
+	<!-- Default modules. -->
+	<modules>
+		<module>NCPBuildBase</module>
+		<module>NCPCommons</module>
+		<module>NCPCore</module>
+		<module>NCPCompatBukkit</module>
+		<module>NCPCompatProtocolLib</module>
+		<module>NCPPlugin</module>
+		<module>NoCheatPlus</module>
+	</modules>
+
+	<!-- Special modules activated by profiles. -->
 	<profiles>
-		<profile>
-			<id>ncp_base</id>
-			<activation>
-				<property>
-					<!-- Prevent use with setting skip_ncp_base e.g.: -Dskip_ncp_base -->
-					<name>!skip_ncp_base</name>
-				</property>
-			</activation>
-			<modules>
-				<module>NCPBuildBase</module>
-				<module>NCPCommons</module>
-				<module>NCPCore</module>
-				<module>NCPCompatBukkit</module>
-				<module>NCPCompatProtocolLib</module>
-				<module>NCPPlugin</module>
-				<module>NoCheatPlus</module>
-			</modules>
-		</profile>
 		<profile>
 			<id>all</id>
 			<modules>