Merge "Bug 5787 Upgrade for Jersey from 2.8 to 2.22.2, the latest version"

[odlparent.git] / odlparent / pom.xml

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 6c0c2cfbe2f602a0e29d056d9ebfea943132c565..6aaeda22f9376c8031a245fb51646cd5ac2bae4c 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -285,6 +285,11 @@
         <artifactId>jersey-guava</artifactId>
         <version>2.22.2</version>
       </dependency>
+      <dependency>
+        <groupId>org.glassfish</groupId>
+        <artifactId>javax.json</artifactId>
+        <version>1.0.4</version>
+      </dependency>
       <dependency>
         <groupId>com.eclipsesource.jaxrs</groupId>
         <artifactId>jersey-all</artifactId>
@@ -329,6 +334,12 @@
         <version>${jersey.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>com.sun.jersey.jersey-test-framework</groupId>
+        <artifactId>jersey-test-framework-inmemory</artifactId>
+        <version>1.17</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-client</artifactId>
@@ -1118,6 +1129,7 @@
               <phase>process-sources</phase>
               <configuration>
                 <configLocation>check-license.xml</configLocation>
+                <headerLocation>EPL-LICENSE.regexp.txt</headerLocation>
                 <includeResources>false</includeResources>
                 <includeTestResources>false</includeTestResources>
                 <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>