Merge branch 'master' into 4.0

awsapi/pom.xml

@@ -165,7 +165,7 @@
     <dependency>
         <groupId>org.opensaml</groupId>
         <artifactId>opensaml</artifactId>
-        <version>2.2.3</version>
+        <version>2.5.1-1</version>
         <scope>runtime</scope>
     </dependency>
     <dependency>

deps/pom.xml

@@ -102,11 +102,6 @@
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-awsapi</artifactId>
       <version>${project.version}</version>
-    </dependency>
-     <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-testclient</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>mysql</groupId>

pom.xml

@@ -208,6 +208,22 @@
             <target>${cs.jdk.version}</target>
           </configuration>
         </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <id>remove-old-installers</id>
+            <goals>
+              <goal>remove-project-artifact</goal>
+            </goals>
+            <configuration>
+              <removeAll>true</removeAll>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       </plugins>
     </pluginManagement>
   </build>