From eee21c68c2df2935b74af656247aadd83d3d3178 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Wed, 24 Mar 2021 11:18:29 +0100 Subject: update gradle version and build process to assemble release packages --- moaSig/moa-asic/build.gradle | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'moaSig/moa-asic') diff --git a/moaSig/moa-asic/build.gradle b/moaSig/moa-asic/build.gradle index 8df208c..3ef15cb 100644 --- a/moaSig/moa-asic/build.gradle +++ b/moaSig/moa-asic/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java-library-distribution' distributions { main{ - baseName = 'MOA-ASIC' + distributionBaseName = 'MOA-ASIC' } } @@ -11,17 +11,14 @@ configurations { } dependencies { - jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.2.11' - compile project(':common') - compile project(':moa-sig-lib') - compile 'org.slf4j:slf4j-log4j12:1.7.30' - implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' - implementation group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1' - //implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.2.11' - //implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.2.11' - //implementation group: 'com.sun.xml.ws', name: 'jaxws-ri', version: '2.2.10', ext: 'pom' + implementation project(':common') + implementation project(':moa-sig-lib') + implementation 'org.slf4j:slf4j-log4j12:1.7.30' + api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' + api group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1' + } sourceSets { @@ -54,8 +51,8 @@ task jaxb () { } task releases(type: Copy) { - from jar.outputs - from distZip.outputs + //from jar.outputs + //from distZip.outputs from distTar.outputs into rootDir.toString() + "/releases/" + version } -- cgit v1.2.3