Merge remote-tracking branch 'origin/master'

Author: grahamegrieve

org.hl7.fhir.publisher.cli/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.hl7.fhir.publisher</artifactId>
         <groupId>org.hl7.fhir.publisher</groupId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

org.hl7.fhir.publisher.core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hl7.fhir.publisher</groupId>
         <artifactId>org.hl7.fhir.publisher</artifactId>
-        <version>2.2.7-SNAPSHOT</version>
+        <version>2.2.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/PublicationChecker.java

@@ -222,7 +222,7 @@ private void checkPackage(List<String> messages, NpmPackage npm) {
 
   private void checkExistingPublication(List<String> messages, NpmPackage npm, PackageList pl, JsonObject pr) {
     if (pl != null) {
-      if (pr.has("movedFrom")) {
+      if (pr != null && pr.has("movedFrom")) {
         check(messages, !npm.name().equals(pl.pid()), "Package ID matches, which is wrong. This package is " + npm.name() + " and the website is also " + pl.pid()+", but it must change" + mkError());
         check(messages, !npm.canonical().equals(pl.canonical()), "Package canonical matches, which is wrong. This package canonical is " + npm.canonical() + " and the website has " + pl.canonical()+", but it must change" + mkError());
         check(messages, !hasVersion(pl, npm.version()), "Version " + npm.version() + " has already been published" + mkWarning());

pom.xml

@@ -4,11 +4,11 @@
 
     <groupId>org.hl7.fhir.publisher</groupId>
     <artifactId>org.hl7.fhir.publisher</artifactId>
-    <version>2.2.7-SNAPSHOT</version>
+    <version>2.2.8-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <core_version>6.9.7-SNAPSHOT</core_version>
+        <core_version>6.9.7</core_version>
         <maven_surefire_version>3.0.0-M5</maven_surefire_version>
         <apache_poi_version>5.4.1</apache_poi_version>
         <commons_io_version>2.17.0</commons_io_version>