Hi Shahbaz, Due to this commit airavata server gets stucked during launch the job. We need to revert it. Could you please have a look.
On Tue, Feb 10, 2015 at 10:23 AM, <[email protected]> wrote: > Repository: airavata > Updated Branches: > refs/heads/master 09876ee64 -> 30aefc46b > > > updated distribution pom for bes > > Project: http://git-wip-us.apache.org/repos/asf/airavata/repo > Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/30aefc46 > Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/30aefc46 > Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/30aefc46 > > Branch: refs/heads/master > Commit: 30aefc46bedcc06516d992a1b3da196f3bf21289 > Parents: 09876ee > Author: msmemon <[email protected]> > Authored: Tue Feb 10 16:22:15 2015 +0100 > Committer: msmemon <[email protected]> > Committed: Tue Feb 10 16:22:15 2015 +0100 > > ---------------------------------------------------------------------- > modules/distribution/server/pom.xml | 110 ++++++++++++++++++++++--------- > 1 file changed, 80 insertions(+), 30 deletions(-) > ---------------------------------------------------------------------- > > > > http://git-wip-us.apache.org/repos/asf/airavata/blob/30aefc46/modules/distribution/server/pom.xml > ---------------------------------------------------------------------- > diff --git a/modules/distribution/server/pom.xml > b/modules/distribution/server/pom.xml > index 5f44c45..8dee07d 100644 > --- a/modules/distribution/server/pom.xml > +++ b/modules/distribution/server/pom.xml > @@ -179,11 +179,21 @@ > <artifactId>xpp5</artifactId> > <version>${xpp5.version}</version> > </dependency> > - <dependency> > - <groupId>org.ogce</groupId> > - <artifactId>xsul</artifactId> > - <version>${xsul.version}</version> > - </dependency> > + <dependency> > + <groupId>org.ogce</groupId> > + <artifactId>xsul</artifactId> > + <version>${xsul.version}</version> > + <exclusions> > + <exclusion> > + <groupId>xml-apis</groupId> > + <artifactId>xml-apis</artifactId> > + </exclusion> > + <exclusion> > + <groupId>org.bouncycastle</groupId> > + > <artifactId>bcprov-jdk16</artifactId> > + </exclusion> > + </exclusions> > + </dependency> > <dependency> > <groupId>org.ogce</groupId> > <artifactId>gpel-client</artifactId> > @@ -194,11 +204,17 @@ > <artifactId>jython</artifactId> > <version>${jython.version}</version> > </dependency> > - <dependency> > - <groupId>com.amazonaws</groupId> > - <artifactId>aws-java-sdk</artifactId> > - <version>1.3.20</version> > - </dependency> > + <dependency> > + <groupId>com.amazonaws</groupId> > + <artifactId>aws-java-sdk</artifactId> > + <version>1.3.20</version> > + <exclusions> > + <exclusion> > + > <groupId>org.apache.httpcomponents</groupId> > + <artifactId>httpclient</artifactId> > + </exclusion> > + </exclusions> > + </dependency> > <dependency> > <groupId>net.java.dev.jets3t</groupId> > <artifactId>jets3t</artifactId> > @@ -254,16 +270,44 @@ > <artifactId>app-catalog-data</artifactId> > <version>${project.version}</version> > </dependency> > - <dependency> > - <groupId>org.apache.airavata</groupId> > - <artifactId>airavata-common-utils</artifactId> > - <version>${project.version}</version> > - </dependency> > - <dependency> > - <groupId>org.apache.airavata</groupId> > - <artifactId>airavata-orchestrator-service</artifactId> > - <version>${project.version}</version> > - </dependency> > + <dependency> > + <groupId>org.apache.airavata</groupId> > + <artifactId>airavata-common-utils</artifactId> > + <version>${project.version}</version> > + <exclusions> > + <exclusion> > + > <groupId>org.apache.ws.commons.schema</groupId> > + <artifactId>XmlSchema</artifactId> > + </exclusion> > + <exclusion> > + <groupId>xerces</groupId> > + > <artifactId>xmlParserAPIs</artifactId> > + </exclusion> > + <exclusion> > + > <groupId>org.apache.neethi</groupId> > + <artifactId>neethi</artifactId> > + </exclusion> > + </exclusions> > + </dependency> > + <dependency> > + <groupId>org.apache.airavata</groupId> > + > <artifactId>airavata-orchestrator-service</artifactId> > + <version>${project.version}</version> > + <exclusions> > + <exclusion> > + > <groupId>org.apache.ws.commons.schema</groupId> > + <artifactId>XmlSchema</artifactId> > + </exclusion> > + <exclusion> > + <groupId>xerces</groupId> > + > <artifactId>xmlParserAPIs</artifactId> > + </exclusion> > + <exclusion> > + > <groupId>org.apache.neethi</groupId> > + <artifactId>neethi</artifactId> > + </exclusion> > + </exclusions> > + </dependency> > <dependency> > <groupId>org.apache.airavata</groupId> > <artifactId>airavata-orchestrator-stubs</artifactId> > @@ -319,11 +363,11 @@ > <!--<artifactId>airavata-gfac-gram</artifactId>--> > <!--<version>${project.version}</version>--> > <!--</dependency>--> > - <!--<dependency>--> > - <!--<groupId>org.apache.airavata</groupId>--> > - <!--<artifactId>airavata-gfac-bes</artifactId>--> > - <!--<version>${project.version}</version>--> > - <!--</dependency>--> > + <dependency> > + <groupId>org.apache.airavata</groupId> > + <artifactId>airavata-gfac-bes</artifactId> > + <version>${project.version}</version> > + </dependency> > <dependency> > <groupId>org.apache.airavata</groupId> > <artifactId>airavata-gfac-gsissh</artifactId> > @@ -480,11 +524,17 @@ > <artifactId>jackson-core-asl</artifactId> > <version>1.9.2</version> > </dependency> > - <dependency> > - <groupId>xerces</groupId> > - <artifactId>xercesImpl</artifactId> > - <version>2.9.1</version> > - </dependency> > + <dependency> > + <groupId>xerces</groupId> > + <artifactId>xercesImpl</artifactId> > + <version>2.9.1</version> > + <exclusions> > + <exclusion> > + <groupId>xml-apis</groupId> > + <artifactId>xml-apis</artifactId> > + </exclusion> > + </exclusions> > + </dependency> > <dependency> > <groupId>com.ibm.icu</groupId> > <artifactId>icu4j</artifactId> > >
