Author: smarru
Date: Sun Aug 18 04:46:34 2013
New Revision: 1515073
URL: http://svn.apache.org/r1515073
Log:
Migrated to use the maven central version of jython
Modified:
airavata/trunk/modules/distribution/airavata-client/pom.xml
airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/distribution/airavata-server/pom.xml
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/distribution/xbaya-gui/pom.xml
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/xbaya-gui/pom.xml
airavata/trunk/pom.xml
Modified: airavata/trunk/modules/distribution/airavata-client/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/pom.xml?rev=1515073&r1=1515072&r2=1515073&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-client/pom.xml Sun Aug 18
04:46:34 2013
@@ -119,9 +119,9 @@
<version>1.3</version>
</dependency>
<dependency>
- <groupId>jython</groupId>
+ <groupId>org.python</groupId>
<artifactId>jython</artifactId>
- <version>2.5.1</version>
+ <version>${jython.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified:
airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml?rev=1515073&r1=1515072&r2=1515073&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
(original)
+++
airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
Sun Aug 18 04:46:34 2013
@@ -91,7 +91,7 @@
<include>org.ogce:xsul5:jar</include>
<include>org.ogce:gpel-client:jar</include>
<include>org.ogce:atomixmiser:jar</include>
- <include>jython:jython</include>
+ <include>org.python:jython:jar</include>
<include>org.apache.xmlbeans:xmlbeans</include>
<!--<include>com.amazonaws:aws-java-sdk</include> -->
<!--<include>amazon:MapReduce.Service.Client</include> -->
Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1515073&r1=1515072&r2=1515073&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Sun Aug 18
04:46:34 2013
@@ -292,7 +292,7 @@
<dependency>
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
- <version>2.5.3</version>
+ <version>${jython.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
Modified:
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml?rev=1515073&r1=1515072&r2=1515073&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
(original)
+++
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
Sun Aug 18 04:46:34 2013
@@ -219,7 +219,7 @@
<include>org.ogce:gpel-client:jar</include>
<include>org.ogce:atomixmiser:jar</include>
<include>org.ogce:yfilter:jar</include>
- <include>jython:jython</include>
+ <include>org.python:jython:jar</include>
<include>org.jglobus:jglobus-all</include>
<include>lead-security:puretls</include>
<include>lead-security:cryptix32</include>
Modified: airavata/trunk/modules/distribution/xbaya-gui/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/pom.xml?rev=1515073&r1=1515072&r2=1515073&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/pom.xml Sun Aug 18 04:46:34
2013
@@ -251,9 +251,9 @@
<version>1.3</version>
</dependency>
<dependency>
- <groupId>jython</groupId>
+ <groupId>org.python</groupId>
<artifactId>jython</artifactId>
- <version>2.5.1</version>
+ <version>${jython.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified:
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml?rev=1515073&r1=1515072&r2=1515073&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
(original)
+++
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
Sun Aug 18 04:46:34 2013
@@ -105,7 +105,7 @@
<include>org.ogce:gpel-client:jar</include>
<include>org.ogce:atomixmiser:jar</include>
<include>org.ogce:yfilter:jar</include>
- <include>jython:jython</include>
+ <include>org.python:jython:jar</include>
<include>org.apache.xmlbeans:xmlbeans</include>
<include>com.amazonaws:aws-java-sdk</include>
<include>amazon:MapReduce.Service.Client</include>
Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1515073&r1=1515072&r2=1515073&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Sun Aug 18 04:46:34 2013
@@ -116,9 +116,9 @@
<version>1.3</version>
</dependency>
<dependency>
- <groupId>jython</groupId>
+ <groupId>org.python</groupId>
<artifactId>jython</artifactId>
- <version>2.5.1</version>
+ <version>${jython.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: airavata/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1515073&r1=1515072&r2=1515073&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Sun Aug 18 04:46:34 2013
@@ -82,6 +82,7 @@
<gpel.version>1.0.9</gpel.version>
<atomixmiser.version>0.9.4</atomixmiser.version>
<yfilter.version>1.0</yfilter.version>
+ <jython.version>2.5.3</jython.version>
<jersey.version>1.13</jersey.version>
<tomcat.version>7.0.41</tomcat.version>
<cargo.version>1.3.1</cargo.version>
