From 07d8275ee6d1b71fbe41635457947de6379e91b9 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sun, 22 Aug 2010 22:31:01 +0100 Subject: [PATCH] Modify order of saxon and xerces deps in dependency list to prevent Aelfred parser from being used in build. --- buildSrc/build.gradle | 2 +- samples/cas/cas.gradle | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 51c5a3999b..ac78628d27 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -20,8 +20,8 @@ dependencies { groovy localGroovy() compile gradleApi(), 'org.apache.xerces:resolver:2.9.1', - 'saxon:saxon:6.5.3', 'org.apache.xerces:xercesImpl:2.9.1', + 'saxon:saxon:6.5.3', fopDeps runtime 'net.sf.xslthl:xslthl:2.0.1', diff --git a/samples/cas/cas.gradle b/samples/cas/cas.gradle index 713fbb9f6d..a1dbe15216 100644 --- a/samples/cas/cas.gradle +++ b/samples/cas/cas.gradle @@ -3,14 +3,12 @@ apply plugin: 'war' apply plugin: 'jetty' -/* configurations { casServer } -*/ dependencies { -// casServer "org.jasig.cas:cas-server-webapp:3.4.2.1@war" + casServer "org.jasig.cas:cas-server-webapp:3.4.2.1@war" runtime project(':spring-security-web'), project(':spring-security-cas'), @@ -35,7 +33,7 @@ jettyRun { connectors = [httpConnector, httpsConnector] } -/* + task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar) { contextPath = "/cas" connectors = [new org.mortbay.jetty.security.SslSocketConnector()] @@ -55,4 +53,3 @@ task cas (dependsOn: jettyRun) { jettyRun.dependsOn(casServer) casServer.daemon = true } -*/ \ No newline at end of file