You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/09/08 19:50:20 UTC
svn commit: r1166826 - in /incubator/airavata/trunk: ./ modules/commons/
modules/commons/gfac-schema/ modules/commons/workflow-tracking/
modules/distribution/ modules/gfac-axis2-artifacts/ modules/gfac-axis2/
modules/gfac-core/ modules/workflow-interpr...
Author: lahiru
Date: Thu Sep 8 17:50:20 2011
New Revision: 1166826
URL: http://svn.apache.org/viewvc?rev=1166826&view=rev
Log:
cleaning up the pom files in the project.
Modified:
incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml
incubator/airavata/trunk/modules/commons/pom.xml
incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml
incubator/airavata/trunk/modules/distribution/pom.xml
incubator/airavata/trunk/modules/gfac-axis2-artifacts/pom.xml
incubator/airavata/trunk/modules/gfac-axis2/pom.xml
incubator/airavata/trunk/modules/gfac-core/pom.xml
incubator/airavata/trunk/modules/workflow-interpreter/pom.xml
incubator/airavata/trunk/modules/xbaya-gui/pom.xml
incubator/airavata/trunk/pom.xml
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml?rev=1166826&r1=1166825&r2=1166826&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml Thu Sep 8 17:50:20 2011
@@ -30,37 +30,30 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
- <version>2.5.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.3_7</version>
</dependency>
<dependency>
<groupId>xsul</groupId>
<artifactId>xsul</artifactId>
- <version>2.10.5_b</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -73,19 +66,15 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>2.2.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.11</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>2.2.7</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -158,4 +147,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/airavata/trunk/modules/commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/pom.xml?rev=1166826&r1=1166825&r2=1166826&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/pom.xml Thu Sep 8 17:50:20 2011
@@ -146,10 +146,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <airavata.version>0.0.1-SNAPSHOT</airavata.version>
- <release.version>1.1.1</release.version>
- <axis2.version>1.5.1</axis2.version>
- <derby.version>10.7.1.1</derby.version>
</properties>
</project>
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml?rev=1166826&r1=1166825&r2=1166826&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml Thu Sep 8 17:50:20 2011
@@ -95,8 +95,6 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
- <version>${axis2.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>airavata</groupId>
@@ -117,7 +115,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -148,7 +145,5 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <airavata.version>0.0.1-SNAPSHOT</airavata.version>
- <axis2.version>1.5.1</axis2.version>
</properties>
</project>
Modified: incubator/airavata/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/pom.xml?rev=1166826&r1=1166825&r2=1166826&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/pom.xml (original)
+++ incubator/airavata/trunk/modules/distribution/pom.xml Thu Sep 8 17:50:20 2011
@@ -89,11 +89,6 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-webdav</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-standalone</artifactId>
<version>${jackrabbit.version}</version>
</dependency>
@@ -120,7 +115,6 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
</dependency>
</dependencies>
Modified: incubator/airavata/trunk/modules/gfac-axis2-artifacts/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2-artifacts/pom.xml?rev=1166826&r1=1166825&r2=1166826&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2-artifacts/pom.xml (original)
+++ incubator/airavata/trunk/modules/gfac-axis2-artifacts/pom.xml Thu Sep 8 17:50:20 2011
@@ -25,16 +25,11 @@
<artifactId>airavata-axis2-artifacts</artifactId>
<name>GFac-Axis2-Artifacts</name>
<description>Axis2 Artifacts for Gfac funcationality</description>
- <properties>
- <log4j.version>1.2.16</log4j.version>
- <axis2.version>1.5.1</axis2.version>
- <axiom.version>1.2.8</axiom.version>
- </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
Modified: incubator/airavata/trunk/modules/gfac-axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/pom.xml?rev=1166826&r1=1166825&r2=1166826&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/pom.xml (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/pom.xml Thu Sep 8 17:50:20 2011
@@ -27,17 +27,10 @@
<description>Axis2 Interface to the GFac-Core</description>
- <properties>
- <org.slf4j.version>1.6.1</org.slf4j.version>
- <log4j.version>1.2.16</log4j.version>
- <axis2.version>1.5.1</axis2.version>
- <axiom.version>1.2.8</axiom.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
@@ -52,12 +45,11 @@
<dependency>
<groupId>airavata</groupId>
<artifactId>gfac-core</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>${airavata.version}</version>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
Modified: incubator/airavata/trunk/modules/gfac-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/pom.xml?rev=1166826&r1=1166825&r2=1166826&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/pom.xml (original)
+++ incubator/airavata/trunk/modules/gfac-core/pom.xml Thu Sep 8 17:50:20 2011
@@ -25,10 +25,6 @@
<artifactId>gfac-core</artifactId>
<name>GFac-Core</name>
<description>The core GFAC functionality independent from any webservice implementation. </description>
- <properties>
- <org.slf4j.version>1.6.1</org.slf4j.version>
- <log4j.version>1.2.16</log4j.version>
- </properties>
<dependencies>
@@ -63,21 +59,21 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${org.slf4j.version}</version>
+ <version>1.5.11</version>
</dependency>
<!-- GFAC schemas -->
<dependency>
<groupId>airavata</groupId>
<artifactId>airavata-gfac-schema-utils</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>${airavata.version}</version>
</dependency>
<!-- Workflow Tracking -->
<dependency>
<groupId>airavata</groupId>
<artifactId>airavata-workflowtracking</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>${airavata.version}</version>
</dependency>
<!-- Xregistry jars -->
@@ -111,26 +107,22 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
+ <!--using different slf4j version because plugin required 1.5.11-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${org.slf4j.version}</version>
+ <version>1.5.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>2.2.8</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>2.2.8</version>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/airavata/trunk/modules/workflow-interpreter/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/workflow-interpreter/pom.xml?rev=1166826&r1=1166825&r2=1166826&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/workflow-interpreter/pom.xml (original)
+++ incubator/airavata/trunk/modules/workflow-interpreter/pom.xml Thu Sep 8 17:50:20 2011
@@ -13,17 +13,19 @@
<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>
+ <artifactId>airavata</artifactId>
+ <groupId>airavata</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>airavata</groupId>
<artifactId>airavata-workflow.interpreter</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<name>Airavata Workflow Interpreter</name>
<url>http://incubator.apache.org/airavata</url>
- <properties>
- <axis2.version>1.5.4</axis2.version>
- <airavata.version>0.0.1-SNAPSHOT</airavata.version>
- </properties>
<dependencies>
<dependency>
Modified: incubator/airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1166826&r1=1166825&r2=1166826&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/pom.xml Thu Sep 8 17:50:20 2011
@@ -255,7 +255,6 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -270,7 +269,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
<dependency>
<groupId>lead-security</groupId>
@@ -420,7 +418,6 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -442,23 +439,20 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>2.2.7</version>
+ <version>${jackrabbit.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>2.2.7</version>
+ <version>${jackrabbit.version}</version>
</dependency>
</dependencies>
</project>
Modified: incubator/airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/pom.xml?rev=1166826&r1=1166825&r2=1166826&view=diff
==============================================================================
--- incubator/airavata/trunk/pom.xml (original)
+++ incubator/airavata/trunk/pom.xml Thu Sep 8 17:50:20 2011
@@ -12,7 +12,7 @@
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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>airavata</artifactId>
<groupId>airavata</groupId>
@@ -24,21 +24,97 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<airavata.version>0.0.1-SNAPSHOT</airavata.version>
- <axis2.version>1.5.1</axis2.version>
+ <axis2.version>1.5.1</axis2.version>
<derby.version>10.7.1.1</derby.version>
- <jackrabbit.version>2.2.7</jackrabbit.version>
- <slf4j.version>1.5.11</slf4j.version>
- <logback.version>0.9.20</logback.version>
+ <jackrabbit.version>2.2.7</jackrabbit.version>
+ <slf4j.version>1.5.11</slf4j.version>
+ <logback.version>0.9.20</logback.version>
+ <org.slf4j.version>1.6.1</org.slf4j.version>
+ <log4j.version>1.2.16</log4j.version>
+ <axiom.version>1.2.8</axiom.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.3_7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.11</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xsul</groupId>
+ <artifactId>xsul</artifactId>
+ <version>2.10.5_b</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-rmi</artifactId>
+ <version>${jackrabbit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<repositories>
<repository>
- <name>ogce.m2.all</name>
- <id>ogce.m2.all</id>
- <url>http://community.ucs.indiana.edu:9090/archiva/repository/ogce.m2.all</url>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
+ <name>ogce.m2.all</name>
+ <id>ogce.m2.all</id>
+ <url>http://community.ucs.indiana.edu:9090/archiva/repository/ogce.m2.all</url>
+ <snapshots>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ </repository>
<repository>
<id>m2-snapshot-repository</id>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
@@ -66,7 +142,7 @@
<name>Apache Yfilter repo</name>
<url>http://people.apache.org/~lahiru/maven-repo</url>
</repository>
- <repository>
+ <repository>
<id>OW2</id>
<name>OW2 Repository</name>
<url>http://maven.ow2.org/maven2</url>