diff --git a/installer/home/pom.xml b/installer/home/pom.xml index cc5a90d582..7a4d0b6de8 100644 --- a/installer/home/pom.xml +++ b/installer/home/pom.xml @@ -18,81 +18,24 @@ wilma - - - install - - vivo-dir - - - ${app-name} - - - maven-assembly-plugin - - - src/main/assembly/home.xml - - false - - - - package - - single - - - - - - maven-antrun-plugin - - - remove-webapp - verify - - run - - - - - - - - - - - maven-resources-plugin - - - install - install - - copy-resources - - - ${vivo-dir} - - - ${project.build.directory}/${project.build.finalName} - - - - - - - - - - - - maven-install-plugin + maven-assembly-plugin - true + + src/main/assembly/home.xml + + false + + + package + + single + + + diff --git a/installer/home/src/main/assembly/home.xml b/installer/home/src/main/assembly/home.xml index 6de97e21d7..755b02745d 100644 --- a/installer/home/src/main/assembly/home.xml +++ b/installer/home/src/main/assembly/home.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> home - dir + tar false diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index 4f19644c66..abf3c04177 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -25,6 +25,34 @@ ${app-name} + + org.apache.maven.plugins + maven-dependency-plugin + + false + + + + include-home + process-resources + + unpack + + + + + org.vivoweb + vivo-installer-home + ${project.version} + tar + + target/${app-name}/WEB-INF/resources/home-files + + + + + + org.apache.maven.plugins maven-war-plugin @@ -54,53 +82,19 @@ - install + deploy tomcat-dir - - maven-antrun-plugin - - - remove-webapp - verify - - run - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - install - install - - unpack - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - war - true - ${tomcat-dir}/webapps/${project.build.finalName} - - - - - + maven-war-plugin + 3.2.1 + + ${tomcat-dir}/webapps/ +