Permalink
Browse files

new jetty version

  • Loading branch information...
1 parent dcaa05c commit 4f2977db79619f4af480c253840ebde848e723bf @jamesward committed Oct 16, 2011
Showing with 16 additions and 64 deletions.
  1. +1 −0 Procfile
  2. +15 −64 pom.xml
View
@@ -0,0 +1 @@
+web: sh target/bin/webapp
View
79 pom.xml
@@ -7,11 +7,6 @@
<artifactId>jettySessionTest</artifactId>
<packaging>jar</packaging>
- <properties>
- <java.version>1.6</java.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<!-- Servlet API -->
<dependency>
@@ -24,92 +19,48 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>7.5.1.v20110908</version>
+ <version>8.0.3.v20111011</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-nosql</artifactId>
- <version>7.5.1.v20110908</version>
+ <version>8.0.3.v20111011</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.6.1</version>
+ <version>2.6.5</version>
<type>jar</type>
- <scope>compile</scope>
+<!-- <scope>compile</scope>-->
</dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-glassfish</artifactId>
- <version>2.1.v20100127</version>
- </dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
-
- <!-- The maven app assembler plugin will generate a script that sets up the classpath and runs your project -->
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
<version>1.1.1</version>
- <configuration>
- <assembleDirectory>target</assembleDirectory>
- <programs>
- <program>
- <mainClass>com.heroku.test.Main</mainClass>
- <name>webapp</name>
- </program>
- </programs>
- </configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>assemble</goal>
</goals>
- </execution>
+ <configuration>
+ <assembleDirectory>target</assembleDirectory>
+ <extraJvmArguments>-Xmx512m</extraJvmArguments>
+ <programs>
+ <program>
+ <mainClass>com.heroku.test.Main</mainClass>
+ <name>webapp</name>
+ </program>
+ </programs>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>debug-launch</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
- <configuration>
- <executable>sh</executable>
- <arguments>
- <argument>${project.build.directory}/bin/webapp</argument>
- </arguments>
- <environmentVariables>
- <JAVA_OPTS>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=4000,server=y,suspend=n</JAVA_OPTS>
- </environmentVariables>
- </configuration>
- <executions>
- <execution>
- <phase>install</phase>
- <goals><goal>exec</goal></goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>

0 comments on commit 4f2977d

Please sign in to comment.