Author: amilaj
Date: Wed Mar 20 23:15:55 2013
New Revision: 1459095
URL: http://svn.apache.org/r1459095
Log:
Attempting to fix continuous build failures
Modified:
airavata/trunk/modules/credential-store/pom.xml
airavata/trunk/modules/rest/webapp/pom.xml
airavata/trunk/pom.xml
Modified: airavata/trunk/modules/credential-store/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/credential-store/pom.xml?rev=1459095&r1=1459094&r2=1459095&view=diff
==============================================================================
--- airavata/trunk/modules/credential-store/pom.xml (original)
+++ airavata/trunk/modules/credential-store/pom.xml Wed Mar 20 23:15:55 2013
@@ -32,6 +32,16 @@
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<artifactId>oa4mp-client-oauth1</artifactId>
<version>${oa4mp.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>net.oauth.core</groupId> <!-- Exclude
Project-D from Project-B -->
+ <artifactId>oauth-httpclient4</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.oauth.core</groupId> <!-- Exclude
Project-D from Project-B -->
+ <artifactId>oauth-consumer</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -115,9 +125,4 @@
</testResource>
</testResources>
</build>
-
- <properties>
- <oa4mp.version>1.0.6-SNAPSHOT</oa4mp.version>
- </properties>
-
</project>
Modified: airavata/trunk/modules/rest/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/pom.xml?rev=1459095&r1=1459094&r2=1459095&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/pom.xml (original)
+++ airavata/trunk/modules/rest/webapp/pom.xml Wed Mar 20 23:15:55 2013
@@ -180,7 +180,7 @@
<dependency>
<groupId>edu.uiuc.ncsa.myproxy</groupId>
<artifactId>oa4mp-client-oauth1</artifactId>
- <version>1.0.6-SNAPSHOT</version>
+ <version>${oa4mp.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
Modified: airavata/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1459095&r1=1459094&r2=1459095&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Wed Mar 20 23:15:55 2013
@@ -68,7 +68,7 @@
<axis2.version>1.5.1</axis2.version>
<derby.version>10.9.1.0</derby.version>
<org.slf4j.version>1.7.2</org.slf4j.version>
- <log4j.version>1.2.16</log4j.version>
+ <log4j.version>1.2.16</log4j.version>
<axiom.version>1.2.8</axiom.version>
<surefire.version>2.12</surefire.version>
<junit.version>4.7</junit.version>
@@ -78,6 +78,7 @@
<jersey.version>1.13</jersey.version>
<tomcat.version>7.0.33</tomcat.version>
<cargo.version>1.3.1</cargo.version>
+ <oa4mp.version>1.0.6</oa4mp.version>
<skipTests>false</skipTests>
</properties>
@@ -348,9 +349,8 @@
<repository>
<name>oa4mp.repo</name>
<id>oa4mp.repo</id>
-
<url>http://cilogon.svn.sourceforge.net/viewvc/cilogon/m2-repo/snapshots</url>
+
<url>http://cilogon.svn.sourceforge.net/viewvc/cilogon/m2-repo/</url>
<snapshots>
- <!--updatePolicy>daily</updatePolicy -->
<enabled>true</enabled>
</snapshots>
</repository>
