Browse Source

Modify order of saxon and xerces deps in dependency list to prevent Aelfred parser from being used in build.

Luke Taylor 15 years ago
parent
commit
07d8275ee6
2 changed files with 3 additions and 6 deletions
  1. 1 1
      buildSrc/build.gradle
  2. 2 5
      samples/cas/cas.gradle

+ 1 - 1
buildSrc/build.gradle

@@ -20,8 +20,8 @@ dependencies {
     groovy localGroovy()
     groovy localGroovy()
     compile gradleApi(),
     compile gradleApi(),
             'org.apache.xerces:resolver:2.9.1',
             'org.apache.xerces:resolver:2.9.1',
-            'saxon:saxon:6.5.3',
             'org.apache.xerces:xercesImpl:2.9.1',
             'org.apache.xerces:xercesImpl:2.9.1',
+            'saxon:saxon:6.5.3',
             fopDeps
             fopDeps
 
 
     runtime 'net.sf.xslthl:xslthl:2.0.1',
     runtime 'net.sf.xslthl:xslthl:2.0.1',

+ 2 - 5
samples/cas/cas.gradle

@@ -3,14 +3,12 @@
 apply plugin: 'war'
 apply plugin: 'war'
 apply plugin: 'jetty'
 apply plugin: 'jetty'
 
 
-/*
 configurations {
 configurations {
     casServer
     casServer
 }
 }
-*/
 
 
 dependencies {
 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'),
     runtime project(':spring-security-web'),
             project(':spring-security-cas'),
             project(':spring-security-cas'),
@@ -35,7 +33,7 @@ jettyRun {
     connectors = [httpConnector, httpsConnector]
     connectors = [httpConnector, httpsConnector]
 }
 }
 
 
-/*
+
 task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar) {
 task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar) {
     contextPath = "/cas"
     contextPath = "/cas"
     connectors = [new org.mortbay.jetty.security.SslSocketConnector()]
     connectors = [new org.mortbay.jetty.security.SslSocketConnector()]
@@ -55,4 +53,3 @@ task cas (dependsOn: jettyRun) {
     jettyRun.dependsOn(casServer)
     jettyRun.dependsOn(casServer)
     casServer.daemon = true
     casServer.daemon = true
 }
 }
-*/