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 2012/05/13 20:48:09 UTC
svn commit: r1337963 - in /incubator/airavata/trunk: ./
modules/airavata-client/ modules/commons/workflow-tracking/
modules/distribution/ modules/distribution/src/main/assembly/
modules/gfac-core/ modules/ws-messenger/
Author: smarru
Date: Sun May 13 18:48:08 2012
New Revision: 1337963
URL: http://svn.apache.org/viewvc?rev=1337963&view=rev
Log:
Updating module pom's so all skipTests flag is read from parent pom. test-suite is an exception. Also disabling ws-messenger distribution from default built as the parent distribution includes messaging components.
Modified:
incubator/airavata/trunk/modules/airavata-client/pom.xml
incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml
incubator/airavata/trunk/modules/distribution/pom.xml
incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
incubator/airavata/trunk/modules/gfac-core/pom.xml
incubator/airavata/trunk/modules/ws-messenger/pom.xml
incubator/airavata/trunk/pom.xml
Modified: incubator/airavata/trunk/modules/airavata-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/pom.xml?rev=1337963&r1=1337962&r2=1337963&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/pom.xml (original)
+++ incubator/airavata/trunk/modules/airavata-client/pom.xml Sun May 13 18:48:08 2012
@@ -45,19 +45,4 @@
</dependency>
</dependencies>
- <build>
-
- <plugins>
- <!-- Set working directory to test-class directory -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
- </configuration>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
</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=1337963&r1=1337962&r2=1337963&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml Sun May 13 18:48:08 2012
@@ -67,14 +67,6 @@
</xmlConfigs>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- </plugin>
-
</plugins>
</build>
Modified: incubator/airavata/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/pom.xml?rev=1337963&r1=1337962&r2=1337963&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/pom.xml (original)
+++ incubator/airavata/trunk/modules/distribution/pom.xml Sun May 13 18:48:08 2012
@@ -54,6 +54,7 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
+ <version>1.4</version>
<executions>
<execution>
<id>generate-timestamp</id>
Modified: incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1337963&r1=1337962&r2=1337963&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Sun May 13 18:48:08 2012
@@ -39,6 +39,9 @@
<includes>
<include>*.jar</include>
</includes>
+ <excludes>
+ <exclude>xom*.jar</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>target/axis2-${used.axis2.release}/WEB-INF/</directory>
@@ -129,7 +132,7 @@
<include>*sql*</include>
</includes>
</fileSet>
-
+
<fileSet>
<directory>src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
@@ -233,7 +236,7 @@
<include>xutil:xutil</include>
<include>jython:jython</include>
<include>cog-jglobus:cog-jglobus</include>
- <!--include>edu.iub.soic.damsl:jXSP</include> -->
+ <!--include>edu.iub.soic.damsl:jXSP</include> -->
<include>xmlbeans:xbean</include>
<include>xmlbeans-ogce:jsr173_api</include>
<include>xbaya:pegasuswebservice</include>
Modified: incubator/airavata/trunk/modules/gfac-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/pom.xml?rev=1337963&r1=1337962&r2=1337963&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/pom.xml (original)
+++ incubator/airavata/trunk/modules/gfac-core/pom.xml Sun May 13 18:48:08 2012
@@ -153,17 +153,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <!-- Set working directory to test-class directory -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
- </configuration>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
</project>
Modified: incubator/airavata/trunk/modules/ws-messenger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/pom.xml?rev=1337963&r1=1337962&r2=1337963&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/pom.xml (original)
+++ incubator/airavata/trunk/modules/ws-messenger/pom.xml Sun May 13 18:48:08 2012
@@ -86,18 +86,7 @@
</dependencies>
</dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
+
<profiles>
<profile>
<id>profile-messenger-client</id>
@@ -160,7 +149,7 @@
<module>client</module>
<module>messagebox</module>
<module>messagebroker</module>
- <module>distribution</module>
+ <!-- <module>distribution</module> -->
</modules>
</profile>
</profiles>
@@ -171,7 +160,6 @@
<release.version>1.1.1</release.version>
<axis2.version>1.5.1</axis2.version>
<derby.version>10.7.1.1</derby.version>
- <surefire.version>2.10</surefire.version>
</properties>
</project>
Modified: incubator/airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/pom.xml?rev=1337963&r1=1337962&r2=1337963&view=diff
==============================================================================
--- incubator/airavata/trunk/pom.xml (original)
+++ incubator/airavata/trunk/pom.xml Sun May 13 18:48:08 2012
@@ -63,10 +63,11 @@
<org.slf4j.version>1.6.1</org.slf4j.version>
<log4j.version>1.2.16</log4j.version>
<axiom.version>1.2.8</axiom.version>
- <surefire.version>2.10</surefire.version>
+ <surefire.version>2.12</surefire.version>
<jcr.version>2.0</jcr.version>
<xmlbeans.version>2.5.0</xmlbeans.version>
<xpp3.version>1.1.3_7</xpp3.version>
+ <skipTests>false</skipTests>
</properties>
<developers>
@@ -265,7 +266,7 @@
<role>IPMC member</role>
</roles>
</developer>
- <developer>
+ <developer>
<id>saminda</id>
<name>Saminda Wijeratne</name>
<email>samindaw@apache.org</email>
@@ -546,6 +547,15 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
+ </configuration>
+ </plugin>
</plugins>
</build>
<activation>