Browse Source

Fixed https://github.com/TechEmpower/FrameworkBenchmarks/pull/688#issuecomment-32286284.

reyez 11 years ago
parent
commit
cfcf8c0163
2 changed files with 22 additions and 1 deletions
  1. 21 0
      ninja-resin/pom.xml
  2. 1 1
      ninja-standalone/benchmark_config

+ 21 - 0
ninja-resin/pom.xml

@@ -15,10 +15,31 @@
     </properties>
     </properties>
 
 
     <dependencies>
     <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>
         <dependency>
             <groupId>org.ninjaframework</groupId>
             <groupId>org.ninjaframework</groupId>
             <artifactId>ninja-standalone</artifactId>
             <artifactId>ninja-standalone</artifactId>
             <version>${ninja.version}</version>
             <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>
 
 
         <dependency>
         <dependency>

+ 1 - 1
ninja-standalone/benchmark_config

@@ -1,5 +1,5 @@
 {
 {
-  "framework": "ninja",
+  "framework": "ninja-standalone",
   "tests": [{
   "tests": [{
     "default": {
     "default": {
       "setup_file": "setup",
       "setup_file": "setup",