Merge pull request #15 from sprakash28/develop

Develop

META-INF/MANIFEST.MF

@@ -19,7 +19,7 @@ Import-Package: com.servicemesh.agility.api;version="3.1.0",
  javax.xml.namespace,
  org.apache.commons.codec.binary,
  org.apache.log4j;version="[1.2.17,2.0.0)"
-Export-Package: com.servicemesh.agility.adapters.core.aws;version="1.2.0",
- com.servicemesh.agility.adapters.core.aws.action;version="1.2.0",
- com.servicemesh.agility.adapters.core.aws.security.group.resources;version="1.2.0",
- com.servicemesh.agility.adapters.core.aws.util;version="1.2.0"
+Export-Package: com.servicemesh.agility.adapters.core.aws;version="1.2.1",
+ com.servicemesh.agility.adapters.core.aws.action;version="1.2.1",
+ com.servicemesh.agility.adapters.core.aws.security.group.resources;version="1.2.1",
+ com.servicemesh.agility.adapters.core.aws.util;version="1.2.1"

build.xml

@@ -20,7 +20,7 @@
 
    <property name="version.major" value="1"/>
    <property name="version.minor" value="2"/>
-   <property name="version.build" value="0"/>
+   <property name="version.build" value="1"/>
    <property name="bundle.version"
              value="${version.major}.${version.minor}.${version.build}"/>
    <property name="bundle.name" value="${ant.project.name}-${bundle.version}"/>

ivy.xml

@@ -1,5 +1,11 @@
 <ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra">
   <info organisation="com.servicemesh" module="${ant.project.name}" />
+
+  <configurations defaultconfmapping="compile->default">
+      <conf name="default" transitive="true"/>
+      <conf name="compile" transitive="true"/>
+  </configurations>
+
   <dependencies>
     <dependency org="commons-codec" name="commons-codec" rev="1.4">
       <artifact name="commons-codec" type="jar" ext="jar" />
@@ -20,11 +26,11 @@
 	<!-- common.ivy.lib -->
 	<dependency org="log4j" name="log4j" rev="1.2.17" />		
 	<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5"/>
-	<!-- common.dist -->
-	<dependency org="com.servicemesh" name="agility.api" rev="3.1.0" />		
-	<dependency org="com.servicemesh" name="core" rev="1.0.0"  force="true" />		
-	<dependency org="com.servicemesh" name="io" rev="1.0.0"  force="true" />		
-	<dependency org="com.servicemesh" name="agility.distributed.sync" rev="1.0.0" force="true" />		
+	<!-- common.dist -->	
+	<dependency org="com.servicemesh" name="agility.api" rev="10.2.4.+" />
+	<dependency org="com.servicemesh" name="agility.core" rev="10.2.4.+"  force="true" />
+	<dependency org="com.servicemesh" name="agility.io" rev="10.2.4.+"  force="true" />
+	<dependency org="com.servicemesh" name="agility.distributed.sync" rev="10.2.4.+" force="true" />		
 
 	<!-- common.lib -->
 	<dependency org="net.sourceforge.cobertura" name="cobertura" rev="2.1.1"/>
@@ -51,4 +57,4 @@
 	</dependency> 	
 	<dependency org="com.fasterxml.uuid" name="java-uuid-generator" rev="3.0.0"/>		
   </dependencies>
-</ivy-module>
+</ivy-module>

ivysettings.xml

@@ -6,10 +6,7 @@
         <artifact pattern="http://central.maven.org/maven2/[organization]/[module]/[revision]/[artifact]-[revision]([tag]).[ext]" />
         <ivy pattern="http://central.maven.org/maven2/[organization]/[module]/[revision]/[module]-[revision].[ext]" />
     </url>
-    <url name="csc-opensrc" m2compatible="true" >
-        <artifact pattern="https://dl.bintray.com/csc/opensource/[organization]/[module]/[revision]/[artifact]-[revision]([tag]).[ext]" />
-        <ivy pattern="https://dl.bintray.com/csc/opensource/[organization]/[module]/[revision]/[module]-[revision].[ext]" />
-    </url>
+    <bintray name="csc-opensrc" m2compatible="true" subject="csc" repo="opensource"/>
     <chain name="ivy" returnFirst="true">
         <resolver ref="maven-central" />
         <resolver ref="csc-opensrc" />
@@ -20,4 +17,4 @@
     </chain>
   </resolvers>
 
-</ivy-settings>
+</ivy-settings>