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, 44 insertions, 7 deletions

diff --git a/moaSig/build.gradle b/moaSig/build.gradle
index 247bf08..3935b41 100644
--- a/moaSig/build.gradle
+++ b/moaSig/build.gradle
@@ -10,24 +10,61 @@ buildscript {
 }
 
 subprojects {
-    apply plugin: 'java'
+    apply plugin: 'java-library'
     apply plugin: 'eclipse'
+    apply plugin: 'maven-publish'
 
     repositories {
        mavenCentral()
+       
+       maven {
+        	url "https://apps.egiz.gv.at/maven/"
+        	mavenContent {
+            	releasesOnly()
+        	}
+    	}
+    	maven {
+        	url "https://apps.egiz.gv.at/maven-snapshot/"
+        	mavenContent {
+            	snapshotsOnly()
+        	}
+    	}
+       
     }
-
+	
     dependencies {
-        testCompile 'junit:junit:4.8.2'
+        testImplementation 'junit:junit:4.13.2'
     }
 
-    version = '3.1.0-RC5'
+    version = '3.1.4-RC1'
 
     jar { manifest.attributes provider: 'EGIZ', 'Specification-Version': getCheckedOutGitCommitHash(), 'Implementation-Version': project.version  }
-}
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.8'
+	compileJava {
+    	sourceCompatibility = 1.8
+    	targetCompatibility = 1.8
+	}
+
+	tasks.withType(JavaCompile) {
+    	options.compilerArgs << '-Xlint:-options' 
+	}    
+    
+	publishing {
+		publications {
+        	mavenJava(MavenPublication) {
+            	from components.java
+            	// more goes in here
+        	}
+    	}
+    	repositories {
+        	maven {
+            	// change to point to your repo, e.g. http://my.org/repo
+            	url = "$buildDir/repo"
+    	   	}
+    	   	mavenLocal()
+    	}
+    }
+    
 }
 
 def getCheckedOutGitCommitHash() {