You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2013/08/16 15:14:19 UTC
svn commit: r1514696 - in /airavata/trunk/modules:
commons/gfac-schema/pom.xml commons/workflow-execution-context/pom.xml
distribution/xbaya-gui/pom.xml
distribution/xbaya-gui/src/main/assembly/bin-assembly.xml xbaya-gui/pom.xml
Author: smarru
Date: Fri Aug 16 13:14:19 2013
New Revision: 1514696
URL: http://svn.apache.org/r1514696
Log:
updating xpp3 dependencies to maven central jars
Modified:
airavata/trunk/modules/commons/gfac-schema/pom.xml
airavata/trunk/modules/commons/workflow-execution-context/pom.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
Modified: airavata/trunk/modules/commons/gfac-schema/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/pom.xml?rev=1514696&r1=1514695&r2=1514696&view=diff
==============================================================================
--- airavata/trunk/modules/commons/gfac-schema/pom.xml (original)
+++ airavata/trunk/modules/commons/gfac-schema/pom.xml Fri Aug 16 13:14:19 2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.airavata</groupId>
@@ -35,9 +36,9 @@
<version>1.6.2</version>
</dependency>
<dependency>
- <groupId>xpp3</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.4c</version>
+ <version>1.1.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: airavata/trunk/modules/commons/workflow-execution-context/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-execution-context/pom.xml?rev=1514696&r1=1514695&r2=1514696&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-execution-context/pom.xml (original)
+++ airavata/trunk/modules/commons/workflow-execution-context/pom.xml Fri Aug 16 13:14:19 2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.airavata</groupId>
@@ -30,9 +31,9 @@
<version>${xmlbeans.version}</version>
</dependency>
<dependency>
- <groupId>xpp3</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.4c</version>
+ <version>1.1.5</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
Modified: airavata/trunk/modules/distribution/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/pom.xml?rev=1514696&r1=1514695&r2=1514696&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/pom.xml Fri Aug 16 13:14:19 2013
@@ -216,24 +216,9 @@
<dependencies>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_xpath</artifactId>
- <version>1.1.4c</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.4c</version>
- </dependency>
- <dependency>
- <groupId>xpp5</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xpp5</artifactId>
- <version>1.2.6</version>
- </dependency>
- <dependency>
- <groupId>xpp5</groupId>
- <artifactId>xpp5_xpath</artifactId>
- <version>1.2.6</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.ogce</groupId>
@@ -246,6 +231,11 @@
<version>1.0.8</version>
</dependency>
<dependency>
+ <groupId>org.ogce</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.5</version>
+ </dependency>
+ <dependency>
<groupId>atomixmiser</groupId>
<artifactId>atomixmiser</artifactId>
<version>0.9.4</version>
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=1514696&r1=1514695&r2=1514696&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 Fri Aug 16 13:14:19 2013
@@ -1,13 +1,10 @@
-<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (theà "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY ~ KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
<!DOCTYPE assembly [
<!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
@@ -26,54 +23,54 @@
<!ELEMENT dependencySet (outputDirectory|includes)*>
]>
<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${archieve.name}-${version}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <!-- ********************** copy release notes files ********************** -->
- <fileSet>
- <directory>../../../</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <!-- ********************** copy licenses, readme etc. ********************** -->
- <fileSet>
- <directory>src/main/resources/</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>README</include>
- <include>INSTALL</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../../xbaya-gui/src/test/resources/</directory>
- <outputDirectory>samples/workflows</outputDirectory>
- <includes>
- <include>*.xwf</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../../samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/conf</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
+ <id>bin</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${archieve.name}-${version}</baseDirectory>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- ********************** copy release notes files ********************** -->
+ <fileSet>
+ <directory>../../../</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+ <!-- ********************** copy licenses, readme etc. ********************** -->
+ <fileSet>
+ <directory>src/main/resources/</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
+ <include>INSTALL</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../../xbaya-gui/src/test/resources/</directory>
+ <outputDirectory>samples/workflows</outputDirectory>
+ <includes>
+ <include>*.xwf</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../../samples</directory>
+ <outputDirectory>samples</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/conf</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
@@ -81,60 +78,59 @@
<include>**/*</include>
</includes>
</fileSet>
- </fileSets>
+ </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.derby:derby:jar</include>
- <include>org.apache.derby:derbytools:jar</include>
- <include>org.apache.derby:derbynet:jar</include>
- <include>org.apache.derby:derbyclient:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.apache.derby:derby:jar</include>
+ <include>org.apache.derby:derbytools:jar</include>
+ <include>org.apache.derby:derbynet:jar</include>
+ <include>org.apache.derby:derbyclient:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
<include>javax.jcr:jcr:jar</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-configuration:commons-configuration</include>
- <include>commons-lang:commons-lang</include>
- <include>xpp3:xpp3</include>
- <include>gpel:gpel_client</include>
- <include>xpp5:xpp5</include>
- <include>xpp3:xpp3_xpath</include>
- <include>org.ogce:xsul:jar</include>
- <include>org.ogce:xsul5:jar</include>
- <include>jython:jython</include>
- <include>org.apache.xmlbeans:xmlbeans</include>
- <include>com.amazonaws:aws-java-sdk</include>
- <include>amazon:MapReduce.Service.Client</include>
- <include>net.java.dev.jets3t:jets3t</include>
- <include>atomixmiser:atomixmiser</include>
- <include>globus:transfer-api-client</include>
- <include>org.apache.airavata:airavata-registry-api</include>
- <include>org.apache.airavata:airavata-workflow-execution-context</include>
- <include>org.apache.airavata:airavata-workflow-tracking</include>
- <include>org.apache.airavata:airavata-gfac-core</include>
- <include>org.apache.airavata:airavata-messenger-client</include>
- <include>org.apache.airavata:airavata-messenger-commons</include>
- <include>org.apache.airavata:airavata-gfac-schema-utils</include>
- <include>org.apache.airavata:airavata-common-utils</include>
- <include>org.apache.airavata:airavata-workflow-model-core:jar</include>
- <include>org.apache.airavata:airavata-workflow-model-component:jar</include>
- <include>org.apache.airavata:airavata-message-monitor:jar</include>
- <include>org.apache.airavata:airavata-client-api:jar</include>
- <include>org.apache.airavata:airavata-jpa-registry:jar</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-configuration:commons-configuration</include>
+ <include>commons-lang:commons-lang</include>
+ <include>org.ogce:xpp3:jar</include>
+ <include>org.ogce:gpel-client:jar</include>
+ <include>org.ogce:xpp5:jar</include>
+ <include>org.ogce:xsul:jar</include>
+ <include>org.ogce:xsul5:jar</include>
+ <include>jython:jython</include>
+ <include>org.apache.xmlbeans:xmlbeans</include>
+ <include>com.amazonaws:aws-java-sdk</include>
+ <include>amazon:MapReduce.Service.Client</include>
+ <include>net.java.dev.jets3t:jets3t</include>
+ <include>atomixmiser:atomixmiser</include>
+ <include>globus:transfer-api-client</include>
+ <include>org.apache.airavata:airavata-registry-api</include>
+ <include>org.apache.airavata:airavata-workflow-execution-context</include>
+ <include>org.apache.airavata:airavata-workflow-tracking</include>
+ <include>org.apache.airavata:airavata-gfac-core</include>
+ <include>org.apache.airavata:airavata-messenger-client</include>
+ <include>org.apache.airavata:airavata-messenger-commons</include>
+ <include>org.apache.airavata:airavata-gfac-schema-utils</include>
+ <include>org.apache.airavata:airavata-common-utils</include>
+ <include>org.apache.airavata:airavata-workflow-model-core:jar</include>
+ <include>org.apache.airavata:airavata-workflow-model-component:jar</include>
+ <include>org.apache.airavata:airavata-message-monitor:jar</include>
+ <include>org.apache.airavata:airavata-client-api:jar</include>
+ <include>org.apache.airavata:airavata-jpa-registry:jar</include>
<include>org.apache.airavata:airavata-rest-mappings:jar</include>
<include>org.apache.airavata:airavata-rest-client:jar</include>
<include>org.apache.airavata:airavata-xbaya-gui</include>
- <include>org.apache.openjpa:openjpa-all:jar</include>
+ <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>com.sun.jersey:jersey-json</include>
- <include>edu.berkeley:yfilter</include>
+ <include>edu.berkeley:yfilter</include>
<include>org.codehaus.jackson:jackson-jaxrs</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
<include>org.codehaus.jackson:jackson-mapper-asl</include>
@@ -154,12 +150,12 @@
<include>org.apache.axis2:axis2-transport-http:jar</include>
<include>javax.mail:mail:jar</include>
<include>org.apache.woden:woden-api:jar</include>
- <!--<include>org.apache.httpcomponents:httpcore:jar</include>-->
+ <!--<include>org.apache.httpcomponents:httpcore:jar</include> -->
<include>org.apache.axis2:axis2-adb:jar</include>
<include>com.google.guava:guava</include>
<include>org.apache.httpcomponents:httpcore:jar:4.1</include>
<include>org.apache.httpcomponents:httpclient:jar:4.1</include>
- </includes>
- </dependencySet>
- </dependencySets>
+ </includes>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1514696&r1=1514695&r2=1514696&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Fri Aug 16 13:14:19 2013
@@ -81,14 +81,9 @@
<dependencies>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_xpath</artifactId>
- <version>1.1.4c</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.4c</version>
+ <version>1.1.5</version>
</dependency>
<dependency>
<groupId>org.ogce</groupId>