Release new version
This commit is contained in:
Grahame Grieve
parent
299014c606
commit
2bdd175591
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.43-SNAPSHOT</version>
|
||||
<version>3.7.44-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.43-SNAPSHOT</version>
|
||||
<version>3.7.44-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.43-SNAPSHOT</version>
|
||||
<version>3.7.44-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.43-SNAPSHOT</version>
|
||||
<version>3.7.44-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.43-SNAPSHOT</version>
|
||||
<version>3.7.44-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.43-SNAPSHOT</version>
|
||||
<version>3.7.44-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -1246,7 +1246,7 @@ public class ProfileComparer {
|
|||
// // then we produce value set pages for each value set
|
||||
//
|
||||
// // TODO Auto-generated method stub
|
||||
return null;
|
||||
return Utilities.path(dest, getId()+".html");
|
||||
}
|
||||
|
||||
private void producePage(String src, String path, Map<String, String> vars) throws IOException {
|
||||
|
|
|
|||
|
|
@ -76,14 +76,13 @@ public class NPMPackageGenerator {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private String destFile;
|
||||
private Set<String> created = new HashSet<String>();
|
||||
private TarArchiveOutputStream tar;
|
||||
private ByteArrayOutputStream OutputStream;
|
||||
private BufferedOutputStream bufferedOutputStream;
|
||||
private GzipCompressorOutputStream gzipOutputStream;
|
||||
private JsonObject packageJ;
|
||||
|
||||
public NPMPackageGenerator(String destFile, String canonical, String url, PackageType kind, ImplementationGuide ig, String genDate) throws FHIRException, IOException {
|
||||
super();
|
||||
|
|
@ -96,6 +95,17 @@ public class NPMPackageGenerator {
|
|||
buildPackageJson(canonical, kind, url, genDate, ig, fhirVersion);
|
||||
}
|
||||
|
||||
public static NPMPackageGenerator subset(NPMPackageGenerator master, String destFile, String id, String name) throws FHIRException, IOException {
|
||||
JsonObject p = master.packageJ.deepCopy();
|
||||
p.remove("name");
|
||||
p.addProperty("name", id);
|
||||
p.remove("type");
|
||||
p.addProperty("type", PackageType.SUBSET.getCode());
|
||||
p.remove("title");
|
||||
p.addProperty("title", name);
|
||||
return new NPMPackageGenerator(destFile, p);
|
||||
}
|
||||
|
||||
public NPMPackageGenerator(String destFile, String canonical, String url, PackageType kind, ImplementationGuide ig, String genDate, List<String> fhirVersion) throws FHIRException, IOException {
|
||||
super();
|
||||
System.out.println("create package file at "+destFile);
|
||||
|
|
@ -115,6 +125,7 @@ public class NPMPackageGenerator {
|
|||
addFile(Category.RESOURCE, "package.json", json.getBytes("UTF-8"));
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
}
|
||||
packageJ = npm;
|
||||
}
|
||||
|
||||
private void buildPackageJson(String canonical, PackageType kind, String web, String genDate, ImplementationGuide ig, List<String> fhirVersion) throws FHIRException, IOException {
|
||||
|
|
@ -182,6 +193,7 @@ public class NPMPackageGenerator {
|
|||
addFile(Category.RESOURCE, "package.json", json.getBytes("UTF-8"));
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
}
|
||||
packageJ = npm;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@ public class ToolingExtensions {
|
|||
public static final String EXT_MAX_VALUESET = "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet";
|
||||
public static final String EXT_MIN_VALUESET = "http://hl7.org/fhir/StructureDefinition/elementdefinition-minValueSet";
|
||||
public static final String EXT_PROFILE_ELEMENT = "http://hl7.org/fhir/StructureDefinition/elementdefinition-profile-element";
|
||||
public static final String EXT_LIST_PACKAGE = "http://hl7.org/fhir/StructureDefinition/list-packageId";
|
||||
|
||||
|
||||
// specific extension helpers
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.43-SNAPSHOT</version>
|
||||
<version>3.7.44-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ import com.google.gson.JsonSyntaxException;
|
|||
public class PackageGenerator {
|
||||
|
||||
public enum PackageType {
|
||||
CORE, IG, TOOL, TEMPLATE;
|
||||
CORE, IG, TOOL, TEMPLATE, SUBSET;
|
||||
|
||||
public String getCode() {
|
||||
switch (this) {
|
||||
|
|
@ -48,7 +48,7 @@ public class PackageGenerator {
|
|||
case IG: return "fhir.ig";
|
||||
case TOOL: return "fhir.tool";
|
||||
case TEMPLATE: return "fhir.template";
|
||||
|
||||
case SUBSET: return "fhir.subset";
|
||||
}
|
||||
throw new Error("Unknown Type");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.43-SNAPSHOT</version>
|
||||
<version>3.7.44-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.43-SNAPSHOT</version>
|
||||
<version>3.7.44-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import org.junit.runners.Suite.SuiteClasses;
|
|||
ValidationTestSuite.class,
|
||||
ValidationEngineTests.class,
|
||||
JsonSchemaTests.class,
|
||||
ProfileComparisonTests.class,
|
||||
CDAValidationTestCase.class})
|
||||
public class AllR5ValidationTests {
|
||||
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ public class ValidationTestSuite implements IEvaluationContext, IValidatorResour
|
|||
@SuppressWarnings("deprecation")
|
||||
@Test
|
||||
public void test() throws Exception {
|
||||
System.out.println("Name: " + name);
|
||||
System.out.println("Name: " + name+" - base");
|
||||
String v = "5.0";
|
||||
List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
|
||||
if (content.has("version"))
|
||||
|
|
@ -156,6 +156,7 @@ public class ValidationTestSuite implements IEvaluationContext, IValidatorResour
|
|||
List<ValidationMessage> errorsProfile = new ArrayList<ValidationMessage>();
|
||||
JsonObject profile = content.getAsJsonObject("profile");
|
||||
String filename = TestUtilities.resourceNameToFile("validation-examples", profile.get("source").getAsString());
|
||||
System.out.println("Name: " + name+" - profile : "+profile.get("source").getAsString());
|
||||
v = content.has("version") ? content.get("version").getAsString() : Constants.VERSION;
|
||||
StructureDefinition sd = loadProfile(filename, v, messages);
|
||||
if (name.startsWith("Json."))
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@
|
|||
]
|
||||
},
|
||||
"synthea.json": {
|
||||
"errorCount": 2
|
||||
"errorCount": 1
|
||||
},
|
||||
"patient-good.json": {
|
||||
"errorCount": 0,
|
||||
|
|
@ -721,7 +721,8 @@
|
|||
],
|
||||
"profile": {
|
||||
"source": "slicing-example-uk.profile.xml",
|
||||
"errorCount": 16
|
||||
"errorCount": 19,
|
||||
"errors-for-debugging" : "ERROR: Bundle.entry[4].resource.entry[1].resource.section[1].code.coding: unable to find code 886921000000105 in http://snomed.info/sct\r\nERROR: Bundle.entry[4].resource.entry[1].resource.section[2].code.coding: unable to find code 1077881000000105 in http://snomed.info/sct\r\nERROR: Bundle.entry[4].resource.entry[1].resource.section[3].code.coding: Concept not found (next char = "c", in "cons") at character 1\r\nERROR: Bundle.entry[4].resource.entry[1].resource.section[4].code.coding: Concept not found (next char = "e", in "eligcrit") at character 1\r\nERROR: Bundle.entry[4].resource.entry[1].resource.section[5].code.coding: unable to find code 886711000000101 in http://snomed.info/sct\r\nERROR: Bundle.entry[4].resource.entry[1].resource.section[6].code.coding: unable to find code 717121000000105 in http://snomed.info/sct\r\nERROR: Bundle.entry[4].resource.entry[1].resource.section[7].code.coding: unable to find code 1102181000000102 in http://snomed.info/sct\r\nERROR: Bundle.entry[4].resource.entry[1].resource.section[8].code.coding: unable to find code 1052951000000105 in http://snomed.info/sct\r\nERROR: Bundle.entry[4].resource.entry[1].resource.section[9].code.coding: unable to find code 886731000000109 in http://snomed.info/sct\r\nERROR: Bundle.entry[4].resource.entry[1].resource.section[10].code.coding: unable to find code 1052891000000108 in http://snomed.info/sct\r\nERROR: Bundle.entry[4].resource.entry[5].resource: Profile https://fhir.hl7.org.uk/STU3/StructureDefinition/CareConnect-Patient-1, Element 'Bundle.entry[4].resource.entry[5].resource.name[official]': minimum required = 1, but only found 0\r\nERROR: Bundle.entry[4].resource.entry[5].resource.generalPractitioner: Unable to resolve the profile reference 'https://fhir.hl7.org.uk/STU3/StructureDefinition/CareConnect-Organization-1'\r\nERROR: Bundle.entry[4].resource.entry[5].resource.generalPractitioner: Unable to resolve the profile reference 'https://fhir.hl7.org.uk/STU3/StructureDefinition/CareConnect-Practitioner-1'\r\nERROR: Bundle.entry[4].resource.entry[5].resource.generalPractitioner: Invalid Resource target type. Found Practitioner, but expected one of ()\r\nERROR: Bundle.entry[4].resource.entry[5].resource.managingOrganization: Unable to resolve the profile reference 'https://fhir.hl7.org.uk/STU3/StructureDefinition/CareConnect-Organization-1'\r\nERROR: Bundle.entry[4].resource.entry[5].resource.managingOrganization: Invalid Resource target type. Found Organization, but expected one of ()\r\nERROR: Bundle.entry[4].resource.entry[8].resource.extension.valueCodeableConcept.coding: unable to find code 822851000000102 in http://snomed.info/sct\r\nERROR: Bundle.entry[4].resource.entry[8].resource.vaccineCode.coding: unable to find code 22704311000001109 in http://snomed.info/sct\r\nERROR: Bundle.entry[4].resource.entry[9].resource.code.coding: unable to find code 886921000000105 in http://snomed.info/sct"
|
||||
}
|
||||
},
|
||||
"patient-translated-codes.xml": {
|
||||
|
|
|
|||
2
pom.xml
2
pom.xml
|
|
@ -13,7 +13,7 @@
|
|||
each other. It is fine to bump the point version of this POM without affecting
|
||||
HAPI FHIR.
|
||||
-->
|
||||
<version>3.7.43-SNAPSHOT</version>
|
||||
<version>3.7.44-SNAPSHOT</version>
|
||||
|
||||
<properties>
|
||||
<hapi_fhir_version>3.7.0-SNAPSHOT</hapi_fhir_version>
|
||||
|
|
|
|||
16
release.bat
16
release.bat
|
|
@ -4,25 +4,25 @@ REM make sure you are committed
|
|||
@echo off
|
||||
echo ..
|
||||
echo =====================================================================
|
||||
echo upgrade and release fhir.core from 3.7.42-SNAPSHOT to 3.7.43-SNAPSHOT
|
||||
echo upgrade and release fhir.core from 3.7.43-SNAPSHOT to 3.7.44-SNAPSHOT
|
||||
echo =====================================================================
|
||||
echo ..
|
||||
echo check versions and make sure committed...
|
||||
pause
|
||||
|
||||
call mvn versions:set -DnewVersion=3.7.43-SNAPSHOT
|
||||
call mvn versions:set -DnewVersion=3.7.44-SNAPSHOT
|
||||
call git commit -a -m "Release new version"
|
||||
call git push origin master
|
||||
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\build" --fileMask "*.java" --includeSubDirectories --find "3.7.42-SNAPSHOT" --replace "3.7.43-SNAPSHOT"
|
||||
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\fhir-ig-publisher" --fileMask "*.xml" --includeSubDirectories --find "3.7.42-SNAPSHOT" --replace "3.7.43-SNAPSHOT"
|
||||
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\build" --fileMask "*.xml" --find "3.7.42-SNAPSHOT" --replace "3.7.43-SNAPSHOT"
|
||||
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\build" --fileMask "*.java" --includeSubDirectories --find "3.7.43-SNAPSHOT" --replace "3.7.44-SNAPSHOT"
|
||||
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\fhir-ig-publisher" --fileMask "*.xml" --includeSubDirectories --find "3.7.43-SNAPSHOT" --replace "3.7.44-SNAPSHOT"
|
||||
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\build" --fileMask "*.xml" --find "3.7.43-SNAPSHOT" --replace "3.7.44-SNAPSHOT"
|
||||
call mvn deploy
|
||||
copy org.hl7.fhir.validation.cli\target\org.hl7.fhir.validation.cli-3.7.43-SNAPSHOT.jar ..\latest-ig-publisher\org.hl7.fhir.validator.jar
|
||||
copy org.hl7.fhir.validation.cli\target\org.hl7.fhir.validation.cli-3.7.44-SNAPSHOT.jar ..\latest-ig-publisher\org.hl7.fhir.validator.jar
|
||||
cd ..\latest-ig-publisher
|
||||
call git commit -a -m "Release new version 3.7.43-SNAPSHOT"
|
||||
call git commit -a -m "Release new version 3.7.44-SNAPSHOT"
|
||||
call git push origin master
|
||||
cd ..\org.hl7.fhir.core
|
||||
call python c:\tools\zulip-api\zulip\zulip\send.py --stream committers/notification --subject "java core" -m "New Java Core v3.7.43-SNAPSHOT released. New Validator at https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=ca.uhn.hapi.fhir&a=org.hl7.fhir.validation.cli&v=3.7.43-SNAPSHOT&e=jar, and also deployed at https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.validator.jar" --config-file zuliprc
|
||||
call python c:\tools\zulip-api\zulip\zulip\send.py --stream committers/notification --subject "java core" -m "New Java Core v3.7.44-SNAPSHOT released. New Validator at https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=ca.uhn.hapi.fhir&a=org.hl7.fhir.validation.cli&v=3.7.44-SNAPSHOT&e=jar, and also deployed at https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.validator.jar" --config-file zuliprc
|
||||
|
||||
echo ===============================================================
|
||||
echo all done
|
||||
|
|
|
|||
Loading…
Reference in New Issue