From 5d4da27842c1fb7ab9d9fe71166b13d309251276 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sat, 25 Jan 2014 15:27:03 -0300 Subject: [PATCH] Fix Jetty hangs during install. --- pom.xml | 6 +++--- setup.sh | 3 +++ wise-webapp/pom.xml | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 setup.sh diff --git a/pom.xml b/pom.xml index e5cdbc9f..bce1d823 100644 --- a/pom.xml +++ b/pom.xml @@ -5,6 +5,7 @@ 3.1-SNAPSHOT + ${project.basedir}/wise-webapps 4.0.0 @@ -101,12 +102,11 @@ org.apache.maven.plugins - true maven-compiler-plugin 3.1 - 1.6 - 1.6 + 1.7 + 1.7 UTF-8 diff --git a/setup.sh b/setup.sh new file mode 100644 index 00000000..fbd65887 --- /dev/null +++ b/setup.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +export MAVEN_OPTS="-XX:MaxPermSize=128M" diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index 183272ce..feaf0fea 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -461,6 +461,7 @@ org.apache.tomcat.maven tomcat7-maven-plugin + 2.0 /wisemapping ${project.build.directory}/wisemapping.war @@ -473,9 +474,9 @@ - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - 8.1.14.v20131031 + 9.1.0.v20131115 foo 9999 @@ -498,7 +499,6 @@ ${project.build.directory} -