update gradle version and build process to assemble release packages

1 files changed, 25 insertions, 24 deletions

diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle
index 510603b..bb1a8d3 100644
--- a/moaSig/moa-sig-lib/build.gradle
+++ b/moaSig/moa-sig-lib/build.gradle
@@ -2,37 +2,38 @@ apply plugin: 'java-library-distribution'
 apply plugin: 'maven-publish'
 
 distributions {
-    main{
-        baseName = 'MOA-SPSS'
+    main {
+        distributionBaseName = 'moa-spss-lib'
     }
 }
 
-dependencies {
-	compile fileTree(dir: '../libs', include: '*.jar')
-	compile project(':common')
-	testCompile project(path: ':common', configuration: 'tests')
+dependencies {	
+	implementation project(':common')	
+	testImplementation project(path: ':common')
 	
-	compile 'log4j:log4j:1.2.17'
-	compile 'commons-logging:commons-logging:1.2'
-	compile 'commons-io:commons-io:2.7'
-	compile 'commons-codec:commons-codec:1.14'
-	compile 'org.apache.axis:axis-jaxrpc:1.4'
-	compile 'org.xerial:sqlite-jdbc:3.32.3.2'
-	compile 'javax.xml.bind:jaxb-api:2.3.1'
-	compile 'com.sun.xml.bind:jaxb-core:2.3.0.1'
-	compile 'com.sun.xml.bind:jaxb-impl:2.3.2'
-	compile 'org.postgresql:postgresql:42.2.15.jre7'
-	compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.21'
-	compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.21'
-	compile group: 'org.apache.pdfbox', name: 'pdfbox-app', version: '2.0.21'
-	compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.21'
-	compile group: 'org.apache.pdfbox', name: 'preflight-app', version: '2.0.21'
-	compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
-	compile group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: '4.5.12'
+	api fileTree(dir: '../libs', include: '*.jar')
+	api group: 'at.gv.egovernment.moa.sig', name: 'tsl-lib', version: '2.0.4'
+	api 'log4j:log4j:1.2.17'
+	api 'commons-logging:commons-logging:1.2'
+	api 'commons-io:commons-io:2.8.0'
+	api 'commons-codec:commons-codec:1.15'
+	api 'org.apache.axis:axis-jaxrpc:1.4'
+	api 'org.xerial:sqlite-jdbc:3.34.0'
+	api 'javax.xml.bind:jaxb-api:2.3.1'
+	api 'com.sun.xml.bind:jaxb-core:2.3.0.1'
+	api 'com.sun.xml.bind:jaxb-impl:2.3.2'
+	api 'org.postgresql:postgresql:42.2.19.jre7'		
+	api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.23'
+	api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.23'
+	api group: 'org.apache.pdfbox', name: 'pdfbox-app', version: '2.0.23'
+	api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.23'
+	api group: 'org.apache.pdfbox', name: 'preflight-app', version: '2.0.23'
+	api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+	api group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: '4.5.13'
 }
 
 task releases(type: Copy) {
-	from jar.outputs
+	//from jar.outputs
 	from distZip.outputs
 	from distTar.outputs
 	into rootDir.toString() + "/releases/" + version