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

Merge branch 'master' of github.com:jamesagnew/hapi-fhir

This commit is contained in:
James Agnew 2015-03-17 10:03:51 -04:00
parent 823bb4ed82 577f26cb74
commit 75877c18eb
7 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-android/dependency-reduced-pom.xml
View File

@ -125,7 +125,7 @@
<dependency>
<groupId>com.phloc</groupId>
<artifactId>phloc-commons</artifactId>
<version>4.3.5</version>
<version>4.3.6</version>
<scope>compile</scope>
</dependency>
<dependency>

2
hapi-fhir-base/pom.xml
View File

@ -190,7 +190,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.4</version>
<version>${maven_jxr_plugin_version}</version>
<reportSets>
<reportSet>
<id>normal</id>

2
hapi-fhir-jpaserver-example/pom.xml
View File

@ -196,7 +196,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>

2
hapi-fhir-testpage-overlay/pom.xml
View File

@ -226,7 +226,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<version>${maven_antrun_plugin_version}</version>
<executions>
<execution>
<id>copyNarrativeCss</id>

34
pom.xml
View File

@ -147,6 +147,13 @@
</licenses>
<properties>
<!--
This property is used in some of the site documentation where the version
is shown, so that we can deploy the site even if the project is on a
snapshot version.
-->
<hapi_stable_version>0.9</hapi_stable_version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- For site-deploy -->
@ -154,7 +161,7 @@
<scmPubCheckoutDirectory>${user.home}/sites/scm/hapi-fhir</scmPubCheckoutDirectory>
<!-- Plugin Versions -->
<apache_httpclient_version>4.3.6</apache_httpclient_version>
<apache_httpclient_version>4.4</apache_httpclient_version>
<apache_httpcore_version>4.4</apache_httpcore_version>
<commons_io_version>2.4</commons_io_version>
<commons_lang_version>3.3.2</commons_lang_version>
@ -176,26 +183,29 @@
<jscience_version>4.3.1</jscience_version>
<junit_version>4.12</junit_version>
<logback_version>1.1.2</logback_version>
<maven_assembly_plugin_version>2.4.1</maven_assembly_plugin_version>
<maven_antrun_plugin_version>1.8</maven_antrun_plugin_version>
<maven_assembly_plugin_version>2.5.3</maven_assembly_plugin_version>
<maven_failsafe_plugin_version>2.18.1</maven_failsafe_plugin_version>
<maven_gpg_plugin_version>1.6</maven_gpg_plugin_version>
<maven_javadoc_plugin_version>2.10.1</maven_javadoc_plugin_version>
<maven_jxr_plugin_version>2.5</maven_jxr_plugin_version>
<maven_license_plugin_version>1.7</maven_license_plugin_version>
<maven_license_plugin_version>1.8</maven_license_plugin_version>
<maven_project_info_plugin_version>2.8</maven_project_info_plugin_version>
<maven_surefire_plugin_version>2.18.1</maven_surefire_plugin_version>
<maven_site_plugin_version>3.4</maven_site_plugin_version>
<maven_source_plugin_version>2.3</maven_source_plugin_version>
<maven_source_plugin_version>2.4</maven_source_plugin_version>
<mitreid-connect-version>1.1.8</mitreid-connect-version>
<mockito_version>1.10.17</mockito_version>
<phloc_schematron_version>2.7.1</phloc_schematron_version>
<phloc_commons_version>4.3.5</phloc_commons_version>
<phloc_commons_version>4.3.6</phloc_commons_version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<servlet_api_version>3.1.0</servlet_api_version>
<slf4j_version>1.7.9</slf4j_version>
<spring_version>4.1.3.RELEASE</spring_version>
<slf4j_version>1.7.10</slf4j_version>
<spring_version>4.1.5.RELEASE</spring_version>
<spring_security_version>3.2.4.RELEASE</spring_security_version>
<thymeleaf-version>2.1.4.RELEASE</thymeleaf-version>
<ebay_cors_filter_version>1.0.1</ebay_cors_filter_version>
<woodstox_version>4.4.0</woodstox_version>
<woodstox_version>4.4.1</woodstox_version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@ -226,7 +236,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version>
<version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -353,7 +363,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<version>${maven_antrun_plugin_version}</version>
<inherited>false</inherited>
<executions>
<execution>
@ -658,7 +668,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.7</version>
<version>${maven_project_info_plugin_version}</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
@ -718,7 +728,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>${maven_gpg_plugin_version}</version>
<executions>
<execution>
<id>sign-artifacts</id>

8
src/changes/changes.xml
View File

@ -4,6 +4,14 @@
<properties>
<author>James Agnew</author>
<title>HAPI FHIR Changelog</title>
<!--
com.phloc:phloc-commons ............................... 4.3.5 -> 4.3.6
[INFO] org.apache.httpcomponents:httpclient .................... 4.3.6 -> 4.4
[INFO] org.codehaus.woodstox:woodstox-core-asl ............... 4.4.0 -> 4.4.1
[INFO] org.slf4j:jcl-over-slf4j ............................. 1.7.9 -> 1.7.10
[INFO] org.slf4j:slf4j-api .................................. 1.7.9 -> 1.7.10
[INFO] org.springframework:spring-beans ...... 4.1.3.RELEASE -> 4.1.5.RELEASE
-->
</properties>
<body>
<release version="1.0" date="TBA">

16
src/site/xdoc/download.xml.vm
View File

@ -9,14 +9,6 @@
<section name="Downloading HAPI FHIR">
<p>
<b>Important note to users of HAPI 0.7 and before:</b> The section below
references "hapi-fhir-structures-dstu-[version].jar", which was added for
HAPI 0.8 (and this version has not yet been released). If you are using HAPI
FHIR 0.7 or before, you only need to include the <code>hapi-fhir-base</code>
JAR, not the structures one.
</p>
<p>
To use HAPI in your application, at a minimum you need to include the HAPI-FHIR core
JAR <code>hapi-fhir-base-[version].jar</code>, as well as at least one "structures" JAR.
@ -30,12 +22,12 @@
<source><![CDATA[<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId>
<version>${project.version}</version>
<version>${hapi_stable_version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu</artifactId>
<version>${project.version}</version>
<version>${hapi_stable_version}</version>
</dependency>]]></source>
<subsection name="Supporting DSTU2 Resources">
@ -50,12 +42,12 @@
</p>
<p>
If you are using Maven, add the following dependency to include DEV resources:
If you are using Maven, add the following dependency to include DSTU2 resources:
</p>
<source><![CDATA[<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu2</artifactId>
<version>${project.version}</version>
<version>${hapi_stable_version}</version>
</dependency>]]></source>
</subsection>