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/10/21 05:09:16 UTC
svn commit: r1400563 - in /airavata/trunk: ./ modules/commons/gfac-schema/
modules/commons/provenance-registry/ modules/commons/utils/
modules/distribution/ modules/distribution/src/main/assembly/
modules/gfac-axis2/ modules/gfac-core/ modules/registry...
Author: smarru
Date: Sun Oct 21 03:09:16 2012
New Revision: 1400563
URL: http://svn.apache.org/viewvc?rev=1400563&view=rev
Log:
further cleaning of logging dependencies, the test cases could have used the sl4j-simple, but ensuring all of airavata modules use log4j and any appenders specified. Dropping in slf4j-jcl for routing any dependency logging based on jcl or commons-logging.
Modified:
airavata/trunk/modules/commons/gfac-schema/pom.xml
airavata/trunk/modules/commons/provenance-registry/pom.xml
airavata/trunk/modules/commons/utils/pom.xml
airavata/trunk/modules/distribution/pom.xml
airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/gfac-axis2/pom.xml
airavata/trunk/modules/gfac-core/pom.xml
airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml
airavata/trunk/modules/registry/registry-api/pom.xml
airavata/trunk/modules/test-suite/pom.xml
airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml
airavata/trunk/modules/xbaya-gui/pom.xml
airavata/trunk/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=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/commons/gfac-schema/pom.xml (original)
+++ airavata/trunk/modules/commons/gfac-schema/pom.xml Sun Oct 21 03:09:16 2012
@@ -49,11 +49,16 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: airavata/trunk/modules/commons/provenance-registry/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/provenance-registry/pom.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/commons/provenance-registry/pom.xml (original)
+++ airavata/trunk/modules/commons/provenance-registry/pom.xml Sun Oct 21 03:09:16 2012
@@ -49,11 +49,16 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
Modified: airavata/trunk/modules/commons/utils/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/pom.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/pom.xml (original)
+++ airavata/trunk/modules/commons/utils/pom.xml Sun Oct 21 03:09:16 2012
@@ -23,60 +23,65 @@
<name>Airavata Common Utilities</name>
<url>http://airavata.apache.org/</url>
- <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>${xmlbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3_7</version>
- </dependency>
- <dependency>
- <groupId>xpp5</groupId>
- <artifactId>xpp5</artifactId>
- <version>1.2.6</version>
- </dependency>
- <dependency>
- <groupId>xsul</groupId>
- <artifactId>xsul</artifactId>
- <version>2.10.5_b</version>
- </dependency>
- <dependency>
- <groupId>xsul5-ogce</groupId>
- <artifactId>xsul5-2007-02-27</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
- </dependency>
-
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>${xmlbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.3_7</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp5</groupId>
+ <artifactId>xpp5</artifactId>
+ <version>1.2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>xsul</groupId>
+ <artifactId>xsul</artifactId>
+ <version>2.10.5_b</version>
+ </dependency>
+ <dependency>
+ <groupId>xsul5-ogce</groupId>
+ <artifactId>xsul5-2007-02-27</artifactId>
+ <version>1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: airavata/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/pom.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/pom.xml (original)
+++ airavata/trunk/modules/distribution/pom.xml Sun Oct 21 03:09:16 2012
@@ -77,7 +77,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<id>distribution-package</id>
@@ -98,7 +97,6 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
<configuration>
<filesets>
<fileset>
@@ -109,270 +107,270 @@
</plugin>
</plugins>
</build>
- <dependencies>
-
- <!-- Derby Dependencies -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>xsul5-ogce</groupId>
- <artifactId>xsul5-2007-02-27</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>gpel</groupId>
- <artifactId>gpel_client</artifactId>
- <version>1.0.7-BETA</version>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>${jcr.version}</version>
- </dependency>
- <dependency>
- <groupId>xpp5</groupId>
- <artifactId>xpp5</artifactId>
- <version>1.2.6</version>
- </dependency>
- <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>lead-security</groupId>
- <artifactId>cryptix32</artifactId>
- <version>versionless</version>
- </dependency>
- <dependency>
- <groupId>lead-security</groupId>
- <artifactId>cryptix-asn1</artifactId>
- <version>versionless</version>
- </dependency>
- <dependency>
- <groupId>lead-security</groupId>
- <artifactId>puretls</artifactId>
- <version>0.9b4-1</version>
- </dependency>
- <dependency>
- <groupId>xutil</groupId>
- <artifactId>xutil</artifactId>
- <version>0.2</version>
- </dependency>
- <dependency>
- <groupId>jython</groupId>
- <artifactId>jython</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
- <groupId>cog-jglobus</groupId>
- <artifactId>cog-jglobus</artifactId>
- <version>1.8.0_1</version>
- </dependency>
- <!-- <dependency> <groupId>cog-jglobus</groupId> <artifactId>cog-jglobus</artifactId> <version>1.8.0-mod</version>
- </dependency> <dependency> <groupId>edu.iub.soic.damsl</groupId> <artifactId>jXSP</artifactId> <version>0.0.1-SNAPSHOT</version>
- </dependency> -->
- <dependency>
- <groupId>xsul</groupId>
- <artifactId>xsul</artifactId>
- <version>2.10.5_d</version>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.5.0</version>
- </dependency>
- <dependency>
- <groupId>xbaya</groupId>
- <artifactId>pegasuswebservice</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>1.3.20</version>
- </dependency>
- <dependency>
- <groupId>amazon</groupId>
- <artifactId>MapReduce.Service.Client</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <version>0.8.0</version>
- </dependency>
- <dependency>
- <groupId>ode-proxy</groupId>
- <artifactId>weps-beans</artifactId>
- <version>0.1</version>
- </dependency>
- <dependency>
- <groupId>atomixmiser</groupId>
- <artifactId>atomixmiser</artifactId>
- <version>0.9.4</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>globus</groupId>
- <artifactId>transfer-api-client</artifactId>
- <version>0.10</version>
- </dependency>
- <dependency>
- <groupId>edu.berkeley</groupId>
- <artifactId>yfilter</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messenger-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messenger-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-workflow-execution-context</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-workflow-tracking</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-schema-utils</artifactId>
- <version>${project.version}</version>
- </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-message-box</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-message-broker</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-workflow-model-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-xbaya-gui</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-axis2-interface</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-provenance-registry</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>1.45</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15</artifactId>
- <version>1.45</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
- <version>2.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-jpa-registry</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-service</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xsul5-ogce</groupId>
+ <artifactId>xsul5-2007-02-27</artifactId>
+ <version>1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>gpel</groupId>
+ <artifactId>gpel_client</artifactId>
+ <version>1.0.7-BETA</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>${jcr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp5</groupId>
+ <artifactId>xpp5</artifactId>
+ <version>1.2.6</version>
+ </dependency>
+ <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>lead-security</groupId>
+ <artifactId>cryptix32</artifactId>
+ <version>versionless</version>
+ </dependency>
+ <dependency>
+ <groupId>lead-security</groupId>
+ <artifactId>cryptix-asn1</artifactId>
+ <version>versionless</version>
+ </dependency>
+ <dependency>
+ <groupId>lead-security</groupId>
+ <artifactId>puretls</artifactId>
+ <version>0.9b4-1</version>
+ </dependency>
+ <dependency>
+ <groupId>xutil</groupId>
+ <artifactId>xutil</artifactId>
+ <version>0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jython</groupId>
+ <artifactId>jython</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>cog-jglobus</groupId>
+ <artifactId>cog-jglobus</artifactId>
+ <version>1.8.0_1</version>
+ </dependency>
+ <!-- <dependency> <groupId>cog-jglobus</groupId> <artifactId>cog-jglobus</artifactId>
+ <version>1.8.0-mod</version> </dependency> <dependency> <groupId>edu.iub.soic.damsl</groupId>
+ <artifactId>jXSP</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> -->
+ <dependency>
+ <groupId>xsul</groupId>
+ <artifactId>xsul</artifactId>
+ <version>2.10.5_d</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xbaya</groupId>
+ <artifactId>pegasuswebservice</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.3.20</version>
+ </dependency>
+ <dependency>
+ <groupId>amazon</groupId>
+ <artifactId>MapReduce.Service.Client</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ <version>0.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>ode-proxy</groupId>
+ <artifactId>weps-beans</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>atomixmiser</groupId>
+ <artifactId>atomixmiser</artifactId>
+ <version>0.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>globus</groupId>
+ <artifactId>transfer-api-client</artifactId>
+ <version>0.10</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.berkeley</groupId>
+ <artifactId>yfilter</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-messenger-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-messenger-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-registry-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-workflow-execution-context</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-workflow-tracking</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-gfac-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-gfac-schema-utils</artifactId>
+ <version>${project.version}</version>
+ </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-message-box</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-message-broker</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-workflow-model-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-xbaya-gui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-gfac-axis2-interface</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-provenance-registry</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>1.45</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcmail-jdk15</artifactId>
+ <version>1.45</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-jpa-registry</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-registry-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<archieve.name>apache-airavata</archieve.name>
Modified: airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Sun Oct 21 03:09:16 2012
@@ -248,9 +248,9 @@
<!--<include>org.apache.derby:derbynet:jar</include>-->
<include>org.apache.jackrabbit:jackrabbit-core:jar</include>
<include>org.apache.jackrabbit:jackrabbit-jcr-rmi:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
<include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:slf4j-simple:jar</include>
+ <include>org.slf4j:slf4j-jcl:jar</include>
+ <include>org.slf4j:slf4j-log4j12:jar</include>
<include>javax.jcr:jcr:jar</include>
<include>commons-collections:commons-collections</include>
<include>commons-configuration:commons-configuration</include>
Modified: airavata/trunk/modules/gfac-axis2/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/pom.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/pom.xml (original)
+++ airavata/trunk/modules/gfac-axis2/pom.xml Sun Oct 21 03:09:16 2012
@@ -59,7 +59,6 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
<executions>
<execution>
<id>restore-persistence</id>
Modified: airavata/trunk/modules/gfac-core/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/pom.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/pom.xml (original)
+++ airavata/trunk/modules/gfac-core/pom.xml Sun Oct 21 03:09:16 2012
@@ -118,11 +118,16 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>j2ssh</groupId>
<artifactId>j2ssh-core</artifactId>
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml Sun Oct 21 03:09:16 2012
@@ -44,11 +44,16 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
Modified: airavata/trunk/modules/registry/registry-api/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/pom.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/pom.xml (original)
+++ airavata/trunk/modules/registry/registry-api/pom.xml Sun Oct 21 03:09:16 2012
@@ -54,11 +54,16 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: airavata/trunk/modules/test-suite/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/pom.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/pom.xml (original)
+++ airavata/trunk/modules/test-suite/pom.xml Sun Oct 21 03:09:16 2012
@@ -114,11 +114,16 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml Sun Oct 21 03:09:16 2012
@@ -106,10 +106,6 @@
<version>1.3</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>lead-security</groupId>
<artifactId>cryptix32</artifactId>
<version>versionless</version>
Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Sun Oct 21 03:09:16 2012
@@ -206,11 +206,6 @@
<version>1.3</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
<groupId>lead-security</groupId>
<artifactId>cryptix32</artifactId>
<version>versionless</version>
@@ -366,18 +361,15 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${org.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>${org.slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1400563&r1=1400562&r2=1400563&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Sun Oct 21 03:09:16 2012
@@ -67,9 +67,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<axis2.version>1.5.1</axis2.version>
<derby.version>10.9.1.0</derby.version>
- <logback.version>0.9.20</logback.version>
- <org.slf4j.version>1.6.1</org.slf4j.version>
- <log4j.version>1.2.16</log4j.version>
+ <org.slf4j.version>1.7.2</org.slf4j.version>
<axiom.version>1.2.8</axiom.version>
<surefire.version>2.12</surefire.version>
<junit.version>4.7</junit.version>
@@ -262,31 +260,32 @@
</roles>
</developer>
</developers>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<repositories>
<repository>
<id>central</id>