Explorar el Código

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

Luke Taylor hace 15 años
padre
commit
07d8275ee6
Se han modificado 2 ficheros con 3 adiciones y 6 borrados
  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()
     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',

+ 2 - 5
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
 }
-*/