Merge branch 'feature/move-to-gitlab-package'

# Conflicts:
#	build.gradle

build.gradle

@@ -22,7 +22,6 @@ plugins {
     id 'org.jetbrains.dokka' version '0.10.1'
     id 'com.gitlab.morality.grit' version '2.0.2'
     id 'org.jlleitschuh.gradle.ktlint' version '9.2.1'
-    id 'com.jfrog.bintray' version '1.8.5'
 }
 
 group = 'ch.memobase'
@@ -33,7 +32,7 @@ targetCompatibility = 1.8
 repositories {
     jcenter()
     maven {
-        url  "https://dl.bintray.com/memoriav/memobase"
+        url "https://dl.bintray.com/memoriav/memobase"
     }
 }
 
@@ -74,25 +73,18 @@ dependencies {
 
 }
 
+
+sourceSets {
+    main.kotlin.srcDirs += 'src/main/kotlin'
+    test.kotlin.srcDirs += 'src/test/kotlin'
+    test.resources.srcDirs += 'src/test/resources'
+}
+
 task sourceJar(type: Jar) {
     from sourceSets.main.allSource
     classifier "sources"
 }
 
-bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_API_KEY')
-    publications = ['memobasePub']
-    pkg {
-        name = 'normalizer-service-configuration'
-        repo = 'memobase'
-        userOrg = 'memoriav'
-        desc = 'Parser & validation for the normalizer service configuration.'
-        licenses = ['Apache-2.0']
-        vcsUrl = 'https://gitlab.switch.ch/memoriav/memobase-2020/libraries/normalizer-service-configuration'
-    }
-}
-
 compileKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
@@ -102,12 +94,12 @@ compileTestKotlin {
 
 publishing {
     publications {
-        memobasePub(MavenPublication) {
-            groupId = group
-            artifact sourceJar
+        library(MavenPublication) {
             from components.java
             pom {
-                url = "https://gitlab.switch.ch/memoriav/memobase-2020/libraries/normalizer-service-configuration"
+                name = 'Normalization Service Configuration'
+                description = "This library contains the parsers and validators for the normalization service configurations."
+                url = "https://gitlab.switch.ch/memoriav/memobase-2020/libraries/package-registry"
                 licenses {
                     license {
                         name = 'The Apache License, Version 2.0'
@@ -130,4 +122,18 @@ publishing {
 
         }
     }
+
+    repositories {
+        maven {
+            url "https://gitlab.switch.ch/api/v4/projects/1324/packages/maven"
+            name "GitLab"
+            credentials(HttpHeaderCredentials) {
+                name "Job-Token"
+                value System.getenv("CI_JOB_TOKEN")
+            }
+            authentication {
+                header(HttpHeaderAuthentication)
+            }
+        }
+    }
 }
\ No newline at end of file

src/test/resources/global/facets/single-date-matchers.txt

 (?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})T(?<time>\d{2}:\d{2}:\d{2})
-(?<year>\d{4})-(?<month>[0-2][0-9])-(?<day>[1-3][0-9])
-(?<year>\d{4})(?<month>[0-2][0-9])(?<day>[1-3][0-9])
-(?<day>[1-3][0-9])\.(?<month>[0-2][0-9])\.(?<year>\d{4})
-(?<day>[1-3][0-9])-(?<month>[0-2][0-9])-(?<year>\d{4})
\ No newline at end of file
+(?<year>\d{4})-(?<month>[0-2][0-9])-(?<day>[0-3][0-9])
+(?<year>\d{4})(?<month>[0-2][0-9])(?<day>[0-3][0-9])
+(?<day>[0-3][0-9])\.(?<month>[0-2][0-9])\.(?<year>\d{4})
+(?<day>[0-3][0-9])-(?<month>[0-2][0-9])-(?<year>\d{4})
\ No newline at end of file