freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [02/17] incubator-freemarker git commit: FREEMARKER-55: use servlet api 3.0, jsp-api 2.2, jsp-el 2.2 and spring 4.0.x
Date Thu, 06 Jul 2017 08:18:53 GMT
FREEMARKER-55: use servlet api 3.0, jsp-api 2.2, jsp-el 2.2 and spring 4.0.x


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/3c91ecb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/3c91ecb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/3c91ecb6

Branch: refs/heads/3
Commit: 3c91ecb65ac12973c05421ec6a265020cfccdc5b
Parents: 519680a
Author: Woonsan Ko <woonsan@apache.org>
Authored: Wed Jul 5 14:11:18 2017 -0400
Committer: Woonsan Ko <woonsan@apache.org>
Committed: Wed Jul 5 14:11:18 2017 -0400

----------------------------------------------------------------------
 freemarker-servlet/build.gradle | 9 +++++++--
 freemarker-spring/build.gradle  | 9 ++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3c91ecb6/freemarker-servlet/build.gradle
----------------------------------------------------------------------
diff --git a/freemarker-servlet/build.gradle b/freemarker-servlet/build.gradle
index 4e3bd2f..2f28100 100644
--- a/freemarker-servlet/build.gradle
+++ b/freemarker-servlet/build.gradle
@@ -28,8 +28,13 @@ inAggregateJavadoc = true
 dependencies {
     compile project(":freemarker-core")
 
-    compileOnly "javax.servlet.jsp:jsp-api:2.1"
-    compileOnly "javax.servlet:servlet-api:2.5"
+    def geronimoServletSpec3Version = "1.0"
+    def geronimoJspSpec22Version = "1.2"
+    def geronimoELSpec22Version = "1.0.4"
+
+    compileOnly "org.apache.geronimo.specs:geronimo-servlet_3.0_spec:${geronimoServletSpec3Version}"
+    compileOnly "org.apache.geronimo.specs:geronimo-jsp_2.2_spec:${geronimoJspSpec22Version}"
+    compileOnly "org.apache.geronimo.specs:geronimo-el_2.2_spec:${geronimoELSpec22Version}"
 
     // ------------------------------------------------------------------------
     // For tests

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3c91ecb6/freemarker-spring/build.gradle
----------------------------------------------------------------------
diff --git a/freemarker-spring/build.gradle b/freemarker-spring/build.gradle
index dce28d9..328e883 100644
--- a/freemarker-spring/build.gradle
+++ b/freemarker-spring/build.gradle
@@ -30,7 +30,10 @@ dependencies {
     compile project(":freemarker-servlet")
 
     def geronimoServletSpec3Version = "1.0"
-    def springVersion = "4.3.9.RELEASE"
+    def geronimoJspSpec22Version = "1.2"
+    def geronimoELSpec22Version = "1.0.4"
+
+    def springVersion = "4.0.9.RELEASE"
 
     compileOnly "org.apache.geronimo.specs:geronimo-servlet_3.0_spec:${geronimoServletSpec3Version}"
 
@@ -76,9 +79,9 @@ dependencies {
         exclude group: "commons-logging", module: "commons-logging"
     }
 
-    testCompile "javax.servlet.jsp:jsp-api:2.1"
+    testCompile "org.apache.geronimo.specs:geronimo-jsp_2.2_spec:${geronimoJspSpec22Version}"
+    testCompile "org.apache.geronimo.specs:geronimo-el_2.2_spec:${geronimoELSpec22Version}"
     testCompile "org.apache.taglibs:taglibs-standard-spec:${taglibsStandardVersion}"
-    testCompile "org.apache.taglibs:taglibs-standard-impl:${taglibsStandardVersion}"
 
 }
 


Mime
View raw message