More travis

.travis.yml

@@ -1,7 +1,14 @@
+# Use docker-based build environment (instead of openvz)
+sudo: false
+
 language: java
 jdk:
   - oraclejdk7
 
-install: mvn clean install -Dcobertura.skip=true
+cache:
-script: mvn -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID -P COBERTURA clean cobertura:check
+  directories:
-
+      - '$HOME/.m2/repository'
+		
+install: /bin/true
+script:
+  - mvn -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID -P COBERTURA clean cobertura:check && mvn -B clean install -Dcobertura.skip=true

hapi-fhir-testconsolidated/pom.xml

@@ -216,6 +216,8 @@
 					<version>${maven_cobertura_plugin_version}</version>
 					<configuration>
 						<skip>false</skip>
+						<format>xml</format>
+						<maxmem>256m</maxmem>
 						<instrumentation>
 							<ignores>
 								<ignore>ca.uhn.fhir.model.dstu.valueset.*</ignore>
@@ -325,17 +327,18 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!--
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>cobertura-maven-plugin</artifactId>
 				<version>${maven_cobertura_plugin_version}</version>
 				<configuration>
 					<check>
-						<!-- <branchRate>85</branchRate> <lineRate>85</lineRate> <haltOnFailure>true</haltOnFailure> 
+						<branchRate>85</branchRate> <lineRate>85</lineRate> <haltOnFailure>true</haltOnFailure> 
 							<totalBranchRate>85</totalBranchRate> <totalLineRate>85</totalLineRate> <packageLineRate>85</packageLineRate> 
 							<packageBranchRate>85</packageBranchRate> <regexes> <regex> <pattern>com.example.reallyimportant.*</pattern> 
 							<branchRate>90</branchRate> <lineRate>80</lineRate> </regex> <regex> <pattern>com.example.boringcode.*</pattern> 
-							<branchRate>40</branchRate> <lineRate>30</lineRate> </regex> </regexes> -->
+							<branchRate>40</branchRate> <lineRate>30</lineRate> </regex> </regexes>
 					</check>
 				</configuration>
 				<executions>
@@ -347,6 +350,7 @@
 					</execution>
 				</executions>
 			</plugin>
+			-->
 		</plugins>
 		<resources>
 		</resources>

hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderClientMojo.java

@@ -156,7 +156,7 @@ public class TinderClientMojo extends AbstractMojo {
 		File file = new File(myDirectoryBase, myClientClassSimpleName + ".java");
 		FileWriter w = new FileWriter(file, false);
 
-		ourLog.info("Writing file: {}", file.getAbsolutePath());
+		ourLog.debug("Writing file: {}", file.getAbsolutePath());
 
 		VelocityContext ctx = new VelocityContext();
 		ctx.put("packageBase", myPackageBase);

hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java

@@ -121,8 +121,9 @@ public class TinderStructuresMojo extends AbstractMojo {
 			rp.getLocalImports().putAll(datatypeLocalImports);
 			datatypeLocalImports.putAll(rp.getLocalImports());
 
-			ourLog.info("Writing Resources...");
 			File resSubDirectoryBase = new File(directoryBase, "resource");
+			ourLog.info("Writing Resources to directory: {}", resSubDirectoryBase.getAbsolutePath());
+			
 			rp.combineContentMaps(dtp);
 			rp.writeAll(resSubDirectoryBase, resDirectoryBase, packageName);
 		}

hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ValueSetGenerator.java

@@ -274,7 +274,7 @@ public class ValueSetGenerator {
 		File f = new File(theOutputDirectory, theValueSetTm.getClassName() + ".java");
 		FileWriter w = new FileWriter(f, false);
 
-		ourLog.info("Writing file: {}", f.getAbsolutePath());
+		ourLog.debug("Writing file: {}", f.getAbsolutePath());
 
 		VelocityContext ctx = new VelocityContext();
 		ctx.put("valueSet", theValueSetTm);

hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureParser.java

@@ -396,7 +396,7 @@ public abstract class BaseStructureParser {
 	private void write(BaseRootType theResource, File theFile, String thePackageBase) throws IOException, MojoFailureException {
 		FileWriter w = new FileWriter(theFile, false);
 
-		ourLog.info("Writing file: {}", theFile.getAbsolutePath());
+		ourLog.debug("Writing file: {}", theFile.getAbsolutePath());
 
 		ArrayList<String> imports = new ArrayList<String>();
 		for (String next : myImports) {
@@ -486,7 +486,7 @@ public abstract class BaseStructureParser {
 		}
 
 		for (BaseRootType next : myResources) {
-			ourLog.info("Writing Resource {}", next.getName());
+			ourLog.debug("Writing Resource {}", next.getName());
 
 			scanForCorrections(next);
 			scanForTypeNameConflicts(next);