From acbffecd151b70f6f0913e925c5d9b9ffcac819b Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@users.sourceforge.net>
Date: Wed, 25 Jun 2014 17:01:32 -0400
Subject: [PATCH] Still trying to get this working with Jenkins

---
 hapi-fhir-base/pom.xml                        | 55 +++++++++++--------
 .../server/tester/RestfulTesterServlet.java   |  4 +-
 hapi-fhir-jpaserver-base/pom.xml              | 13 ++++-
 3 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml
index fe1fc22ce6b..b733bb3e13b 100644
--- a/hapi-fhir-base/pom.xml
+++ b/hapi-fhir-base/pom.xml
@@ -55,8 +55,7 @@
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
 			<artifactId>thymeleaf</artifactId>
-			<!-- Note that 2.1.3 has a bug where it double escapes text -->
-			<version>2.1.2.RELEASE</version>
+			<version>2.1.3.RELEASE</version>
 			<optional>true</optional>
 		</dependency>
 
@@ -290,11 +289,8 @@
 					</reportSet>
 				</reportSets>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-linkcheck-plugin</artifactId>
-				<version>1.1</version>
-			</plugin>
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-linkcheck-plugin</artifactId> 
+				<version>1.1</version> </plugin> -->
 		</plugins>
 	</reporting>
 
@@ -311,6 +307,28 @@
 						<skip>false</skip>
 						<skipDeploy>false</skipDeploy>
 					</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>
 			</plugins>
 		</pluginManagement>
@@ -451,23 +469,12 @@
 				<filtering>true</filtering>
 			</resource>
 		</resources>
-		<extensions>
-			<extension>
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-scm</artifactId>
-				<version>2.6</version>
-			</extension>
-			<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>
+		<!-- <extensions> <extension> <groupId>org.apache.maven.wagon</groupId> 
+			<artifactId>wagon-scm</artifactId> <version>2.6</version> </extension> <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>
 
 	<profiles>
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/tester/RestfulTesterServlet.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/tester/RestfulTesterServlet.java
index c0b4ad05f1f..82ddb871e19 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/tester/RestfulTesterServlet.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/tester/RestfulTesterServlet.java
@@ -551,11 +551,11 @@ public class RestfulTesterServlet extends HttpServlet {
 			theContext.setVariable("bundle", bundle);
 			theContext.setVariable("resultStatus", resultStatus);
 			theContext.setVariable("requestUrl", requestUrl);
-			requestBody = StringEscapeUtils.escapeHtml4(requestBody);
+			String requestBodyText = StringEscapeUtils.escapeHtml4(requestBody);
 			theContext.setVariable("requestBody", requestBody);
 			theContext.setVariable("requestSyntaxHighlighterClass", requestSyntaxHighlighterClass);
 			String resultBodyText = StringEscapeUtils.escapeHtml4(resultBody);
-			theContext.setVariable("resultBody", resultBodyText);
+			theContext.setVariable("resultBody", resultBody);
 			theContext.setVariable("resultBodyIsLong", resultBodyText.length() > 1000);
 			theContext.setVariable("resultSyntaxHighlighterClass", resultSyntaxHighlighterClass);
 			theContext.setVariable("requestHeaders", requestHeaders);
diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index 78eba74bc49..4d40a266354 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -167,6 +167,8 @@
 		<mockito_version>1.9.5</mockito_version>
 		<slf4j_version>1.7.2</slf4j_version>
 		<spring_version>4.0.1.RELEASE</spring_version>
+		
+		<skip-hib4>false</skip-hib4>
 	</properties>
 
 	<build>
@@ -190,7 +192,7 @@
 				<configuration>
 					<force>true</force>
 					<target>SCRIPT</target>
-					<skip>false</skip>
+					<skip>${skip-hib4}</skip>
 				</configuration>
 				<dependencies>
 					<dependency>
@@ -256,4 +258,13 @@
 		</plugins>
 	</build>
 
+	<profiles>
+		<profile>
+			<id>JENKINS</id>
+			<properties>
+				<skip-hib4>true</skip-hib4>
+			</properties>
+		</profile>
+	</profiles>
+
 </project>