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

Still trying to get this working with Jenkins

This commit is contained in:
jamesagnew 2014-06-25 17:01:32 -04:00
parent cf63f6bacf
commit acbffecd15
3 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,8 +55,7 @@
<dependency> <dependency>
<groupId>org.thymeleaf</groupId> <groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId> <artifactId>thymeleaf</artifactId>
<!-- Note that 2.1.3 has a bug where it double escapes text --> <version>2.1.3.RELEASE</version>
<version>2.1.2.RELEASE</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@ -290,11 +289,8 @@
</reportSet> </reportSet>
</reportSets> </reportSets>
</plugin> </plugin>
<plugin> <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-linkcheck-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId> <version>1.1</version> </plugin> -->
<artifactId>maven-linkcheck-plugin</artifactId>
<version>1.1</version>
</plugin>
</plugins> </plugins>
</reporting> </reporting>
@ -311,6 +307,28 @@
<skip>false</skip> <skip>false</skip>
<skipDeploy>false</skipDeploy> <skipDeploy>false</skipDeploy>
</configuration> </configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-scm</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-manager-plexus</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
<version>1.9</version>
</dependency>
</dependencies>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
@ -451,23 +469,12 @@
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>
</resources> </resources>
<extensions> <!-- <extensions> <extension> <groupId>org.apache.maven.wagon</groupId>
<extension> <artifactId>wagon-scm</artifactId> <version>2.6</version> </extension> <extension>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.scm</groupId> <artifactId>maven-scm-manager-plexus</artifactId>
<artifactId>wagon-scm</artifactId> <version>1.9</version> </extension> <extension> <groupId>org.apache.maven.scm</groupId>
<version>2.6</version> <artifactId>maven-scm-provider-gitexe</artifactId> <version>1.9</version>
</extension> </extension> </extensions> -->
<extension>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-manager-plexus</artifactId>
<version>1.9</version>
</extension>
<extension>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9</version>
</extension>
</extensions>
</build> </build>
<profiles> <profiles>

4
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/tester/RestfulTesterServlet.java
View File

@ -551,11 +551,11 @@ public class RestfulTesterServlet extends HttpServlet {
theContext.setVariable("bundle", bundle); theContext.setVariable("bundle", bundle);
theContext.setVariable("resultStatus", resultStatus); theContext.setVariable("resultStatus", resultStatus);
theContext.setVariable("requestUrl", requestUrl); theContext.setVariable("requestUrl", requestUrl);
requestBody = StringEscapeUtils.escapeHtml4(requestBody); String requestBodyText = StringEscapeUtils.escapeHtml4(requestBody);
theContext.setVariable("requestBody", requestBody); theContext.setVariable("requestBody", requestBody);
theContext.setVariable("requestSyntaxHighlighterClass", requestSyntaxHighlighterClass); theContext.setVariable("requestSyntaxHighlighterClass", requestSyntaxHighlighterClass);
String resultBodyText = StringEscapeUtils.escapeHtml4(resultBody); String resultBodyText = StringEscapeUtils.escapeHtml4(resultBody);
theContext.setVariable("resultBody", resultBodyText); theContext.setVariable("resultBody", resultBody);
theContext.setVariable("resultBodyIsLong", resultBodyText.length() > 1000); theContext.setVariable("resultBodyIsLong", resultBodyText.length() > 1000);
theContext.setVariable("resultSyntaxHighlighterClass", resultSyntaxHighlighterClass); theContext.setVariable("resultSyntaxHighlighterClass", resultSyntaxHighlighterClass);
theContext.setVariable("requestHeaders", requestHeaders); theContext.setVariable("requestHeaders", requestHeaders);

13
hapi-fhir-jpaserver-base/pom.xml
View File

@ -167,6 +167,8 @@
<mockito_version>1.9.5</mockito_version> <mockito_version>1.9.5</mockito_version>
<slf4j_version>1.7.2</slf4j_version> <slf4j_version>1.7.2</slf4j_version>
<spring_version>4.0.1.RELEASE</spring_version> <spring_version>4.0.1.RELEASE</spring_version>
<skip-hib4>false</skip-hib4>
</properties> </properties>
<build> <build>
@ -190,7 +192,7 @@
<configuration> <configuration>
<force>true</force> <force>true</force>
<target>SCRIPT</target> <target>SCRIPT</target>
<skip>false</skip> <skip>${skip-hib4}</skip>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>
@ -256,4 +258,13 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>JENKINS</id>
<properties>
<skip-hib4>true</skip-hib4>
</properties>
</profile>
</profiles>
</project> </project>