Merge pull request #18 from ResilientGroup/TASK-4017/inheritResources

TASK-4017 fixed resources not correctly working

README.md

@@ -26,29 +26,3 @@ it is not guaranteed that the maven version you have installed on your system is
 For that, a maven wrapper is recommended to be used.
 
 It is strongly recommended to use the wrapper in any automated build process, as it ensures that the correct maven version is used.
-
-## Adding resources to your jar
-First of all, `scr/main/resources` is the default location for resources in a maven project,
-and is already added to the jar in the parent pom.
-The `build.resources` can not be used, as the merging with a parent pom actually overrides the resources from the parent pom.
-Therefore, you need to use the `maven-resources-plugin`, to add more resources to the jar.
-This is done by adding the following to your pom.xml:
-```xml
-<project>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<configuration>
-					<resources>
-						<resource>
-							<directory>MyResourceDir</directory>
-						</resource>
-					</resources>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>    
-```

Configs/pom.xml → configs/pom.xml

@@ -7,7 +7,7 @@
 		<groupId>works.reload.parent</groupId>
 		<artifactId>versions</artifactId>
 		<version>${revision}${changelist}</version>
-		<relativePath>../Versions/pom.xml</relativePath>
+		<relativePath>../versions/pom.xml</relativePath>
 	</parent>
 
 	<artifactId>configs</artifactId>
@@ -16,7 +16,7 @@
 
 	<properties>
 		<!-- project version -->
-		<revision>1.0.4</revision>
+		<revision>1.0.5</revision>
 		<changelist>-SNAPSHOT</changelist>
 	</properties>
 

pom.xml

@@ -7,7 +7,7 @@
 		<groupId>works.reload.parent</groupId>
 		<artifactId>versions</artifactId>
 		<version>${revision}${changelist}</version>
-		<relativePath>./Versions/pom.xml</relativePath>
+		<relativePath>./versions/pom.xml</relativePath>
 	</parent>
 
 	<groupId>works.reload</groupId>
@@ -18,7 +18,7 @@
 
 	<properties>
 		<!-- project version -->
-		<revision>1.0.4</revision>
+		<revision>1.0.5</revision>
 		<changelist>-SNAPSHOT</changelist>
 		<!-- dependencyManagement versions -->
 		<jetbrains-annotations.version>24.1.0</jetbrains-annotations.version>
@@ -49,8 +49,8 @@
 	</properties>
 
 	<modules>
-		<module>Versions</module>
-		<module>Configs</module>
+		<module>versions</module>
+		<module>configs</module>
 	</modules>
 
 	<pluginRepositories>
@@ -141,7 +141,6 @@
 	</dependencyManagement>
 
 	<build>
-		<finalName>${project.name}-${project.version}</finalName>
 		<pluginManagement>
 			<plugins>
 				<plugin>
@@ -315,14 +314,39 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<configuration>
-					<resources combine.children="append">
-						<resource>
-							<directory>src/main/resources</directory>
-							<filtering>true</filtering>
-						</resource>
-					</resources>
-				</configuration>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.outputDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/resources</directory>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-test-resources</id>
+						<phase>process-test-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/test/resources</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

Versions/pom.xml → versions/pom.xml

@@ -18,7 +18,7 @@
 
 	<properties>
 		<!-- project version -->
-		<revision>1.0.4</revision>
+		<revision>1.0.5</revision>
 		<changelist>-SNAPSHOT</changelist>
 		<!-- project settings -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>