Merge pull request #32 from andrew890/main

Fix up copy-dependencies to always copy dependencies to lib subdirect…
BlackHillSoftware · Sep 15, 2023 · a6fdc04 · a6fdc04
2 parents 14e681c + 540911f
commit a6fdc04
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/easysmf-rti/rti-http-binary/pom.xml b/easysmf-rti/rti-http-binary/pom.xml
@@ -86,6 +86,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
 							<mainClass>com.smfreports.sample.RtiHttpBinary</mainClass>
 						</manifest>
 					</archive>
@@ -103,7 +104,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
 							<includeScope>runtime</includeScope>
 						</configuration>
 					</execution>

diff --git a/easysmf-rti/rti-http-json/pom.xml b/easysmf-rti/rti-http-json/pom.xml
@@ -96,6 +96,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
 							<mainClass>com.smfreports.sample.RtiHttpJson</mainClass>
 						</manifest>
 					</archive>
@@ -113,7 +114,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
 							<includeScope>runtime</includeScope>
 						</configuration>
 					</execution>

diff --git a/easysmf-rti/rti-notifications/pom.xml b/easysmf-rti/rti-notifications/pom.xml
@@ -101,6 +101,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
 							<mainClass>com.smfreports.sample.RtiNotifications</mainClass>
 						</manifest>
 					</archive>
@@ -118,7 +119,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
 							<includeScope>runtime</includeScope>
 						</configuration>
 					</execution>

diff --git a/easysmf-rti/rti-simple/pom.xml b/easysmf-rti/rti-simple/pom.xml
@@ -91,6 +91,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
 							<mainClass>com.smfreports.sample.RtiSimple</mainClass>
 						</manifest>
 					</archive>
@@ -108,7 +109,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
 							<includeScope>runtime</includeScope>
 						</configuration>
 					</execution>

diff --git a/easysmf-skeleton/pom.xml b/easysmf-skeleton/pom.xml
@@ -93,7 +93,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
-							<classpathPrefix>./lib</classpathPrefix>
+							<classpathPrefix>lib/</classpathPrefix>
 							<mainClass>com.smfreports.sample.EasySmfSkeleton</mainClass>
 						</manifest>
 					</archive>

diff --git a/smf-de-dup/pom.xml b/smf-de-dup/pom.xml
@@ -91,7 +91,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
-							<classpathPrefix>./lib</classpathPrefix>
+							<classpathPrefix>lib/</classpathPrefix>
 							<mainClass>com.smfreports.SmfDeDup</mainClass>
 						</manifest>
 					</archive>

diff --git a/smf-report-dups/pom.xml b/smf-report-dups/pom.xml
@@ -91,7 +91,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
-							<classpathPrefix>./lib</classpathPrefix>
+							<classpathPrefix>lib/</classpathPrefix>
 							<mainClass>com.smfreports.SmfReportDups</mainClass>
 						</manifest>
 					</archive>