From 2cfb25728fe4a73680f3abf624fb723d8b74e5b2 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Thu, 3 Mar 2016 11:44:49 +0100 Subject: build script changes --- pdf-as-pdfbox/build.gradle | 1 + pdf-as-web/build.gradle | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/pdf-as-pdfbox/build.gradle b/pdf-as-pdfbox/build.gradle index 5d2dafab..a5684e18 100644 --- a/pdf-as-pdfbox/build.gradle +++ b/pdf-as-pdfbox/build.gradle @@ -22,6 +22,7 @@ releases.dependsOn sourcesJar dependencies { compile project (':pdf-as-lib') compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion + compile 'org.slf4j:jcl-over-slf4j:1.7.18' compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.10' compile group: 'commons-collections', name: 'commons-collections', version: '3.2' compile group: 'commons-io', name: 'commons-io', version: '2.4' diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 1de51797..49310e2f 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -2,7 +2,20 @@ apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'eclipse-wtp' apply plugin: 'war' -apply plugin: 'jetty' + +buildscript { + repositories { + jcenter() + // enable this to use snapshot versions of Gretty: + // maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' } + } + + dependencies { + classpath 'org.akhikhl.gretty:gretty:+' + } +} + +apply plugin: 'org.akhikhl.gretty' jar { manifest { @@ -43,8 +56,17 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.+' } +gretty { + // supported values: + // 'jetty7', 'jetty8', 'jetty9', 'tomcat7', 'tomcat8' + servletContainer = 'jetty9' + + jvmArgs = [ '-Dpdf-as-web.conf=' + System.getProperty("user.home") + '/.pdfas/pdf-as-web.properties' ] +} + + test { - systemProperties 'property': 'value' + systemProperties 'pdf-as-web.conf': System.getProperty("user.home") + '/.pdfas/pdf-as-web.properties' } task downloadTomcat << { -- cgit v1.2.3