diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2021-03-24 11:08:57 +0000 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2021-03-24 11:08:57 +0000 |
| commit | 666d8c9f8cec7573e60a14ab039c0874f6a9ec53 (patch) | |
| tree | d9b2506506cf544ea3758322fd5488c913073427 /moaSig/moa-asic/build.gradle | |
| parent | d003a873fdeec22b1dd57d61590a12a1691ae137 (diff) | |
| parent | cd65b47cc30e7119593bbb05afa48d4f896a4859 (diff) | |
| download | moa-sig-666d8c9f8cec7573e60a14ab039c0874f6a9ec53.tar.gz moa-sig-666d8c9f8cec7573e60a14ab039c0874f6a9ec53.tar.bz2 moa-sig-666d8c9f8cec7573e60a14ab039c0874f6a9ec53.zip | |
Merge branch 'feature/codestyle_and_gitlab_ci' into 'master'
Feature/codestyle and gitlab ci
See merge request egiz/moa-sig!1
Diffstat (limited to 'moaSig/moa-asic/build.gradle')
| -rw-r--r-- | moaSig/moa-asic/build.gradle | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/moaSig/moa-asic/build.gradle b/moaSig/moa-asic/build.gradle index f8a536d..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,12 +11,14 @@ configurations { } dependencies { + jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.2.11' - jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.2.4-1' + 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' - compile project(':common') - compile project(':moa-sig-lib') - compile 'org.slf4j:slf4j-log4j12:1.7.30' } sourceSets { @@ -49,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 } |