cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [8/9] git commit: updated refs/heads/master to bee2bdc
Date Wed, 11 May 2016 06:04:24 GMT
maven: Fix jstl version usage

This would fix regression from recent mvn version changes. Without this
patch users get redirected to error.jsp as jstl-1.2 jar is not installed

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/master
Commit: 003b97bcffe640e38d089c98e8215de4c8a805e6
Parents: afcbd27
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Wed May 4 15:28:12 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed May 11 09:58:27 2016 +0530

----------------------------------------------------------------------
 pom.xml        | 3 ++-
 server/pom.xml | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/003b97bc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 30e96a6..b75afd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,8 @@
     <cs.axiom.version>1.2.8</cs.axiom.version>
     <cs.neethi.version>2.0.4</cs.neethi.version>
     <cs.servlet.version>2.5</cs.servlet.version>
-    <cs.jstl.version>1.2.1</cs.jstl.version>
+    <cs.jstl.version>1.2</cs.jstl.version>
+    <cs.jstl-api.version>1.2.1</cs.jstl-api.version>
     <cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
     <cs.vmware.api.version>6.0</cs.vmware.api.version>
     <org.springframework.version>3.2.16.RELEASE</org.springframework.version>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/003b97bc/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 8461d18..3269509 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -70,9 +70,14 @@
       <artifactId>mail</artifactId>
     </dependency>
     <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+      <version>${cs.jstl.version}</version>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet.jsp.jstl</groupId>
       <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-      <version>${cs.jstl.version}</version>
+      <version>${cs.jstl-api.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>


Mime
View raw message