Repository: airavata Updated Branches: refs/heads/master 042209406 -> 155c3c753
reverting changes done to distribution pom - 30aefc46bedcc06516d992a1b3da196f3bf21289 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/155c3c75 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/155c3c75 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/155c3c75 Branch: refs/heads/master Commit: 155c3c75326945f80e123701cac8af62aa0d1502 Parents: 0422094 Author: Chathuri Wimalasena <[email protected]> Authored: Mon Feb 16 16:45:39 2015 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Mon Feb 16 16:45:39 2015 -0500 ---------------------------------------------------------------------- modules/distribution/server/pom.xml | 110 +++++++++---------------------- 1 file changed, 30 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/155c3c75/modules/distribution/server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/server/pom.xml b/modules/distribution/server/pom.xml index 8dee07d..5f44c45 100644 --- a/modules/distribution/server/pom.xml +++ b/modules/distribution/server/pom.xml @@ -179,21 +179,11 @@ <artifactId>xpp5</artifactId> <version>${xpp5.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>xsul</artifactId> + <version>${xsul.version}</version> + </dependency> <dependency> <groupId>org.ogce</groupId> <artifactId>gpel-client</artifactId> @@ -204,17 +194,11 @@ <artifactId>jython</artifactId> <version>${jython.version}</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>com.amazonaws</groupId> + <artifactId>aws-java-sdk</artifactId> + <version>1.3.20</version> + </dependency> <dependency> <groupId>net.java.dev.jets3t</groupId> <artifactId>jets3t</artifactId> @@ -270,44 +254,16 @@ <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> - <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-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-orchestrator-stubs</artifactId> @@ -363,11 +319,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> @@ -524,17 +480,11 @@ <artifactId>jackson-core-asl</artifactId> <version>1.9.2</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>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + </dependency> <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId>
