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/10/27 18:26:26 UTC
svn commit: r1189843 - in /incubator/airavata/trunk: ./ modules/commons/
modules/commons/gfac-schema/ modules/commons/workflow-execution-context/
modules/commons/workflow-tracking/ modules/distribution/ modules/gfac-core/
modules/test-suite/ modules/ws...
Author: lahiru
Date: Thu Oct 27 16:26:26 2011
New Revision: 1189843
URL: http://svn.apache.org/viewvc?rev=1189843&view=rev
Log:
fixing build warnings.
Modified:
incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml
incubator/airavata/trunk/modules/commons/pom.xml
incubator/airavata/trunk/modules/commons/workflow-execution-context/pom.xml
incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml
incubator/airavata/trunk/modules/distribution/pom.xml
incubator/airavata/trunk/modules/gfac-core/pom.xml
incubator/airavata/trunk/modules/test-suite/pom.xml
incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml
incubator/airavata/trunk/modules/ws-messenger/messagebroker/pom.xml
incubator/airavata/trunk/modules/ws-messenger/pom.xml
incubator/airavata/trunk/modules/xbaya-gui/pom.xml
incubator/airavata/trunk/pom.xml
incubator/airavata/trunk/samples/simple-math-service/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=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml Thu Oct 27 16:26:26 2011
@@ -100,6 +100,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
<id>add-source</id>
@@ -132,7 +133,7 @@
<xmlConfigs>
<xmlConfig implementation="java.io.File">schemas/gfac-schemas.xsdconfig</xmlConfig>
</xmlConfigs>
- <outputJar>target/generated/${artifactId}-${version}.jar</outputJar>
+ <outputJar>target/generated/${project.artifactId}-${project.version}.jar</outputJar>
</configuration>
</plugin>
</plugins>
Modified: incubator/airavata/trunk/modules/commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/pom.xml?rev=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/pom.xml Thu Oct 27 16:26:26 2011
@@ -34,6 +34,7 @@
<configuration>
<skipTests>true</skipTests>
</configuration>
+ <version>${surefire.version}</version>
</plugin>
</plugins>
</build>
Modified: incubator/airavata/trunk/modules/commons/workflow-execution-context/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-execution-context/pom.xml?rev=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-execution-context/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/workflow-execution-context/pom.xml Thu Oct 27 16:26:26 2011
@@ -78,13 +78,14 @@
<xmlConfigs>
<xmlConfig implementation="java.io.File">src/main/resources/workflow_execution_context.xsdconfig</xmlConfig>
</xmlConfigs>
- <outputJar>target/generated/${artifactId}-${version}.jar</outputJar>
+ <outputJar>target/generated/${project.artifactId}-${project.version}.jar</outputJar>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
<id>add-source</id>
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=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml Thu Oct 27 16:26:26 2011
@@ -66,7 +66,7 @@
<inherited>true</inherited>
<configuration>
<schemaDirectory>schemas</schemaDirectory>
- <outputJar>target/airavata-workflowtrackingtypes-${pom.version}.jar</outputJar>
+ <outputJar>target/airavata-workflowtrackingtypes-${airavata.version}.jar</outputJar>
<xmlConfigs>
<xmlConfig implementation="java.io.File">schemas/workflow_tracking_types.xsdconfig</xmlConfig>
</xmlConfigs>
Modified: incubator/airavata/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/pom.xml?rev=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/pom.xml (original)
+++ incubator/airavata/trunk/modules/distribution/pom.xml Thu Oct 27 16:26:26 2011
@@ -54,7 +54,7 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>${archieve.name}-${version}</finalName>
+ <finalName>${archieve.name}-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/bin-assembly.xml</descriptor>
</descriptors>
@@ -112,10 +112,6 @@
<version>${jackrabbit.version}</version>
</dependency>
<dependency>
- <groupId>xsul</groupId>
- <artifactId>xsul</artifactId>
- </dependency>
- <dependency>
<groupId>xsul5-ogce</groupId>
<artifactId>xsul5-2007-02-27</artifactId>
<version>1</version>
@@ -207,11 +203,6 @@
</dependency>
<dependency>
<groupId>lead-security</groupId>
- <artifactId>cryptix32</artifactId>
- <version>versionless</version>
- </dependency>
- <dependency>
- <groupId>lead-security</groupId>
<artifactId>jce</artifactId>
<version>jdk13-131</version>
</dependency>
Modified: incubator/airavata/trunk/modules/gfac-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/pom.xml?rev=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/pom.xml (original)
+++ incubator/airavata/trunk/modules/gfac-core/pom.xml Thu Oct 27 16:26:26 2011
@@ -142,6 +142,7 @@
<configuration>
<workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
</configuration>
+ <version>${surefire.version}</version>
</plugin>
</plugins>
</build>
Modified: incubator/airavata/trunk/modules/test-suite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/pom.xml?rev=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/pom.xml (original)
+++ incubator/airavata/trunk/modules/test-suite/pom.xml Thu Oct 27 16:26:26 2011
@@ -148,6 +148,7 @@
<configuration>
<workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
</configuration>
+ <version>${surefire.version}</version>
</plugin>
</plugins>
</build>
Modified: incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml?rev=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml (original)
+++ incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml Thu Oct 27 16:26:26 2011
@@ -54,7 +54,7 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>${archieve.name}-${version}</finalName>
+ <finalName>${archieve.name}-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/bin-assembly.xml</descriptor>
</descriptors>
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/pom.xml?rev=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/pom.xml (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/pom.xml Thu Oct 27 16:26:26 2011
@@ -19,6 +19,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
<archive>
<manifest>
Modified: incubator/airavata/trunk/modules/ws-messenger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/pom.xml?rev=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/pom.xml (original)
+++ incubator/airavata/trunk/modules/ws-messenger/pom.xml Thu Oct 27 16:26:26 2011
@@ -120,6 +120,7 @@
<configuration>
<skipTests>false</skipTests>
</configuration>
+ <version>${surefire.version}</version>
</plugin>
</plugins>
@@ -198,6 +199,7 @@
<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/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/pom.xml Thu Oct 27 16:26:26 2011
@@ -81,6 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -89,6 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<executions>
<execution>
<id>copy-dependencies</id>
@@ -120,6 +122,7 @@
<plugin>
<groupId>org.codehaus.mojo.webstart</groupId>
<artifactId>webstart-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
<executions>
<execution>
<goals>
@@ -378,11 +381,6 @@
<artifactId>workflowtracking</artifactId>
<version>${airavata.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>common-utils</artifactId>
- <version>${airavata.version}</version>
- </dependency>
<!-- JCR Support -->
<!-- TODO need clean up -->
@@ -408,10 +406,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
Modified: incubator/airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/pom.xml?rev=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/pom.xml (original)
+++ incubator/airavata/trunk/pom.xml Thu Oct 27 16:26:26 2011
@@ -33,6 +33,7 @@
<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>
</properties>
<dependencyManagement>
Modified: incubator/airavata/trunk/samples/simple-math-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/samples/simple-math-service/pom.xml?rev=1189843&r1=1189842&r2=1189843&view=diff
==============================================================================
--- incubator/airavata/trunk/samples/simple-math-service/pom.xml (original)
+++ incubator/airavata/trunk/samples/simple-math-service/pom.xml Thu Oct 27 16:26:26 2011
@@ -45,6 +45,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>