Work on site and android build
This commit is contained in:
jamesagnew
parent
46b6979125
commit
94429962cd
|
|
@ -0,0 +1,3 @@
|
|||
/target
|
||||
/bin
|
||||
/target/
|
||||
|
|
@ -0,0 +1,148 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>0.9-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>hapi-fhir-android</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>HAPI FHIR - Distribution Archive</name>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-base</artifactId>
|
||||
<version>0.9-SNAPSHOT</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpclient</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpcore</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-structures-dstu</artifactId>
|
||||
<version>0.9-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-structures-dstu2</artifactId>
|
||||
<version>0.9-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.phloc</groupId>
|
||||
<artifactId>phloc-schematron</artifactId>
|
||||
<version>${phloc_schematron_version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.phloc</groupId>
|
||||
<artifactId>phloc-commons</artifactId>
|
||||
<version>${phloc_commons_version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpclient-android</artifactId>
|
||||
<version>4.3.5.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-android</artifactId>
|
||||
<version>${slf4j_version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<configuration>
|
||||
<skip>true</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>2.3</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
||||
<createDependencyReducedPom>true</createDependencyReducedPom>
|
||||
<artifactSet>
|
||||
<includes>
|
||||
<!-- <include>javax.json:javax.json-api</include> -->
|
||||
<include>ca.uhn.hapi.fhir:hapi-fhir-base</include>
|
||||
<include>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu</include>
|
||||
<include>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2</include>
|
||||
<include>org.glassfish:javax.json</include>
|
||||
<include>org.codehaus.woodstox:woodstox-core-asl</include>
|
||||
<include>javax.xml.stream:stax-api</include>
|
||||
<include>org.codehaus.woodstox:stax2-api</include>
|
||||
<include>org.slf4j:slf4j*</include>
|
||||
<include>org.apache.commons:*</include>
|
||||
<include>org.apache.httpcomponents:*</include>
|
||||
</includes>
|
||||
</artifactSet>
|
||||
<relocations>
|
||||
<relocation>
|
||||
<pattern>javax.xml.stream</pattern>
|
||||
<shadedPattern>ca.uhn.fhir.repackage.javax.xml.stream</shadedPattern>
|
||||
</relocation>
|
||||
<relocation>
|
||||
<pattern>javax.json</pattern>
|
||||
<shadedPattern>ca.uhn.fhir.repackage.javax.json</shadedPattern>
|
||||
</relocation>
|
||||
</relocations>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>DIST</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<version>${maven_assembly_plugin_version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<attach>false</attach>
|
||||
<descriptors>
|
||||
<descriptor>${project.basedir}/src/assembly/hapi-fhir-all.xml</descriptor>
|
||||
<descriptor>${project.basedir}/src/assembly/hapi-fhir-jpaserver-example.xml</descriptor>
|
||||
</descriptors>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
2
pom.xml
2
pom.xml
|
|
@ -275,6 +275,7 @@
|
|||
<version>1.6</version>
|
||||
</dependency>
|
||||
<!--
|
||||
-->
|
||||
<dependency>
|
||||
<groupId>lt.velykis.maven.skins</groupId>
|
||||
<artifactId>reflow-velocity-tools</artifactId>
|
||||
|
|
@ -285,7 +286,6 @@
|
|||
<artifactId>velocity</artifactId>
|
||||
<version>1.7</version>
|
||||
</dependency>
|
||||
-->
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
|
||||
|
|
|
|||
|
|
@ -1,19 +1,11 @@
|
|||
|
||||
/*
|
||||
#bodyColumn {
|
||||
width: 78.5% !important;
|
||||
/*
|
||||
margin-left: 180px !important;
|
||||
*/
|
||||
}
|
||||
|
||||
#breadcrumbs {
|
||||
background: white;
|
||||
padding: 0px;
|
||||
/*
|
||||
border-bottom-width: 1px;
|
||||
border-bottom-color: #C0C0C0;
|
||||
border-bottom-style: solid;
|
||||
*/
|
||||
height: 40px;
|
||||
}
|
||||
|
||||
|
|
@ -49,6 +41,31 @@
|
|||
padding: 0px;
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
pre {
|
||||
padding: 3px;
|
||||
margin: 0 0 10px;
|
||||
font-size: 0.8em;
|
||||
line-height: 1.0em;
|
||||
}
|
||||
|
||||
.page-header {
|
||||
padding-bottom: 2px;
|
||||
margin: 0px 0 0px;
|
||||
}
|
||||
h1[id]:before,
|
||||
h2[id]:before,
|
||||
h3[id]:before,
|
||||
h4[id]:before,
|
||||
h5[id]:before,
|
||||
h6[id]:before,
|
||||
a[name]:before {
|
||||
height: auto;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
|
||||
.section h2 {
|
||||
border-bottom-width: 2px;
|
||||
border-bottom-style: solid;
|
||||
|
|
@ -71,6 +88,8 @@
|
|||
line-height: 1.3em;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
.syntaxhighlighter {
|
||||
font-size: 0.85em !important;
|
||||
}
|
||||
|
|
@ -125,9 +144,6 @@ a,a.externalLink,a:active,a:hover,a:link,a:visited {
|
|||
}
|
||||
|
||||
DIV.sidebar-nav UL LI UL LI {
|
||||
/*
|
||||
list-style: initial;
|
||||
list-style-type: circle;
|
||||
*/
|
||||
font-size: 0.9em;
|
||||
}
|
||||
*/
|
||||
|
|
@ -49,13 +49,15 @@
|
|||
<link rel="shortcut icon" href="https://github.com/jamesagnew/hapi-fhir/images/favicon.png" />
|
||||
<link rel="stylesheet" type="text/css" href="hapi.css" />
|
||||
</head>
|
||||
|
||||
|
||||
<!--
|
||||
<links>
|
||||
<item name="GitHub Page" href="https://github.com/jamesagnew/hapi-fhir/" />
|
||||
<item name="hl7.org" href="http://hl7.org/" />
|
||||
<item name="University Health Network" href="http://www.uhn.ca/" />
|
||||
</links>
|
||||
|
||||
-->
|
||||
|
||||
<menu name="HAPI FHIR" inherit="top">
|
||||
<item name="Welcome" href="index.html" />
|
||||
<item name="Download" href="./download.html" />
|
||||
|
|
@ -121,19 +123,19 @@
|
|||
|
||||
</body>
|
||||
|
||||
<!--
|
||||
<skin>
|
||||
<groupId>org.apache.maven.skins</groupId>
|
||||
<artifactId>maven-fluido-skin</artifactId>
|
||||
<version>1.3.1</version>
|
||||
</skin>
|
||||
-->
|
||||
|
||||
<!--
|
||||
<skin>
|
||||
<groupId>lt.velykis.maven.skins</groupId>
|
||||
<artifactId>reflow-maven-skin</artifactId>
|
||||
<version>1.1.1</version>
|
||||
</skin>
|
||||
-->
|
||||
|
||||
<custom>
|
||||
<reflowSkin>
|
||||
|
|
@ -143,7 +145,9 @@
|
|||
<column>HAPI FHIR|Test Servers</column>
|
||||
<column>Get Help|Reports</column>
|
||||
</bottomNav>
|
||||
<!--
|
||||
<highlightJs>true</highlightJs>
|
||||
-->
|
||||
</reflowSkin>
|
||||
|
||||
<fluidoSkin>
|
||||
|
|
|
|||
Loading…
Reference in New Issue