Merge pull request #941 from NASA-PDS/issue_935

Specify specific maven project.version in the validate execution scripts

src/main/assembly/tar-assembly.xml

@@ -56,7 +56,7 @@ POSSIBILITY OF SUCH DAMAGE.
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>src/main/resources/bin</directory>
+      <directory>target/classes/bin</directory>
       <outputDirectory>bin</outputDirectory>
       <includes>
         <include>validate</include>
@@ -69,7 +69,7 @@ POSSIBILITY OF SUCH DAMAGE.
       <lineEnding>keep</lineEnding>
     </fileSet>
     <fileSet>
-      <directory>src/main/resources/bin</directory>
+      <directory>target/classes/bin</directory>
       <outputDirectory>bin</outputDirectory>
       <includes>
         <include>logging.properties</include>

src/main/assembly/zip-assembly.xml

@@ -56,7 +56,7 @@ POSSIBILITY OF SUCH DAMAGE.
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>src/main/resources/bin</directory>
+      <directory>target/classes/bin</directory>
       <outputDirectory>bin</outputDirectory>
       <includes>
         <include>validate</include>
@@ -69,7 +69,7 @@ POSSIBILITY OF SUCH DAMAGE.
       <lineEnding>keep</lineEnding>
     </fileSet>
     <fileSet>
-      <directory>src/main/resources/bin</directory>
+      <directory>target/classes/bin</directory>
       <outputDirectory>bin</outputDirectory>
       <includes>
         <include>logging.properties</include>

src/main/resources/bin/validate

@@ -59,7 +59,7 @@ if [ ! -f ${LIB_DIR}/validate-*.jar ]; then
 fi
 
 # Finds the jar file in LIB_DIR and sets it to VALIDATE_JAR.
-VALIDATE_JAR=`ls ${LIB_DIR}/validate-*.jar`
+VALIDATE_JAR=${LIB_DIR}/validate-@project.version@.jar
 
 # Executes Validate Tool via the executable jar file
 # Arguments are passed in to the tool via '$@'

src/main/resources/bin/validate-refs

@@ -59,7 +59,7 @@ if [ ! -f ${LIB_DIR}/validate-*.jar ]; then
 fi
 
 # Finds the jar file in LIB_DIR and sets it to VALIDATE_JAR.
-VALIDATE_JAR=`ls ${LIB_DIR}/validate-*.jar`
+VALIDATE_JAR=${LIB_DIR}/validate-@project.version@.jar
 
 # Executes Validate Tool via the executable jar file
 # Arguments are passed in to the tool via '$@'

src/main/resources/bin/validate-refs.bat

@@ -48,16 +48,13 @@ set PARENT_DIR=%SCRIPT_DIR%..
 set LIB_DIR=%PARENT_DIR%\lib
 
 :: Check for dependencies.
-if exist "%LIB_DIR%\validate-*.jar" (
-set VALIDATE_JAR=%LIB_DIR%\validate-*.jar
+if exist "%LIB_DIR%\validate-@project.version@.jar" (
+set VALIDATE_JAR=%LIB_DIR%\validate-@project.version@.jar
 ) else (
-echo Cannot find VTool jar file in %LIB_DIR%
+echo Cannot find VTool jar file ([email protected]@.jar) in %LIB_DIR%
 goto END
 )
 
-:: Finds the jar file in LIB_DIR and sets it to VALIDATE_JAR
-for %%i in ("%LIB_DIR%"\validate-*.jar) do set VALIDATE_JAR=%%i
-
 :: Executes the Validate Tool via the executable jar file
 :: The special variable '%*' allows the arguments
 :: to be passed into the executable.

src/main/resources/bin/validate.bat

@@ -48,16 +48,13 @@ set PARENT_DIR=%SCRIPT_DIR%..
 set LIB_DIR=%PARENT_DIR%\lib
 
 :: Check for dependencies.
-if exist "%LIB_DIR%\validate-*.jar" (
-set VALIDATE_JAR=%LIB_DIR%\validate-*.jar
+if exist "%LIB_DIR%\validate-@project.validate@.jar" (
+set VALIDATE_JAR=%LIB_DIR%\validate-@project.version@.jar
 ) else (
-echo Cannot find VTool jar file in %LIB_DIR%
+echo Cannot find VTool jar file ([email protected]@.jar) in %LIB_DIR%
 goto END
 )
 
-:: Finds the jar file in LIB_DIR and sets it to VALIDATE_JAR
-for %%i in ("%LIB_DIR%"\validate-*.jar) do set VALIDATE_JAR=%%i
-
 :: Executes the Validate Tool via the executable jar file
 :: The special variable '%*' allows the arguments
 :: to be passed into the executable.