tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkemn...@apache.org
Subject [2/2] tapestry-5 git commit: TAP5-2327: upgrade to servlet-api 3.0.1
Date Tue, 19 Apr 2016 10:50:23 GMT
TAP5-2327: upgrade to servlet-api 3.0.1


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/62f33e3d
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/62f33e3d
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/62f33e3d

Branch: refs/heads/master
Commit: 62f33e3dc8b93176b285eb6350ad239c15ef6ace
Parents: ae45a3b
Author: Jochen Kemnade <jkemnade@apache.org>
Authored: Tue Apr 19 12:47:56 2016 +0200
Committer: Jochen Kemnade <jkemnade@apache.org>
Committed: Tue Apr 19 12:47:56 2016 +0200

----------------------------------------------------------------------
 build.gradle                                         | 14 +-------------
 quickstart/filtered/archetype-resources/build.gradle |  2 +-
 tapestry-clojure/build.gradle                        |  2 +-
 tapestry-core/build.gradle                           |  2 +-
 tapestry-kaptcha/build.gradle                        |  2 +-
 tapestry-spring/build.gradle                         |  2 +-
 tapestry-upload/build.gradle                         |  2 +-
 7 files changed, 7 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/62f33e3d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 39dc38f..a993ee4 100755
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ project.ext.versions = [
     tomcat: "6.0.30",
     testng: "6.8.21",
     easymock: "3.3.1",
-    servletapi: "2.5",
+    servletapi: "3.0.1",
     spock: "1.0-groovy-2.4",
     hibernate: "4.3.6.Final",
     slf4j: "1.7.21",
@@ -301,9 +301,6 @@ subprojects.each { project.evaluationDependsOn(it.name) }
 
 subprojects {
 
-    // Prefer this version, because it has source artifacts available.
-    def servletAPI = 'org.mortbay.jetty:servlet-api-2.5:6.1.11'
-
     configurations.all {
 
         resolutionStrategy.force "antlr:antlr:2.7.7",
@@ -319,15 +316,6 @@ subprojects {
             "org.yaml:snakeyaml:1.8",
             "xml-apis:xml-apis:1.4.01"
 
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-
-
-            if (details.requested.name.startsWith("servlet-api")) {
-                logger.info "Overriding dependency ${details.requested.group}:${details.requested.name}:${details.requested.version}
--> $servletAPI"
-                details.useTarget servletAPI
-            }
-
-        }
     }
 }
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/62f33e3d/quickstart/filtered/archetype-resources/build.gradle
----------------------------------------------------------------------
diff --git a/quickstart/filtered/archetype-resources/build.gradle b/quickstart/filtered/archetype-resources/build.gradle
index 44ff71a..fd13b62 100644
--- a/quickstart/filtered/archetype-resources/build.gradle
+++ b/quickstart/filtered/archetype-resources/build.gradle
@@ -68,7 +68,7 @@ dependencies {
     // Logback
     // runtime "ch.qos.logback:logback-classic:1.0.13"
 
-    provided "javax.servlet:servlet-api:@servletApiReleaseVersion@"
+    provided "javax.servlet:javax.servlet-api:@servletApiReleaseVersion@"
 }
 
 test {

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/62f33e3d/tapestry-clojure/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-clojure/build.gradle b/tapestry-clojure/build.gradle
index 934fe02..38db04e 100644
--- a/tapestry-clojure/build.gradle
+++ b/tapestry-clojure/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
   // Added just to prove that it works (TAP5-1945)
   testCompile project(':tapestry-core')
-  testRuntime "javax.servlet:servlet-api:${versions.servletapi}"
+  testRuntime "javax.servlet:javax.servlet-api:${versions.servletapi}"
 }
 
 test {

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/62f33e3d/tapestry-core/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index 12b1c60..e0f8d8d 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     provided project(":tapestry-test")
     provided project(":tapestry-test-constants")
 
-    provided "javax.servlet:servlet-api:${versions.servletapi}"
+    provided "javax.servlet:javax.servlet-api:${versions.servletapi}"
 
     compile "commons-codec:commons-codec:1.10"
 

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/62f33e3d/tapestry-kaptcha/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-kaptcha/build.gradle b/tapestry-kaptcha/build.gradle
index 83d3d72..2594d6a 100644
--- a/tapestry-kaptcha/build.gradle
+++ b/tapestry-kaptcha/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compile "com.github.axet:kaptcha:0.0.8"
 
-    provided "javax.servlet:servlet-api:${versions.servletapi}"
+    provided "javax.servlet:javax.servlet-api:${versions.servletapi}"
 
     testCompile project(':tapestry-test')
 }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/62f33e3d/tapestry-spring/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-spring/build.gradle b/tapestry-spring/build.gradle
index 3c928ef..6f56966 100644
--- a/tapestry-spring/build.gradle
+++ b/tapestry-spring/build.gradle
@@ -4,7 +4,7 @@ dependencies {
   compile project(':tapestry-core')
   compile "org.springframework:spring-web:3.1.0.RELEASE"
 
-  provided "javax.servlet:servlet-api:${versions.servletapi}"
+  provided "javax.servlet:javax.servlet-api:${versions.servletapi}"
 
   testCompile project(':tapestry-test')
 }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/62f33e3d/tapestry-upload/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-upload/build.gradle b/tapestry-upload/build.gradle
index c3bf18b..b0ab8ec 100644
--- a/tapestry-upload/build.gradle
+++ b/tapestry-upload/build.gradle
@@ -4,7 +4,7 @@ dependencies {
   compile project(':tapestry-core')
   compile "commons-fileupload:commons-fileupload:1.3.1"
   compile "commons-io:commons-io:2.4"
-  provided "javax.servlet:servlet-api:${versions.servletapi}"
+  provided "javax.servlet:javax.servlet-api:${versions.servletapi}"
 
   testCompile project(':tapestry-test')
 }


Mime
View raw message