honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hapifhir/org.hl7.fhir.core

This commit is contained in:
James Agnew 2019-04-24 20:28:09 -04:00
parent c5a8beb3d1 31e5adf40f
commit b38e81ac88
14 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.convertors/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.28-SNAPSHOT</version>
<version>3.7.29-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.dstu2/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.28-SNAPSHOT</version>
<version>3.7.29-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.dstu2016may/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.28-SNAPSHOT</version>
<version>3.7.29-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.dstu3/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.28-SNAPSHOT</version>
<version>3.7.29-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.r4/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.28-SNAPSHOT</version>
<version>3.7.29-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.r5/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.28-SNAPSHOT</version>
<version>3.7.29-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.utilities/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.28-SNAPSHOT</version>
<version>3.7.29-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

12
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java vendored
View File

@ -350,22 +350,22 @@ import com.google.gson.JsonObject;
return content;
}
public static NpmPackage fromFolder(String folder) throws IOException {
return fromFolder(folder, null);
public static NpmPackage fromFolder(String folder, String... exemptions) throws IOException {
return fromFolder(folder, null, exemptions);
}
public static NpmPackage fromFolder(String folder, PackageType defType) throws IOException {
public static NpmPackage fromFolder(String folder, PackageType defType, String... exemptions) throws IOException {
NpmPackage res = new NpmPackage(null);
loadFiles(res, folder, new File(folder));
loadFiles(res, folder, new File(folder), exemptions);
if (!res.content.containsKey("package/package.json") && defType != null)
res.content.put("package/package.json", TextFile.stringToBytes("{ \"type\" : \""+defType.getCode()+"\"}", false));
res.npm = (JsonObject) new com.google.gson.JsonParser().parse(new String(res.content.get("package/package.json")));
return res;
}
private static void loadFiles(NpmPackage res, String base, File folder) throws FileNotFoundException, IOException {
private static void loadFiles(NpmPackage res, String base, File folder, String... exemptions) throws FileNotFoundException, IOException {
for (File f : folder.listFiles()) {
if (!f.getName().equals(".git")) {
if (!f.getName().equals(".git") || !Utilities.existsInList(f.getName(), exemptions)) {
if (f.isDirectory())
loadFiles(res, base, f);
else {

2
org.hl7.fhir.validation.cli/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.28-SNAPSHOT</version>
<version>3.7.29-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.validation/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.7.28-SNAPSHOT</version>
<version>3.7.29-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java
View File

@ -251,7 +251,7 @@ public class Validator {
System.out.print(s.contains(" ") ? " \""+s+"\"" : " "+s);
System.out.println();
String definitions = "hl7.fhir.core#"+Constants.VERSION;
String definitions = "hl7.fhir.core#current";
String map = null;
List<String> igs = new ArrayList<String>();
List<String> questionnaires = new ArrayList<String>();

2
org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json
View File

@ -150,7 +150,7 @@
"errorCount": 0
},
"primitive-bad.xml" : {
"errorCount": 49
"errorCount": 47
},
"primitive-bad-empty.xml" : {
"errorCount": 3

2
pom.xml
View File

@ -13,7 +13,7 @@
each other. It is fine to bump the point version of this POM without affecting
HAPI FHIR.
-->
<version>3.7.28-SNAPSHOT</version>
<version>3.7.29-SNAPSHOT</version>
<properties>
<hapi_fhir_version>3.7.0-SNAPSHOT</hapi_fhir_version>

8
release.bat
View File

@ -4,15 +4,15 @@ REM make sure you are committed
echo
echo ===============================================================
echo upgrade and release fhir.core from 3.7.27-SNAPSHOT to 3.7.28-SNAPSHOT
echo upgrade and release fhir.core from 3.7.28-SNAPSHOT to 3.7.29-SNAPSHOT
echo ===============================================================
pause
call mvn versions:set -DnewVersion=3.7.28-SNAPSHOT
call mvn versions:set -DnewVersion=3.7.29-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" --excludeFileMask "*.dll, *.exe" --includeSubDirectories --find "3.7.27-SNAPSHOT" --replace "3.7.28-SNAPSHOT"
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\build" --fileMask "*.xml" --excludeFileMask "*.dll, *.exe" --find "3.7.27-SNAPSHOT" --replace "3.7.28-SNAPSHOT"
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\build" --fileMask "*.java" --excludeFileMask "*.dll, *.exe" --includeSubDirectories --find "3.7.28-SNAPSHOT" --replace "3.7.29-SNAPSHOT"
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\build" --fileMask "*.xml" --excludeFileMask "*.dll, *.exe" --find "3.7.28-SNAPSHOT" --replace "3.7.29-SNAPSHOT"
call mvn deploy
echo ===============================================================