no changes

This commit is contained in:
lmds1 2014-11-03 16:04:00 -05:00
parent 48a6d9ba6a
commit ce3132ce57
1 changed files with 174 additions and 40 deletions

View File

@ -4,9 +4,9 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId> <artifactId>hapi-deployable-pom</artifactId>
<version>0.7-SNAPSHOT</version> <version>0.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent> </parent>
<artifactId>hapi-fhir-structures-dstu</artifactId> <artifactId>hapi-fhir-structures-dstu</artifactId>
@ -18,8 +18,176 @@
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId> <artifactId>hapi-fhir-base</artifactId>
<version>0.7-SNAPSHOT</version> <version>0.8-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet_api_version}</version>
<scope>provided</scope>
</dependency>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${jetty_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<version>${jetty_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback_version}</version>
<optional>true</optional>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ebaysf.web</groupId>
<artifactId>cors-filter</artifactId>
<version>${ebay_cors_filter_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>${thymeleaf-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.phloc</groupId>
<artifactId>phloc-schematron</artifactId>
<version>${phloc_schematron_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.phloc</groupId>
<artifactId>phloc-commons</artifactId>
<version>${phloc_commons_version}</version>
<scope>test</scope>
</dependency>
<!-- UNIT TEST DEPENDENCIES -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15-sources</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>directory-naming</groupId>
<artifactId>naming-java</artifactId>
<version>0.8</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>${hamcrest_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava_version}</version>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${spring_security_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${spring_security_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-jwt</artifactId>
<version>1.0.2.RELEASE</version>
<scope>test</scope>
</dependency>
-->
</dependencies> </dependencies>
<build> <build>
@ -27,7 +195,7 @@
<plugin> <plugin>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-tinder-plugin</artifactId> <artifactId>hapi-tinder-plugin</artifactId>
<version>0.7-SNAPSHOT</version> <version>0.8-SNAPSHOT</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -38,8 +206,6 @@
<configuration> <configuration>
<package>ca.uhn.fhir.model.dstu</package> <package>ca.uhn.fhir.model.dstu</package>
<baseResourceNames> <baseResourceNames>
<!-- <baseResourceName>account</baseResourceName> -->
<!-- <baseResourceName>activitydefinition-extensions</baseResourceName> -->
<baseResourceName>adversereaction</baseResourceName> <baseResourceName>adversereaction</baseResourceName>
<baseResourceName>alert</baseResourceName> <baseResourceName>alert</baseResourceName>
<baseResourceName>allergyintolerance</baseResourceName> <baseResourceName>allergyintolerance</baseResourceName>
@ -47,7 +213,7 @@
<baseResourceName>appointment</baseResourceName> <baseResourceName>appointment</baseResourceName>
<baseResourceName>availability</baseResourceName> <baseResourceName>availability</baseResourceName>
<baseResourceName>careplan</baseResourceName> <baseResourceName>careplan</baseResourceName>
<baseResourceName>claim</baseResourceName> <!-- <baseResourceName>claim</baseResourceName> -->
<baseResourceName>composition</baseResourceName> <baseResourceName>composition</baseResourceName>
<baseResourceName>conceptmap</baseResourceName> <baseResourceName>conceptmap</baseResourceName>
<baseResourceName>condition</baseResourceName> <baseResourceName>condition</baseResourceName>
@ -60,7 +226,6 @@
<baseResourceName>documentmanifest</baseResourceName> <baseResourceName>documentmanifest</baseResourceName>
<baseResourceName>documentreference</baseResourceName> <baseResourceName>documentreference</baseResourceName>
<baseResourceName>encounter</baseResourceName> <baseResourceName>encounter</baseResourceName>
<!-- <baseResourceName>familyhistory-genetics-profile</baseResourceName> -->
<baseResourceName>familyhistory</baseResourceName> <baseResourceName>familyhistory</baseResourceName>
<baseResourceName>geneexpression</baseResourceName> <baseResourceName>geneexpression</baseResourceName>
<baseResourceName>geneticanalysis</baseResourceName> <baseResourceName>geneticanalysis</baseResourceName>
@ -80,7 +245,6 @@
<baseResourceName>medicationstatement</baseResourceName> <baseResourceName>medicationstatement</baseResourceName>
<baseResourceName>messageheader</baseResourceName> <baseResourceName>messageheader</baseResourceName>
<baseResourceName>microarray</baseResourceName> <baseResourceName>microarray</baseResourceName>
<!-- <baseResourceName>namespace</baseResourceName> -->
<baseResourceName>observation</baseResourceName> <baseResourceName>observation</baseResourceName>
<baseResourceName>operationoutcome</baseResourceName> <baseResourceName>operationoutcome</baseResourceName>
<baseResourceName>orderresponse</baseResourceName> <baseResourceName>orderresponse</baseResourceName>
@ -88,45 +252,27 @@
<baseResourceName>organization</baseResourceName> <baseResourceName>organization</baseResourceName>
<baseResourceName>other</baseResourceName> <baseResourceName>other</baseResourceName>
<baseResourceName>patient</baseResourceName> <baseResourceName>patient</baseResourceName>
<!--<baseResourceName>person</baseResourceName>-->
<baseResourceName>practitioner</baseResourceName> <baseResourceName>practitioner</baseResourceName>
<baseResourceName>procedure</baseResourceName> <baseResourceName>procedure</baseResourceName>
<baseResourceName>profile</baseResourceName> <baseResourceName>profile</baseResourceName>
<!-- <baseResourceName>protocol</baseResourceName> -->
<!-- <baseResourceName>provenance-extensions</baseResourceName> -->
<baseResourceName>provenance</baseResourceName> <baseResourceName>provenance</baseResourceName>
<baseResourceName>query</baseResourceName> <baseResourceName>query</baseResourceName>
<!-- <baseResourceName>questionnaire-extensions</baseResourceName> -->
<baseResourceName>questionnaire</baseResourceName> <baseResourceName>questionnaire</baseResourceName>
<baseResourceName>relatedperson</baseResourceName> <baseResourceName>relatedperson</baseResourceName>
<baseResourceName>remittance</baseResourceName> <baseResourceName>remittance</baseResourceName>
<!-- <baseResourceName>resource</baseResourceName> -->
<baseResourceName>securityevent</baseResourceName> <baseResourceName>securityevent</baseResourceName>
<!--<baseResourceName>sequence</baseResourceName>-->
<baseResourceName>sequencinganalysis</baseResourceName> <baseResourceName>sequencinganalysis</baseResourceName>
<baseResourceName>sequencinglab</baseResourceName> <baseResourceName>sequencinglab</baseResourceName>
<baseResourceName>slot</baseResourceName> <baseResourceName>slot</baseResourceName>
<baseResourceName>specimen</baseResourceName> <baseResourceName>specimen</baseResourceName>
<baseResourceName>substance</baseResourceName> <baseResourceName>substance</baseResourceName>
<baseResourceName>supply</baseResourceName> <baseResourceName>supply</baseResourceName>
<!--<baseResourceName>template</baseResourceName>-->
<!--<baseResourceName>test</baseResourceName>-->
<baseResourceName>user</baseResourceName> <baseResourceName>user</baseResourceName>
<!-- <baseResourceName>valueset-extensions</baseResourceName> -->
<baseResourceName>valueset</baseResourceName> <baseResourceName>valueset</baseResourceName>
<!--<baseResourceName>vcfmeta</baseResourceName>-->
<!--<baseResourceName>vcfvariant</baseResourceName>-->
</baseResourceNames> </baseResourceNames>
<buildDatatypes>true</buildDatatypes> <buildDatatypes>true</buildDatatypes>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
@ -159,16 +305,4 @@
</pluginManagement> </pluginManagement>
</build> </build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven_javadoc_plugin_version}</version>
<configuration>
</configuration>
</plugin>
</plugins>
</reporting>
</project> </project>