Index: ssts-web/build.gradle =================================================================== diff -u -r12331 -r12335 --- ssts-web/build.gradle (.../build.gradle) (revision 12331) +++ ssts-web/build.gradle (.../build.gradle) (revision 12335) @@ -35,38 +35,7 @@ ext.webAppClassesDir = "../ssts-web/src/main/webapp/WEB-INF/classes" -compileJava { - - options.fork = true - options.forkOptions.executable = "javac" // *****umes that javac is on path - options.compilerArgs << "-XDignore.symbol.file" - options.compilerArgs << "-Xlint:-deprecation" - options.compilerArgs << "-Xlint:-unchecked" - - - doLast{ - ant.taskdef( resource:"org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties", classpath: configurations.ajc.asPath) - ant.iajc( - source:sourceCompatibility, - target:targetCompatibility, - encoding : encoding, - destDir:sourceSets.main.output.classesDir.absolutePath, - maxmem: "512m", - fork: "true", - inpath: configurations.ajInpath.asPath, - aspectPath:configurations.aspects.asPath, - sourceRootCopyFilter:"**/.svn/*,**/*.java", - classpath:"${configurations.compile.asPath};${configurations.aspectCompile.asPath}"){ - sourceroots{ - sourceSets.main.java.srcDirs.each{ - pathelement(location:it.absolutePath) - } - } - } - } -} - war{ exclude 'WEB-INF/lib/*' } @@ -141,103 +110,38 @@ //Project dependencies dependencies { - //compile group: 'com.forgon', name: 'forgon-tools', version:'2.0.0' - //compile group: 'com.forgon', name: 'forgon-core', version:'2.0.0' - //compile group: 'com.forgon', name: 'ssts-basedata', version:'2.0.0' - //compile group: 'com.forgon', name: 'ssts-diposablegoods', version:'2.0.0' - //compile group: 'com.forgon', name: 'ssts-tousse', version:'2.0.0' - //compile group: 'com.forgon', name: 'ssts-print', version:'2.0.0' - - //compile group: 'com.forgon', name: 'ssts-expiration', version:'2.0.0' - //compile group: 'com.forgon', name: 'ssts-idcard', version:'2.0.0' - - //compile group: 'com.forgon', name: 'ssts-wash', version:'2.0.0' - //compile group: 'com.forgon', name: 'ssts-packing', version:'2.0.0' - - //compile group: 'com.forgon', name: 'ssts-recyclingapplication', version:'2.0.0' - //compile group: 'com.forgon', name: 'ssts-recyclingrecord', version:'2.0.0' - - //compile group: 'com.forgon', name: 'ssts-stockmanage', version:'2.0.0' - - //compile group: 'com.forgon', name: 'ssts-qualitymon', version:'2.0.0' - - //compile group: 'com.forgon', name: 'ssts-sterile', version:'2.0.0' - //compile group: 'com.forgon', name: 'ssts-invoice', version:'2.0.0' - //compile group: 'com.forgon', name: 'ssts-userecord', version:'2.0.0' - - //compile group: 'com.forgon', name: 'ssts-maintain', version:'2.0.0' - - //compile group: 'com.forgon', name: 'ssts-reports', version:'2.0.0' - - //compile group: 'com.forgon', name: 'ssts-webservice', version:'2.0.0' - - - //compile group: 'com.forgon', name: 'ssts-datasync', version:'2.0.0' - - ////compile group: 'com.forgon', name: 'ssts-sso', version:'2.0.0' - - - ajc group: 'org.aspectj', name: 'aspectjtools' , version: aspectjVersion - compile group: 'org.aspectj', name: 'aspectjrt' , version: aspectjVersion - aspects group: 'org.springframework', name: 'spring-aspects', version: springVersion - aspectCompile group: 'org.hibernate.javax.persistence', name: 'hibernate-jpa-2.0-api', version: '1.0.0.Final' - aspectCompile group: 'org.springframework', name: 'spring-tx', version: springVersion - aspectCompile group: 'org.springframework', name: 'spring-orm', version: springVersion - - - - providedCompile group: 'javax.servlet', name: 'servlet-api', version:'2.4' - providedCompile group: 'javax.servlet', name: 'servlet-api', version:'2.5' - - providedCompile group: 'javax.servlet', name: 'jsp-api', version:'2.0' - - providedCompile group: 'junit', name: 'junit', version:'4.8.2' - - //providedCompile 'org.akhikhl.gretty:gretty-runner:1.2.2' - - - runtime 'org.slf4j:slf4j-api:1.7.7' - runtime 'org.slf4j:slf4j-jdk14:1.7.7' - runtime 'org.apache.neethi:neethi:3.0.2' runtime 'jackson:jackson-all:1.9.11' runtime 'quartz:quartz:1.5.2' - runtime 'c3p0:c3p0:0.9.1.2' + + //runtime 'com.mchange:c3p0:0.9.2.1' + runtime 'com.mchange:c3p0:0.9.5.2' + runtime 'com.mchange:mchange-commons-java:0.2.11' + runtime 'javax.transaction:jta:1.1' - runtime 'net.sourceforge.jtds:jtds:1.2.8' - runtime 'javassist:javassist:3.7.1.GA' + + //runtime 'net.sourceforge.jtds:jtds:1.3.1' + runtime 'com.microsoft.sqlserver:sqljdbc4:4.0' runtime 'dom4j:dom4j:1.6.1' runtime 'bsh:bsh:2.0b1' - runtime group: 'jfree', name: 'jfreechart', version:'1.0.12' - runtime 'asm:asm:3.1' - runtime 'asm:asm-commons:3.1' - runtime 'asm:asm-attrs:1.5.3' - runtime 'asm:asm-tree:3.1' - runtime 'asm:asm-util:2.2.3' - runtime 'activation:activation:1.1' runtime 'antlr:antlr:2.7.7' runtime 'net.sf.ezmorph:ezmorph:1.0.4' runtime 'wsdl4j:wsdl4j:1.6.2' runtime 'org.freemarker:freemarker:2.3.16' runtime 'ognl:ognl:3.0.6' - runtime 'cglib:cglib:1.0' - runtime 'cglib:cglib-nodep:2.1_3' + + runtime 'cglib:cglib:3.2.0' + runtime 'cglib:cglib-nodep:3.2.0' + runtime 'xom:xom:1.2.5' runtime 'xml:xmlschema-core:2.0.3' runtime 'org.springmodules:spring-modules-validation:0.8' - runtime group: 'org.apache.lucene', name: 'lucene-core', version:'2.4.1' - runtime group: 'org.apache.lucene', name: 'lucene-highlighter', version:'2.4.1' - runtime group: 'org.apache.lucene', name: 'lucene-analyzers', version:'2.4.1' - runtime group: 'org.apache.lucene', name: 'lucene-queries', version:'2.4.1' - runtime group: 'org.apache.lucene', name: 'lucene-snowball', version:'2.4.1' - runtime group: 'org.apache.lucene', name: 'lucene-spellchecker', version:'2.4.1' - runtime 'commons-attributes:commons-attributes-api:2.1' runtime 'commons-chain:commons-chain:1.1' runtime 'commons-cli:commons-cli:1.0' @@ -267,15 +171,10 @@ runtime 'org.apache.commons:commons-jci-core:1.1' runtime 'org.apache.commons:commons-jci-fam:1.1' - runtime files ('../localrepo/libs/ojdbc14.jar') + runtime files ('../localrepo/libs/ojdbc6.jar') runtime group: 'fckeditor', name: 'FCKeditor', version:'2.3' - runtime group: 'org.springframework', name: 'spring-context-support', version:'3.1.1.RELEASE' - - testCompile 'junit:junit:4.10' - - } war.dependsOn copyDependenciesToLibDir \ No newline at end of file