You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2016/09/24 10:23:29 UTC
[04/10] ode git commit: ODE-1060: Removed conflicting velocity jar
from ODE war
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/8e40c679
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/8e40c679
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/8e40c679
Branch: refs/heads/ode-1.3.x
Commit: 8e40c679d7d666837cbe99df1f7410fc68093616
Parents: bc2c1c6
Author: sathwik <sa...@apache.org>
Authored: Thu Aug 11 16:02:12 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Thu Aug 11 16:02:12 2016 +0530
----------------------------------------------------------------------
Rakefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/8e40c679/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index d8bcd21..5339577 100644
--- a/Rakefile
+++ b/Rakefile
@@ -707,7 +707,8 @@ 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