You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/03/06 06:18:15 UTC

git commit: log4j was added to dist through transitive dependencies earlier, however its not happening since we removed unwanted jars. so manually added the log4j jar to assembly https://issues.apache.org/jira/browse/AIRAVATA-1060

Repository: airavata
Updated Branches:
  refs/heads/master e581557ea -> bada8e4d2


log4j was added to dist through transitive dependencies earlier, however its not happening since we removed unwanted jars. so manually added the log4j jar to assembly https://issues.apache.org/jira/browse/AIRAVATA-1060


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bada8e4d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bada8e4d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bada8e4d

Branch: refs/heads/master
Commit: bada8e4d24aacb6e801da50680eca03c86b7b9fb
Parents: e581557
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Thu Mar 6 00:17:43 2014 -0500
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Thu Mar 6 00:17:43 2014 -0500

----------------------------------------------------------------------
 modules/distribution/airavata-server/pom.xml                     | 4 ++++
 .../airavata-server/src/main/assembly/bin-assembly.xml           | 1 +
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/bada8e4d/modules/distribution/airavata-server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/pom.xml b/modules/distribution/airavata-server/pom.xml
index 1c836a5..5cc29ea 100644
--- a/modules/distribution/airavata-server/pom.xml
+++ b/modules/distribution/airavata-server/pom.xml
@@ -248,6 +248,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
+	<dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/bada8e4d/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml b/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
index 4943e8e..69de5c5 100644
--- a/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
@@ -179,6 +179,7 @@
                 <include>org.slf4j:slf4j-api:jar</include>
                 <include>org.slf4j:slf4j-jcl:jar</include>
                 <include>org.slf4j:slf4j-log4j12:jar</include>
+                <include>log4j:log4j:jar</include>
                 <include>javax.jcr:jcr:jar</include>
                 <include>commons-collections:commons-collections</include>
                 <include>commons-configuration:commons-configuration</include>