[tomcat-jakartaee-migration] 01/03: Fix various issues when doing a clean build

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 0.0.1
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 31d728d82cf2b1f4afc571d6e7e814576988ee00
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 13 15:05:29 2020 +0000

    Fix various issues when doing a clean build
---
 pom.xml                     | 4 ----
 src/assembly/bin.xml        | 3 ++-
 src/main/scripts/migrate.sh | 5 +----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index d2e65e7..7c53547 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,10 +79,6 @@
         <directory>src/main/resources</directory>
         <filtering>true</filtering>
       </resource>
-      <resource>
-        <directory>src/main/scripot</directory>
-        <targetPath>bin</targetPath>
-      </resource>
     </resources>   
     <plugins>
       <plugin>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 79f13c0..6397296 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -17,7 +17,8 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.build.directpry}/bin</directory>
+      <directory>${project.basedir}/src/main/scripts</directory>
+      <outputDirectory>bin</outputDirectory>
       <includes>
         <include>*.sh</include>
       </includes>
diff --git a/src/main/scripts/migrate.sh b/src/main/scripts/migrate.sh
index 3d3004f..4f8826b 100644
--- a/src/main/scripts/migrate.sh
+++ b/src/main/scripts/migrate.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
 
-# Assumes current layout of Maven's target directory
-cd ..
-
 # Assumes java is on the path
-java -cp lib/* org.apache.tomcat.jakartaee.Migration "$@"
+java -cp "../lib/*" org.apache.tomcat.jakartaee.Migration "$@"


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org