cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject git commit: updated refs/heads/master to cc6edbd
Date Sat, 21 Sep 2013 07:50:24 GMT
Updated Branches:
  refs/heads/master 8b6dcf8b6 -> cc6edbdbf


Fix a few warnings in the awsapi pom

Apply formatting


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc6edbdb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc6edbdb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc6edbdb

Branch: refs/heads/master
Commit: cc6edbdbfe514dcf2b7db3dfd1a8f0ce086488b0
Parents: 8b6dcf8
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Sat Sep 21 15:49:25 2013 +0800
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Sat Sep 21 15:49:54 2013 +0800

----------------------------------------------------------------------
 awsapi/pom.xml | 301 +++++++++++++++++++++++++---------------------------
 1 file changed, 143 insertions(+), 158 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc6edbdb/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 5839a97..b1afd2d 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -16,7 +16,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cloud-awsapi</artifactId>
   <name>Apache CloudStack AWS API Bridge</name>
@@ -35,8 +37,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.apache.axis2</groupId>
       <artifactId>axis2</artifactId>
@@ -72,7 +73,6 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>${cs.log4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
@@ -97,22 +97,19 @@
           <groupId>org.apache.ws.commons.axiom</groupId>
           <artifactId>axiom-impl</artifactId>
         </exclusion>
-      </exclusions>      
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>${cs.gson.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>${cs.codec.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>${cs.servlet.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -123,7 +120,6 @@
     <dependency>
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt</artifactId>
-      <version>${cs.jasypt.version}</version>
     </dependency>
     <dependency>
       <groupId>com.caringo.client</groupId>
@@ -137,15 +133,15 @@
       <type>mar</type>
       <exclusions>
         <exclusion>
-           <groupId>bouncycastle</groupId>
-           <artifactId>bcprov-jdk14</artifactId>
+          <groupId>bouncycastle</groupId>
+          <artifactId>bcprov-jdk14</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>org.apache.xalan</groupId>
-           <artifactId>xalan</artifactId>
+          <groupId>org.apache.xalan</groupId>
+          <artifactId>xalan</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>org.opensaml</groupId>
+          <groupId>org.opensaml</groupId>
           <artifactId>opensaml</artifactId>
         </exclusion>
       </exclusions>
@@ -157,126 +153,127 @@
       <type>mar</type>
       <exclusions>
         <exclusion>
-           <groupId>bouncycastle</groupId>
-           <artifactId>bcprov-jdk14</artifactId>
+          <groupId>bouncycastle</groupId>
+          <artifactId>bcprov-jdk14</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>org.apache.xalan</groupId>
-           <artifactId>xalan</artifactId>
+          <groupId>org.apache.xalan</groupId>
+          <artifactId>xalan</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>org.opensaml</groupId>
+          <groupId>org.opensaml</groupId>
           <artifactId>opensaml</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-        <groupId>org.apache.rampart</groupId>
-        <artifactId>rampart-core</artifactId>
-        <version>${cs.rampart.version}</version>
-        <scope>runtime</scope>
+      <groupId>org.apache.rampart</groupId>
+      <artifactId>rampart-core</artifactId>
+      <version>${cs.rampart.version}</version>
+      <scope>runtime</scope>
       <exclusions>
         <exclusion>
-           <groupId>org.apache.xalan</groupId>
-           <artifactId>xalan</artifactId>
+          <groupId>org.apache.xalan</groupId>
+          <artifactId>xalan</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>org.opensaml</groupId>
+          <groupId>org.opensaml</groupId>
           <artifactId>opensaml</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-        <groupId>org.apache.rampart</groupId>
-        <artifactId>rampart-policy</artifactId>
-        <version>${cs.rampart.version}</version>
-        <scope>runtime</scope>
+      <groupId>org.apache.rampart</groupId>
+      <artifactId>rampart-policy</artifactId>
+      <version>${cs.rampart.version}</version>
+      <scope>runtime</scope>
       <exclusions>
         <exclusion>
-           <groupId>org.apache.xalan</groupId>
-           <artifactId>xalan</artifactId>
+          <groupId>org.apache.xalan</groupId>
+          <artifactId>xalan</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>org.opensaml</groupId>
+          <groupId>org.opensaml</groupId>
           <artifactId>opensaml</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-        <groupId>org.apache.rampart</groupId>
-        <artifactId>rampart-trust</artifactId>
-        <version>${cs.rampart.version}</version>
-        <scope>runtime</scope>
+      <groupId>org.apache.rampart</groupId>
+      <artifactId>rampart-trust</artifactId>
+      <version>${cs.rampart.version}</version>
+      <scope>runtime</scope>
       <exclusions>
         <exclusion>
-           <groupId>org.apache.xalan</groupId>
-           <artifactId>xalan</artifactId>
+          <groupId>org.apache.xalan</groupId>
+          <artifactId>xalan</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>org.opensaml</groupId>
+          <groupId>org.opensaml</groupId>
           <artifactId>opensaml</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-jdk14</artifactId>
-        <version>1.6.1</version>
-        <scope>runtime</scope>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <version>1.6.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>1.6.1</version>
-        <scope>runtime</scope>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.6.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>org.apache.ws.security</groupId>
-        <artifactId>wss4j</artifactId>
-        <version>1.6.1</version>
-        <scope>runtime</scope>
+      <groupId>org.apache.ws.security</groupId>
+      <artifactId>wss4j</artifactId>
+      <version>1.6.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>joda-time</groupId>
-        <artifactId>joda-time</artifactId>
-        <version>1.5.2</version>
-        <scope>runtime</scope>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>1.5.2</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>org.opensaml</groupId>
-        <artifactId>xmltooling</artifactId>
-        <version>1.3.1</version>
-        <scope>runtime</scope>
+      <groupId>org.opensaml</groupId>
+      <artifactId>xmltooling</artifactId>
+      <version>1.3.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>org.opensaml</groupId>
-        <artifactId>openws</artifactId>
-        <version>1.4.1</version>
-        <scope>runtime</scope>
+      <groupId>org.opensaml</groupId>
+      <artifactId>openws</artifactId>
+      <version>1.4.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>velocity</groupId>
-        <artifactId>velocity</artifactId>
-        <version>1.5</version>
-        <scope>runtime</scope>
+      <groupId>velocity</groupId>
+      <artifactId>velocity</artifactId>
+      <version>1.5</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>org.opensaml</groupId>
-        <artifactId>opensaml</artifactId>
-        <version>2.5.1-1</version>
-        <scope>runtime</scope>
+      <groupId>org.opensaml</groupId>
+      <artifactId>opensaml</artifactId>
+      <version>2.5.1-1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>org.apache.santuario</groupId>
-        <artifactId>xmlsec</artifactId>
-        <version>1.4.2</version>
-        <scope>runtime</scope>
+      <groupId>org.apache.santuario</groupId>
+      <artifactId>xmlsec</artifactId>
+      <version>1.4.2</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk16</artifactId>
-        <version>1.45</version>
-        <scope>runtime</scope>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk16</artifactId>
+      <!--  TODO: do we need this explicit version override? -->
+      <version>1.45</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>mysql</groupId>
@@ -302,7 +299,7 @@
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-framework-db</artifactId>
       <version>${project.version}</version>
-    </dependency>    
+    </dependency>
   </dependencies>
   <build>
     <resources>
@@ -313,7 +310,7 @@
         </excludes>
       </resource>
       <resource>
-          <directory>../utils/conf/</directory>
+        <directory>../utils/conf/</directory>
       </resource>
       <resource>
         <directory>${basedir}/resource/AmazonEC2</directory>
@@ -331,7 +328,7 @@
           </excludes>
         </configuration>
       </plugin>
-	  <plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
@@ -358,7 +355,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
         <executions>
           <execution>
             <id>generate-resource</id>
@@ -368,52 +364,49 @@
             </goals>
             <configuration>
               <target>
-                <copy
-                  todir="${basedir}/target/generated-webapp/WEB-INF/classes">
+                <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes">
                   <fileset dir="${basedir}/conf">
-                    <include name="*.*" />
+                    <include name="*.*"/>
                   </fileset>
-				  <globmapper from="*.in" to="*" />
+                  <globmapper from="*.in" to="*"/>
                   <filterchain>
-                    <filterreader
-                      classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile"
-                        value="${cs.replace.properties}" />
+                    <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
+                      <param type="propertiesfile" value="${cs.replace.properties}"/>
                     </filterreader>
                   </filterchain>
                 </copy>
               </target>
             </configuration>
           </execution>
-		</executions>
-	  </plugin>
-         <plugin>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-aar-maven-plugin</artifactId>
-            <version>1.6.2</version>
-            <extensions>true</extensions>
-            <configuration>
-              <includeDependencies>false</includeDependencies>
-              <aarName>cloud-ec2</aarName>
-              <outputDirectory>${project.build.directory}/WEB-INF/services</outputDirectory>
-              <fileSets>
-                <fileSet>
-                  <directory>resource/AmazonEC2</directory>
-                  <outputDirectory>META-INF</outputDirectory>
-                  <includes>
-                    <include>services.xml</include>
-                  </includes>
-                </fileSet>
-              </fileSets>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>aar</goal>
-                </goals>
-              </execution>
-            </executions>
-         </plugin>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.axis2</groupId>
+        <artifactId>axis2-aar-maven-plugin</artifactId>
+        <version>1.6.2</version>
+        <extensions>true</extensions>
+        <configuration>
+          <includeDependencies>false</includeDependencies>
+          <aarName>cloud-ec2</aarName>
+          <outputDirectory>${project.build.directory}/WEB-INF/services</outputDirectory>
+          <fileSets>
+            <fileSet>
+              <directory>resource/AmazonEC2</directory>
+              <outputDirectory>META-INF</outputDirectory>
+              <includes>
+                <include>services.xml</include>
+              </includes>
+            </fileSet>
+          </fileSets>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>aar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
@@ -426,19 +419,15 @@
               <pluginExecutions>
                 <pluginExecution>
                   <pluginExecutionFilter>
-                    <groupId>
-                      org.apache.maven.plugins
-                    </groupId>
-                    <artifactId>
-                      maven-antrun-plugin
-                    </artifactId>
+                    <groupId> org.apache.maven.plugins </groupId>
+                    <artifactId> maven-antrun-plugin </artifactId>
                     <versionRange>[1.7,)</versionRange>
                     <goals>
                       <goal>run</goal>
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -451,7 +440,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <execute />
+                    <execute/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -483,14 +472,10 @@
                 <configuration>
                   <target name="download-2012-08-15.ec2-wsdl">
                     <!-- Create the WSDL directory structure used by codegen -->
-                    <mkdir dir="wsdl" />
-                    <echo message="Downloading 2012-08-15.ec2-wsdl..." />
-                     <get
-                       src="http://s3.amazonaws.com/ec2-downloads/2012-08-15.ec2.wsdl"
-                       dest="${basedir}/wsdl/"
-                       verbose="true"
-                       usetimestamp="true"
-                     />
+                    <mkdir dir="wsdl"/>
+                    <echo message="Downloading 2012-08-15.ec2-wsdl..."/>
+                    <get src="http://s3.amazonaws.com/ec2-downloads/2012-08-15.ec2.wsdl"
+                      dest="${basedir}/wsdl/" verbose="true" usetimestamp="true"/>
                   </target>
                 </configuration>
               </execution>
@@ -555,27 +540,27 @@
       </activation>
       <build>
         <plugins>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>exec-maven-plugin</artifactId>
-          <version>1.2.1</version>
-          <executions>
-            <execution>
-              <phase>clean</phase>
-              <goals>
-                <goal>exec</goal>
-              </goals>
-              <configuration>
-                <executable>rm</executable>
-                <arguments>
-                  <argument>-rf</argument>
-                  <argument>${basedir}/wsdl/</argument>
-                  <argument>${basedir}/resources/AmazonEC2.wsdl</argument>
-                </arguments>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.2.1</version>
+            <executions>
+              <execution>
+                <phase>clean</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <executable>rm</executable>
+                  <arguments>
+                    <argument>-rf</argument>
+                    <argument>${basedir}/wsdl/</argument>
+                    <argument>${basedir}/resources/AmazonEC2.wsdl</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>


Mime
View raw message