ODE-1060: Removed conflicting velocity jar from ODE war

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

Branch: refs/heads/master
Commit: 14f71d98bd6cff0c018817ab9afcc37f09cc8d9f
Parents: 4a71dec
Author: sathwik <[email protected]>
Authored: Wed Jun 28 18:07:32 2017 +0530
Committer: sathwik <[email protected]>
Committed: Wed Jun 28 18:07:32 2017 +0530

----------------------------------------------------------------------
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/14f71d98/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index dd09c9a..a516fed 100644
--- a/Rakefile
+++ b/Rakefile
@@ -706,7 +706,7 @@ define "ode" do
     tomee_libs = projects("tomee"), TOMEE, DERBY, DERBY_TOOLS, SLF4J, LOG4J2
 
     #liraries to be rmomved from ODE war
-    rm_libs = GERONIMO, JAVAX.transaction, JAVAX.connector, JAVAX.ejb, 
JAVAX.javamail, JAVAX.jms, JAVAX.persistence, JAVAX.resource, DERBY, 
DERBY_TOOLS, SLF4J, LOG4J2, OPENJPA, TRANQL
+    rm_libs = GERONIMO, JAVAX.transaction, JAVAX.connector, JAVAX.ejb, 
JAVAX.javamail, JAVAX.jms, JAVAX.persistence, JAVAX.resource, DERBY, 
DERBY_TOOLS, SLF4J, LOG4J2, OPENJPA, TRANQL, 
artifacts(AXIS2_MODULES.libs).keep_if {|a| a.group == 'velocity' && a.id == 
'velocity'}
 
     # extract ode war
     exploded_ode = unzip(_(:target, 'ode') => 
project("ode:axis2-war").package(:war)).target

Reply via email to