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

Roll back site plugin to 3.4. What a nightmare.

This commit is contained in:
jamesagnew 2016-03-16 07:01:20 -04:00
parent 96d6fa1b8a
commit 2ae2cbba23
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pom.xml
View File

@ -822,7 +822,14 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.5</version> <!--
Be careful upgrading the version of this plugin- 3.5 breaks the
relow-maven-skin that we use currently. Also once we move to 3.5
the site.xml <head> tag needs to have its contents put in a
CDATA block. What an unpleasant misadventure to figure that all
out......
-->
<version>3.4</version>
<configuration> <configuration>
<skip>false</skip> <skip>false</skip>
<skipDeploy>true</skipDeploy> <skipDeploy>true</skipDeploy>
@ -846,10 +853,12 @@
<groupId>org.apache.maven.scm</groupId> <groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId> <artifactId>maven-scm-api</artifactId>
</dependency> </dependency>
<!--
<dependency> <dependency>
<groupId>org.apache.maven.doxia</groupId> <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId> <artifactId>doxia-core</artifactId>
</dependency> </dependency>
-->
<dependency> <dependency>
<groupId>org.apache.maven.doxia</groupId> <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId> <artifactId>doxia-module-markdown</artifactId>
@ -1267,11 +1276,13 @@
<artifactId>maven-scm-api</artifactId> <artifactId>maven-scm-api</artifactId>
<version>1.9.4</version> <version>1.9.4</version>
</dependency> </dependency>
<!--
<dependency> <dependency>
<groupId>org.apache.maven.doxia</groupId> <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId> <artifactId>doxia-core</artifactId>
<version>1.7</version> <version>1.7</version>
</dependency> </dependency>
-->
<dependency> <dependency>
<groupId>org.apache.maven.doxia</groupId> <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId> <artifactId>doxia-module-markdown</artifactId>

2
src/changes/changes.xml
View File

@ -37,7 +37,7 @@
supports both styles. supports both styles.
<![CDATA[<br/><br/>]]> <![CDATA[<br/><br/>]]>
As a part of this change, a new enum called As a part of this change, a new enum called
<![CDATA[<a href="./apidocs/ca/uhn/fhir/rest/param/ParamPrefixEnum.html">ParamPrefixEnum</a>]] <![CDATA[<a href="./apidocs/ca/uhn/fhir/rest/param/ParamPrefixEnum.html">ParamPrefixEnum</a>]]>
has been introduced. This enum replaces the old has been introduced. This enum replaces the old
<![CDATA[<a href="./apidocs/ca/uhn/fhir/model/dstu/valueset/QuantityCompararatorEnum.html">QuantityCompararatorEnum</a>]]> <![CDATA[<a href="./apidocs/ca/uhn/fhir/model/dstu/valueset/QuantityCompararatorEnum.html">QuantityCompararatorEnum</a>]]>
which has a typo in its name and can not represent several new prefixes added since which has a typo in its name and can not represent several new prefixes added since

13
src/site/site.xml
View File

@ -32,13 +32,13 @@
<body> <body>
<head> <head>
<![CDATA[
<!-- Syntax Highlighter --> <!-- Syntax Highlighter -->
<script type="text/javascript" src="syntaxhighlighter/shCore.js" /> <script type="text/javascript" src="syntaxhighlighter/shCore.js"></script>
<script type="text/javascript" src="syntaxhighlighter/shBrushJScript.js" /> <script type="text/javascript" src="syntaxhighlighter/shBrushJScript.js"></script>
<script type="text/javascript" src="syntaxhighlighter/shBrushJava.js" /> <script type="text/javascript" src="syntaxhighlighter/shBrushJava.js"></script>
<script type="text/javascript" src="syntaxhighlighter/shBrushBash.js" /> <script type="text/javascript" src="syntaxhighlighter/shBrushBash.js"></script>
<script type="text/javascript" src="syntaxhighlighter/shBrushXml.js" /> <script type="text/javascript" src="syntaxhighlighter/shBrushXml.js"></script>
<link href="syntaxhighlighter/shCore.css" rel="stylesheet" type="text/css" /> <link href="syntaxhighlighter/shCore.css" rel="stylesheet" type="text/css" />
<link href="syntaxhighlighter/shThemeDefault.css" rel="stylesheet" type="text/css" /> <link href="syntaxhighlighter/shThemeDefault.css" rel="stylesheet" type="text/css" />
@ -50,7 +50,6 @@
<link rel="stylesheet" type="text/css" href="hapi.css" /> <link rel="stylesheet" type="text/css" href="hapi.css" />
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" /> <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" />
]]>
</head> </head>
<breadcrumbs> <breadcrumbs>