From 70e3a6941c3464a085e411cbba4abf7511342491 Mon Sep 17 00:00:00 2001
From: Wolf-Martell Montwe <wolf@wolfmontwe.de>
Date: Thu, 7 Jan 2021 12:28:58 +0100
Subject: [PATCH 1/3] Update changelog and readme version

---
 CHANGELOG.adoc | 10 ++++++++--
 README.adoc    |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index d955cb1f..0b1c0003 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -18,8 +18,6 @@ toc::[]
 
 === Changed
 
-* BREAKING module name changed from `hc-fhir-sdk-java` to `fhir-java`
-
 === Removed
 
 === Fixed
@@ -28,6 +26,14 @@ toc::[]
 
 === Migration
 
+== https://github.com/d4l-data4life/hc-fhir-sdk-java/compare/v1.1.0...v1.2.0[1.2.0]
+
+=== Changed
+
+* BREAKING module name changed from `hc-fhir-sdk-java` to `fhir-java`
+
+=== Migration
+
 You need to update your Gradle dependency declaration from "care.data4life.hc-fhir-sdk-java:hc-fhir-sdk-java:{version}" to:
 
 [source, gradle]
diff --git a/README.adoc b/README.adoc
index 39dc890a..a1cfc3e9 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,4 +1,4 @@
-:library_version: 1.1.0
+:library_version: 1.2.0
 :toc: macro
 :toclevels: 2
 :toc-title:

From 176f180d8fd44f63f05ba036ebc1924d7630d63a Mon Sep 17 00:00:00 2001
From: Wolf-Martell Montwe <wolf@wolfmontwe.de>
Date: Thu, 7 Jan 2021 14:07:46 +0100
Subject: [PATCH 2/3] Cleanup

---
 buildSrc/src/main/kotlin/scripts/publishing.gradle.kts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/scripts/publishing.gradle.kts b/buildSrc/src/main/kotlin/scripts/publishing.gradle.kts
index 004bf95d..2fbcc2e9 100644
--- a/buildSrc/src/main/kotlin/scripts/publishing.gradle.kts
+++ b/buildSrc/src/main/kotlin/scripts/publishing.gradle.kts
@@ -19,8 +19,6 @@ package scripts
 import org.gradle.api.tasks.Exec
 
 plugins {
-    "maven-publish"
-
     id("care.data4life.git-publish")
 }
 

From cf3b98cf90fddb65085f67935862fb4fca06dde1 Mon Sep 17 00:00:00 2001
From: Wolf-Martell Montwe <wolf@wolfmontwe.de>
Date: Thu, 7 Jan 2021 14:42:56 +0100
Subject: [PATCH 3/3] Cleanup

---
 buildSrc/src/main/kotlin/LibraryConfig.kt                   | 2 +-
 .../src/main/kotlin/scripts/publishing-config.gradle.kts    | 6 ++----
 fhir-java/build.gradle.kts                                  | 2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/LibraryConfig.kt b/buildSrc/src/main/kotlin/LibraryConfig.kt
index a1890445..1d2079e7 100644
--- a/buildSrc/src/main/kotlin/LibraryConfig.kt
+++ b/buildSrc/src/main/kotlin/LibraryConfig.kt
@@ -25,7 +25,7 @@ object LibraryConfig {
     val publish = PublishConfig
     object PublishConfig {
         const val name = LibraryConfig.name
-        const val groupId = LibraryConfig.group
+        const val groupId = "${LibraryConfig.group}.${LibraryConfig.name}"
         const val description = "Minimal FHIR 3 + 4 standard models and data types for Android and Java."
         const val year = "2020"
 
diff --git a/buildSrc/src/main/kotlin/scripts/publishing-config.gradle.kts b/buildSrc/src/main/kotlin/scripts/publishing-config.gradle.kts
index 9a1f494d..16f56352 100644
--- a/buildSrc/src/main/kotlin/scripts/publishing-config.gradle.kts
+++ b/buildSrc/src/main/kotlin/scripts/publishing-config.gradle.kts
@@ -21,8 +21,6 @@ plugins {
     `maven-publish`
 }
 
-group = ProjectConfig.library.group
-
 tasks.named<JacocoReport>("jacocoTestReport") {
     reports {
         xml.isEnabled = true
@@ -76,8 +74,8 @@ publishing {
     }
 
     publications {
-        create<MavenPublication>("mavenJava") {
-            groupId = "${ProjectConfig.library.publish.groupId}.${ProjectConfig.library.publish.name}"
+        withType<MavenPublication> {
+            groupId = ProjectConfig.library.publish.groupId
 
             from(components["java"])
             artifact(tasks["sourcesJar"])
diff --git a/fhir-java/build.gradle.kts b/fhir-java/build.gradle.kts
index d21859c5..fee15b84 100644
--- a/fhir-java/build.gradle.kts
+++ b/fhir-java/build.gradle.kts
@@ -21,6 +21,8 @@ plugins {
   id("scripts.publishing-config")
 }
 
+group = ProjectConfig.library.group
+
 java {
   sourceCompatibility = JavaVersion.VERSION_1_7
   targetCompatibility = JavaVersion.VERSION_1_7