You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/27 16:13:23 UTC
[1/2] incubator-trafodion git commit: JAR conflict for Jasper
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 7862d94cc -> 5337acf49
JAR conflict for Jasper
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/437e745a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/437e745a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/437e745a
Branch: refs/heads/master
Commit: 437e745aa29f77b0b0d9d0fc7a1960ceca804010
Parents: 283190e
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Wed May 25 17:54:37 2016 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Wed May 25 17:54:37 2016 +0800
----------------------------------------------------------------------
dcs/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/437e745a/dcs/pom.xml
----------------------------------------------------------------------
diff --git a/dcs/pom.xml b/dcs/pom.xml
index a1de49b..5782772 100644
--- a/dcs/pom.xml
+++ b/dcs/pom.xml
@@ -593,6 +593,14 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jasper-compiler</artifactId>
+ <groupId>tomcat</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jasper-runtime</artifactId>
+ <groupId>tomcat</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2014] PR 501
Fix Jar conflict issue
Posted by db...@apache.org.
Merge [TRAFODION-2014] PR 501 Fix Jar conflict issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5337acf4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5337acf4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5337acf4
Branch: refs/heads/master
Commit: 5337acf49485a0a62e6f3bc508ac65b4121c6f42
Parents: 7862d94 437e745
Author: Dave Birdsall <db...@apache.org>
Authored: Fri May 27 16:12:50 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri May 27 16:12:50 2016 +0000
----------------------------------------------------------------------
dcs/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5337acf4/dcs/pom.xml
----------------------------------------------------------------------