|
|
@@ -9,38 +9,18 @@
|
|
|
|
|
|
<properties>
|
|
|
<java.version>1.7</java.version>
|
|
|
- <ninja.version>2.5.1</ninja.version>
|
|
|
+ <ninja.version>3.0.1</ninja.version>
|
|
|
<mysql.version>5.1.26</mysql.version>
|
|
|
- <jetty.version>9.0.5.v20130815</jetty.version>
|
|
|
+ <jetty.version>9.1.2.v20140210</jetty.version>
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
|
</properties>
|
|
|
|
|
|
<dependencies>
|
|
|
-
|
|
|
- <!-- Ninja uses Guava 15.0 and Guava 15.0 by default has problems
|
|
|
- with Resin (and other EE6 containers). Therefore we
|
|
|
- force the usage of the following dependency which overwrites
|
|
|
- the original one.
|
|
|
- More here: https://code.google.com/p/guava-libraries/issues/detail?id=1527
|
|
|
- -->
|
|
|
- <dependency>
|
|
|
- <groupId>com.google.guava</groupId>
|
|
|
- <artifactId>guava</artifactId>
|
|
|
- <version>15.0</version>
|
|
|
- <classifier>cdi1.0</classifier>
|
|
|
- </dependency>
|
|
|
|
|
|
<dependency>
|
|
|
<groupId>org.ninjaframework</groupId>
|
|
|
<artifactId>ninja-standalone</artifactId>
|
|
|
<version>${ninja.version}</version>
|
|
|
- <exclusions>
|
|
|
- <!-- See the comment above why we exclude guava -->
|
|
|
- <exclusion>
|
|
|
- <groupId>com.google.guava </groupId>
|
|
|
- <artifactId>guava</artifactId>
|
|
|
- </exclusion>
|
|
|
- </exclusions>
|
|
|
</dependency>
|
|
|
|
|
|
<dependency>
|
|
|
@@ -88,10 +68,6 @@
|
|
|
<version>2.4</version>
|
|
|
<configuration>
|
|
|
<warName>ninja</warName>
|
|
|
- <!-- Because seomhow in Techempower's platform the nasty
|
|
|
- guava default version still gets included we exlude
|
|
|
- it by force in the war file -->
|
|
|
- <packagingExcludes>WEB-INF/lib/guava-15.0.jar</packagingExcludes>
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
|
reyez