Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-sig

# Conflicts:
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java

1 files changed, 11 insertions, 7 deletions

diff --git a/moaSig/moa-asic/build.gradle b/moaSig/moa-asic/build.gradle
index d615c1f..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.12'
 }
 
 sourceSets {
@@ -49,8 +51,10 @@ 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
 }
+
+task publishPubNamePublicationToMavenLocal {}