Raise the version of dropwizard.

Change-Id: I780a348a3b94d0ea583f865d7c62613e0eb5f781
Issue-ID: AAI-592
Signed-off-by: Lizi <li.zi30@zte.com.cn>

diff --git a/esr-mgr/pom.xml b/esr-mgr/pom.xml
index 05b42b7..025ac2a 100644 (file)
--- a/esr-mgr/pom.xml
+++ b/esr-mgr/pom.xml
@@ -178,19 +178,45 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>

+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <scope>test</scope>
+        </dependency>

         <dependency>
             <groupId>org.powermock</groupId>
         <dependency>
             <groupId>org.powermock</groupId>

-            <artifactId>powermock-module-junit4</artifactId>
+            <artifactId>powermock-api-easymock</artifactId>
+            <version>1.6.5</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>

+            <version>1.7.1</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <scope>test</scope>
         </dependency>
         <dependency>

-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4-rule</artifactId>
+            <version>1.6.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-classloading-xstream</artifactId>
+            <version>1.6.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>3.0</version>

             <scope>test</scope>
         </dependency>
         <!-- MSB java-sdk -->
             <scope>test</scope>
         </dependency>
         <!-- MSB java-sdk -->

diff --git a/pom.xml b/pom.xml
index d791e58..2e1d096 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -36,13 +36,12 @@
     </modules>
        
        <properties>
     </modules>
        
        <properties>

-        <dropwizard.version>0.8.0</dropwizard.version>
+        <dropwizard.version>1.2.2</dropwizard.version>

         <swagger.version>1.5.3</swagger.version>
         <jersey.version>2.16</jersey.version>
         <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
         <gson.version>2.2.4</gson.version>
         <junit.version>4.10</junit.version>
         <swagger.version>1.5.3</swagger.version>
         <jersey.version>2.16</jersey.version>
         <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
         <gson.version>2.2.4</gson.version>
         <junit.version>4.10</junit.version>

-        <org.powermock.version>1.4.10</org.powermock.version>

         <org.apache.ant.version>1.8.2</org.apache.ant.version>
     </properties>
 
         <org.apache.ant.version>1.8.2</org.apache.ant.version>
     </properties>
 


@@ -103,16 +102,6 @@
                 <artifactId>junit</artifactId>  
                 <version>${junit.version}</version>
             </dependency> 
                 <artifactId>junit</artifactId>  
                 <version>${junit.version}</version>
             </dependency> 

-            <dependency> 
-                <groupId>org.powermock</groupId> 
-                <artifactId>powermock-module-junit4</artifactId> 
-                <version>${org.powermock.version}</version>
-            </dependency> 
-            <dependency> 
-                <groupId>org.powermock</groupId> 
-                <artifactId>powermock-api-mockito</artifactId> 
-                <version>${org.powermock.version}</version>
-            </dependency> 

             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant</artifactId>
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant</artifactId>


@@ -206,10 +195,6 @@
                     <artifactId>maven-antrun-plugin</artifactId>
                     <version>1.8</version>
                 </plugin>
                     <artifactId>maven-antrun-plugin</artifactId>
                     <version>1.8</version>
                 </plugin>

-                               <plugin>
-                                       <groupId>com.mycila</groupId>
-                                       <artifactId>license-maven-plugin</artifactId>
-                               </plugin>

             </plugins>
         </pluginManagement>
     </build>   
             </plugins>
         </pluginManagement>
     </build>