diff options
| -rw-r--r-- | booter-jetty8/pom.xml | 40 | ||||
| -rw-r--r-- | booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java | 2 | ||||
| -rw-r--r-- | examples/app-a-bundle/pom.xml | 1 | ||||
| -rw-r--r-- | examples/app-a-web/pom.xml | 1 | ||||
| -rw-r--r-- | pom.xml | 2 |
5 files changed, 42 insertions, 4 deletions
diff --git a/booter-jetty8/pom.xml b/booter-jetty8/pom.xml index 78987d6..98d4b59 100644 --- a/booter-jetty8/pom.xml +++ b/booter-jetty8/pom.xml @@ -20,15 +20,51 @@ <artifactId>jetty-webapp</artifactId> <version>${versions.jetty8}</version> </dependency> + + <!-- + $ (cd jetty-distribution-8.1.7.v20120910; find * -name \*.jar|sort|grep jsp) + lib/jsp/com.sun.el-2.2.0.v201108011116.jar + lib/jsp/javax.el-2.2.0.v201108011116.jar + lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar + lib/jsp/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar + lib/jsp/org.apache.jasper.glassfish-2.2.2.v201112011158.jar + lib/jsp/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar + lib/jsp/org.eclipse.jdt.core-3.7.1.jar + --> <dependency> <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>org.apache.jasper.glassfish</artifactId> - <version>2.2.2.v201112011158</version> + <artifactId>com.sun.el</artifactId> + <version>2.2.0.v201108011116</version> </dependency> <dependency> <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>javax.el</artifactId> <version>2.2.0.v201108011116</version> </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet.jsp</artifactId> + <version>2.2.0.v201112011158</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet.jsp.jstl</artifactId> + <version>1.2.0.v201105211821</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>org.apache.jasper.glassfish</artifactId> + <version>2.2.2.v201112011158</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>org.apache.taglibs.standard.glassfish</artifactId> + <version>1.2.0.v201112081803</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>org.eclipse.jdt.core</artifactId> + <version>3.7.1</version> + </dependency> </dependencies> </project> diff --git a/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java b/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java index b69ff1d..15279dc 100644 --- a/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java +++ b/booter-jetty8/src/main/java/io/trygvis/appsh/booter/jetty8/Main.java @@ -51,7 +51,7 @@ public class Main { } } - String httpPort = properties.getProperty("http.port"); + String httpPort = properties.getProperty("httpPort", System.getenv("httpPort")); if (httpPort != null) { server.setHttpPort(parseInt(httpPort)); } diff --git a/examples/app-a-bundle/pom.xml b/examples/app-a-bundle/pom.xml index 63b4c5a..04d5e43 100644 --- a/examples/app-a-bundle/pom.xml +++ b/examples/app-a-bundle/pom.xml @@ -4,6 +4,7 @@ <groupId>io.trygvis.appsh</groupId> <artifactId>appsh-parent</artifactId> <version>1.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <groupId>io.trygvis.appsh.examples</groupId> <artifactId>app-a-bundle</artifactId> diff --git a/examples/app-a-web/pom.xml b/examples/app-a-web/pom.xml index 4258644..2db17e2 100644 --- a/examples/app-a-web/pom.xml +++ b/examples/app-a-web/pom.xml @@ -4,6 +4,7 @@ <groupId>io.trygvis.appsh</groupId> <artifactId>appsh-parent</artifactId> <version>1.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <groupId>io.trygvis.appsh.examples</groupId> <artifactId>app-a-web</artifactId> @@ -8,7 +8,7 @@ <maven>3.0.0</maven> </prerequisites> <properties> - <versions.jetty8>8.1.4.v20120524</versions.jetty8> + <versions.jetty8>8.1.7.v20120910</versions.jetty8> <maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.target>1.6</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |