Merge remote branch 'origin/release' into integration/master

zanata · Jun 19, 2014 · 14b9970 · 14b9970
2 parents abab959 + 99b5e1e
commit 14b9970
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
@@ -136,6 +136,8 @@
             <usedDependency>com.google.protobuf:protobuf-java</usedDependency>
             <!-- used for annotations -->
             <usedDependency>com.google.code.findbugs:jsr305</usedDependency>
+            <!-- Used by javamelody for email/pdf support -->
+            <usedDependency>com.lowagie:itext</usedDependency>
             <!-- used for arquillian tests -->
             <usedDependency>org.jboss.as:jboss-as-controller</usedDependency>
             <!-- used for gwt super devmode -->
@@ -1461,6 +1463,19 @@
       <version>1.48.0</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.lowagie</groupId>
+      <artifactId>itext</artifactId>
+      <version>2.1.7</version>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bctsp-jdk14</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>org.fedorahosted.openprops</groupId>
       <artifactId>openprops</artifactId>