Merge "Adding maven-war-plugin to integration pom"

[policy/parent.git] / integration / pom.xml

diff --git a/integration/pom.xml b/integration/pom.xml
index 15eeaf4..fdb68bb 100644 (file)
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -101,7 +101,18 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>23.0</version>
+                <version>25.1-jre</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.checkerframework</groupId>
+                        <artifactId>checker-qual</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.checkerframework</groupId>
+                <artifactId>checker-qual</artifactId>
+                <version>2.5.3</version>
             </dependency>
 
             <!-- JSON marshalling and unmarshalling -->
@@ -281,6 +292,11 @@
                     <artifactId>exec-maven-plugin</artifactId>
                     <version>1.6.0</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.6</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -297,4 +313,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>