Author: raminder
Date: Mon Dec 16 17:19:25 2013
New Revision: 1551271
URL: http://svn.apache.org/r1551271
Log:
rolled back to use JGlobus 2.0.6 version
Modified:
airavata/trunk/modules/distribution/airavata-server/pom.xml
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/gfac/gfac-core/pom.xml
airavata/trunk/modules/test-suite/pom.xml
airavata/trunk/pom.xml
airavata/trunk/tools/gsissh/pom.xml
Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1551271&r1=1551270&r2=1551271&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Mon Dec 16
17:19:25 2013
@@ -421,7 +421,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk16</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openjpa</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=1551271&r1=1551270&r2=1551271&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
Mon Dec 16 17:19:25 2013
@@ -253,7 +253,7 @@
<include>org.apache.openjpa:openjpa-all:jar</include>
<include>com.sun.jersey:jersey-client:jar</include>
<include>com.sun.jersey:jersey-core:jar</include>
- <include>org.bouncycastle:bcprov-jdk15on</include>
+ <include>org.bouncycastle:bcprov-jdk16</include>
<include>org.apache.tomcat:tomcat-jasper</include>
<include>org.apache.tomcat:tomcat-jasper-el</include>
<include>org.apache.tomcat:tomcat-jsp-api</include>
@@ -292,7 +292,7 @@
<include>org.ogce:bcgss</include>
<include>org.apache.xmlbeans:xmlbeans</include>
<include>org.apache.thrift:libthrift:jar:0.9.1</include>
- <!-- unicore start -->
+ <!-- unicore start
<include>eu.unicore:ogsabes-client</include>
<include>eu.unicore:ogsabes-types</include>
<include>de.fzj.unicore:jsdl-xmlbeans</include>
@@ -333,7 +333,7 @@
<include>org.apache.cxf:cxf-rt-transports-http</include>
<include>org.apache.cxf:cxf-rt-features-clustering</include>
<include>eu.unicore:uftp-core</include>
- <!-- unicore end-->
+ unicore end-->
</includes>
</dependencySet>
<dependencySet>
Modified: airavata/trunk/modules/gfac/gfac-core/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac/gfac-core/pom.xml?rev=1551271&r1=1551270&r2=1551271&view=diff
==============================================================================
--- airavata/trunk/modules/gfac/gfac-core/pom.xml (original)
+++ airavata/trunk/modules/gfac/gfac-core/pom.xml Mon Dec 16 17:19:25 2013
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk16</artifactId>
</dependency>
<dependency>
<groupId>org.jglobus</groupId>
@@ -250,6 +250,24 @@
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+
<goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>target/lib</outputDirectory>
+
<overWriteReleases>false</overWriteReleases>
+
<overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: airavata/trunk/modules/test-suite/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/pom.xml?rev=1551271&r1=1551270&r2=1551271&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/pom.xml (original)
+++ airavata/trunk/modules/test-suite/pom.xml Mon Dec 16 17:19:25 2013
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk16</artifactId>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
Modified: airavata/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1551271&r1=1551270&r2=1551271&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Mon Dec 16 17:19:25 2013
@@ -87,8 +87,8 @@
<cargo.version>1.3.1</cargo.version>
<oa4mp.version>1.0.6</oa4mp.version>
<antrun.version>1.6</antrun.version>
- <bouncy.castle.version>1.49</bouncy.castle.version>
- <jglobus.version>2.1-rc</jglobus.version>
+ <bouncy.castle.version>1.45</bouncy.castle.version>
+ <jglobus.version>2.0.6</jglobus.version>
<ebay.cors.filter>1.0.0</ebay.cors.filter>
<skipTests>false</skipTests>
</properties>
@@ -335,7 +335,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk16</artifactId>
<version>${bouncy.castle.version}</version>
</dependency>
</dependencies>
Modified: airavata/trunk/tools/gsissh/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/tools/gsissh/pom.xml?rev=1551271&r1=1551270&r2=1551271&view=diff
==============================================================================
--- airavata/trunk/tools/gsissh/pom.xml (original)
+++ airavata/trunk/tools/gsissh/pom.xml Mon Dec 16 17:19:25 2013
@@ -150,7 +150,7 @@
<properties>
- <jglobus.version>2.1-rc</jglobus.version>
+ <jglobus.version>2.0.6</jglobus.version>
<surefire.version>2.12</surefire.version>
<junit.version>4.7</junit.version>
<log4j.version>1.2.17</log4j.version>
