From a787970cb2dabf1888b77449202e91412e451016 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Tue, 2 Aug 2016 20:31:05 -0400 Subject: [PATCH] Add hapi-fhir-client-okhttp to JaCoCo coverage (#416) --- hapi-fhir-client-okhttp/pom.xml | 121 ++++++ .../okhttp/client/OkHttpRestfulClient.java | 0 .../client/OkHttpRestfulClientFactory.java | 0 .../okhttp/client/OkHttpRestfulRequest.java | 0 .../okhttp/client/OkHttpRestfulResponse.java | 0 .../uhn/fhir/okhttp/utils/UrlStringUtils.java | 0 .../okhttp/GenericOkHttpClientDstu2Test.java | 0 .../OkHttpRestfulClientFactoryTest.java | 0 .../fhir/okhttp/RandomServerPortProvider.java | 0 .../client/OkHttpRestfulClientTest.java | 0 .../src/test/resources/bundle_orion.xml | 0 hapi-fhir-cobertura/.classpath | 10 - hapi-fhir-cobertura/.project | 29 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../.settings/org.eclipse.m2e.core.prefs | 4 - ....eclipse.wst.common.project.facet.core.xml | 4 - .../segments_1 | Bin 71 -> 0 bytes .../write.lock | 0 hapi-fhir-cobertura/pom.xml | 410 ------------------ hapi-fhir-cobertura/pom.xml.backup | 378 ---------------- hapi-fhir-jacoco/pom.xml | 68 +-- hapi-fhir-okhttp/pom.xml | 95 ---- pom.xml | 1 + 24 files changed, 131 insertions(+), 998 deletions(-) create mode 100644 hapi-fhir-client-okhttp/pom.xml rename {hapi-fhir-okhttp => hapi-fhir-client-okhttp}/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java (100%) rename {hapi-fhir-okhttp => hapi-fhir-client-okhttp}/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java (100%) rename {hapi-fhir-okhttp => hapi-fhir-client-okhttp}/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java (100%) rename {hapi-fhir-okhttp => hapi-fhir-client-okhttp}/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java (100%) rename {hapi-fhir-okhttp => hapi-fhir-client-okhttp}/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java (100%) rename {hapi-fhir-okhttp => hapi-fhir-client-okhttp}/src/test/java/ca/uhn/fhir/okhttp/GenericOkHttpClientDstu2Test.java (100%) rename {hapi-fhir-okhttp => hapi-fhir-client-okhttp}/src/test/java/ca/uhn/fhir/okhttp/OkHttpRestfulClientFactoryTest.java (100%) rename {hapi-fhir-okhttp => hapi-fhir-client-okhttp}/src/test/java/ca/uhn/fhir/okhttp/RandomServerPortProvider.java (100%) rename {hapi-fhir-okhttp => hapi-fhir-client-okhttp}/src/test/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientTest.java (100%) rename {hapi-fhir-okhttp => hapi-fhir-client-okhttp}/src/test/resources/bundle_orion.xml (100%) delete mode 100644 hapi-fhir-cobertura/.classpath delete mode 100644 hapi-fhir-cobertura/.project delete mode 100644 hapi-fhir-cobertura/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-cobertura/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-cobertura/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-cobertura/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-cobertura/ca.uhn.fhir.jpa.entity.TermConcept/segments_1 delete mode 100644 hapi-fhir-cobertura/ca.uhn.fhir.jpa.entity.TermConcept/write.lock delete mode 100644 hapi-fhir-cobertura/pom.xml delete mode 100644 hapi-fhir-cobertura/pom.xml.backup delete mode 100644 hapi-fhir-okhttp/pom.xml diff --git a/hapi-fhir-client-okhttp/pom.xml b/hapi-fhir-client-okhttp/pom.xml new file mode 100644 index 00000000000..e3b9185e283 --- /dev/null +++ b/hapi-fhir-client-okhttp/pom.xml @@ -0,0 +1,121 @@ + + + + hapi-fhir + ca.uhn.hapi.fhir + 2.0-SNAPSHOT + + 4.0.0 + + hapi-fhir-client-okhttp + jar + + HAPI FHIR OkHttp Client + + + + + ca.uhn.hapi.fhir + hapi-fhir-base + 2.0-SNAPSHOT + + + commons-logging + commons-logging + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu2 + 2.0-SNAPSHOT + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu3 + 2.0-SNAPSHOT + + + + com.squareup.okhttp3 + okhttp + 3.4.1 + + + + + com.google.guava + guava + test + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-servlet + test + + + org.glassfish.jersey.core + jersey-server + test + + + org.glassfish.jersey.containers + jersey-container-servlet-core + test + + + org.glassfish.jersey.containers + jersey-container-jetty-http + test + + + org.glassfish.jersey.media + jersey-media-moxy + test + + + + + + + + org.jacoco + jacoco-maven-plugin + + + ${basedir}/target/classes + ${basedir}/../hapi-fhir-base/target/classes + + + ${basedir}/src/main/java + ${basedir}/../hapi-fhir-base/src/main/java + + true + + + + default-prepare-agent + + prepare-agent + + + + + + + + \ No newline at end of file diff --git a/hapi-fhir-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java similarity index 100% rename from hapi-fhir-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java rename to hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java diff --git a/hapi-fhir-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java similarity index 100% rename from hapi-fhir-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java rename to hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java diff --git a/hapi-fhir-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java similarity index 100% rename from hapi-fhir-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java rename to hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java diff --git a/hapi-fhir-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java similarity index 100% rename from hapi-fhir-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java rename to hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java diff --git a/hapi-fhir-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java similarity index 100% rename from hapi-fhir-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java rename to hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java diff --git a/hapi-fhir-okhttp/src/test/java/ca/uhn/fhir/okhttp/GenericOkHttpClientDstu2Test.java b/hapi-fhir-client-okhttp/src/test/java/ca/uhn/fhir/okhttp/GenericOkHttpClientDstu2Test.java similarity index 100% rename from hapi-fhir-okhttp/src/test/java/ca/uhn/fhir/okhttp/GenericOkHttpClientDstu2Test.java rename to hapi-fhir-client-okhttp/src/test/java/ca/uhn/fhir/okhttp/GenericOkHttpClientDstu2Test.java diff --git a/hapi-fhir-okhttp/src/test/java/ca/uhn/fhir/okhttp/OkHttpRestfulClientFactoryTest.java b/hapi-fhir-client-okhttp/src/test/java/ca/uhn/fhir/okhttp/OkHttpRestfulClientFactoryTest.java similarity index 100% rename from hapi-fhir-okhttp/src/test/java/ca/uhn/fhir/okhttp/OkHttpRestfulClientFactoryTest.java rename to hapi-fhir-client-okhttp/src/test/java/ca/uhn/fhir/okhttp/OkHttpRestfulClientFactoryTest.java diff --git a/hapi-fhir-okhttp/src/test/java/ca/uhn/fhir/okhttp/RandomServerPortProvider.java b/hapi-fhir-client-okhttp/src/test/java/ca/uhn/fhir/okhttp/RandomServerPortProvider.java similarity index 100% rename from hapi-fhir-okhttp/src/test/java/ca/uhn/fhir/okhttp/RandomServerPortProvider.java rename to hapi-fhir-client-okhttp/src/test/java/ca/uhn/fhir/okhttp/RandomServerPortProvider.java diff --git a/hapi-fhir-okhttp/src/test/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientTest.java b/hapi-fhir-client-okhttp/src/test/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientTest.java similarity index 100% rename from hapi-fhir-okhttp/src/test/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientTest.java rename to hapi-fhir-client-okhttp/src/test/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientTest.java diff --git a/hapi-fhir-okhttp/src/test/resources/bundle_orion.xml b/hapi-fhir-client-okhttp/src/test/resources/bundle_orion.xml similarity index 100% rename from hapi-fhir-okhttp/src/test/resources/bundle_orion.xml rename to hapi-fhir-client-okhttp/src/test/resources/bundle_orion.xml diff --git a/hapi-fhir-cobertura/.classpath b/hapi-fhir-cobertura/.classpath deleted file mode 100644 index 534617148b0..00000000000 --- a/hapi-fhir-cobertura/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/hapi-fhir-cobertura/.project b/hapi-fhir-cobertura/.project deleted file mode 100644 index f339ae91d38..00000000000 --- a/hapi-fhir-cobertura/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - hapi-fhir-cobertura - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/hapi-fhir-cobertura/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-cobertura/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-cobertura/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-cobertura/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-cobertura/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f42de363afa..00000000000 --- a/hapi-fhir-cobertura/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-cobertura/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-cobertura/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-cobertura/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-cobertura/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-cobertura/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index bc0009a4558..00000000000 --- a/hapi-fhir-cobertura/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hapi-fhir-cobertura/ca.uhn.fhir.jpa.entity.TermConcept/segments_1 b/hapi-fhir-cobertura/ca.uhn.fhir.jpa.entity.TermConcept/segments_1 deleted file mode 100644 index 03d026d2d796bb6a1ba98c24e24f2bea3f05397f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 71 zcmcD&o+HjtoSL4SnpaZHz`(#}U!=I-v*h?n%VR8}r4KzGFdDKlGXf<*fC)kY$padb MU%)uVfgdjc0LK^+NdN!< diff --git a/hapi-fhir-cobertura/ca.uhn.fhir.jpa.entity.TermConcept/write.lock b/hapi-fhir-cobertura/ca.uhn.fhir.jpa.entity.TermConcept/write.lock deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/hapi-fhir-cobertura/pom.xml b/hapi-fhir-cobertura/pom.xml deleted file mode 100644 index 39ccb98db0d..00000000000 --- a/hapi-fhir-cobertura/pom.xml +++ /dev/null @@ -1,410 +0,0 @@ - - 4.0.0 - - - - ca.uhn.hapi.fhir - hapi-deployable-pom - 2.0-SNAPSHOT - ../hapi-deployable-pom/pom.xml - - - hapi-fhir-cobertura - jar - - HAPI FHIR - Cobertura Test Coverage - - - - ca.uhn.hapi.fhir - hapi-fhir-base - 2.0-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu - 2.0-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2 - 2.0-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu3 - 2.0-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-structures-hl7org-dstu2 - 2.0-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-validation-resources-dstu2 - 2.0-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-validation-resources-dstu3 - 2.0-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-jpaserver-base - 2.0-SNAPSHOT - - - - com.phloc - phloc-schematron - - - com.phloc - phloc-commons - - - org.thymeleaf - thymeleaf - - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - - org.apache.derby - derby - test - - - org.apache.commons - commons-dbcp2 - test - - - - javax.servlet - javax.servlet-api - provided - - - - org.eclipse.jetty - jetty-servlets - test - - - org.eclipse.jetty - jetty-servlet - test - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-util - test - - - xmlunit - xmlunit - test - - - - net.sf.json-lib - json-lib - jdk15 - test - - - commons-logging - commons-logging - - - - - net.sf.json-lib - json-lib - jdk15-sources - test - - - directory-naming - naming-java - test - - - commons-logging - commons-logging - - - - - com.google.guava - guava - - - org.ebaysf.web - cors-filter - test - - - xmlunit - xmlunit - test - - - org.springframework - spring-test - test - - - org.eclipse.jetty.websocket - websocket-api - test - - - org.eclipse.jetty.websocket - websocket-client - test - - - org.eclipse.jetty.websocket - websocket-server - test - - - - - - - - - - - org.apache.maven.plugins - maven-site-plugin - - true - - - - org.codehaus.mojo - cobertura-maven-plugin - - false - - html - xml - - 712m - - - ca.uhn.fhir.model.dstu.valueset.* - - - **/valueset/*.class - **/exceptions/*.class - - ca.uhn.fhir.util.CoverageIgnore - - - - - - verify - - check - - - - - - - - - org.eluder.coveralls - coveralls-maven-plugin - - - - ${basedir}/target/coverage.xml - - - UTF-8 - travis-ci - ${env.TRAVIS_JOB_ID} - - ../hapi-fhir-structures-dstu/src/test/java - ../hapi-fhir-structures-dstu2/src/test/java - ../hapi-fhir-structures-hl7org-dstu2/src/test/java - ../hapi-fhir-jpaserver-base/src/test/java - ../hapi-fhir-base/src/main/java - ../hapi-fhir-jpaserver-base/src/main/java - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - generate-sources - - add-source - - - - ../hapi-fhir-base/src/main/java - ../hapi-fhir-jpaserver-base/src/main/java - - - - - add-test-source - generate-test-sources - - add-test-source - - - - ../hapi-fhir-structures-dstu/src/test/java - ../hapi-fhir-structures-dstu2/src/test/java - ../hapi-fhir-structures-hl7org-dstu2/src/test/java - ../hapi-fhir-structures-dstu3/src/test/java - ../hapi-fhir-jpaserver-base/src/test/java - ../hapi-fhir-base/src/test/java - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - alphabetical - -Xmx1624m - true - - - - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - true - - - - - verify - - check - - - - - - - - - - - - ../hapi-fhir-base/src/test/resources - - - ../hapi-fhir-jpaserver-base/src/test/resources - - - ../hapi-fhir-structures-dstu/src/test/resources - - - ../hapi-fhir-structures-dstu2/src/test/resources - - - ../hapi-fhir-structures-hl7org-dstu2/src/test/resources - - - ../hapi-fhir-structures-dstu3/src/test/resources - - - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - cobertura - - - - true - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven_project_info_plugin_version} - - true - - - - - - diff --git a/hapi-fhir-cobertura/pom.xml.backup b/hapi-fhir-cobertura/pom.xml.backup deleted file mode 100644 index 298372f3c96..00000000000 --- a/hapi-fhir-cobertura/pom.xml.backup +++ /dev/null @@ -1,378 +0,0 @@ - - 4.0.0 - - - - ca.uhn.hapi.fhir - hapi-deployable-pom - 1.2-SNAPSHOT - ../hapi-deployable-pom/pom.xml - - - hapi-fhir-cobertura - jar - - HAPI FHIR - Cobertura Test Coverage - - - - ca.uhn.hapi.fhir - hapi-fhir-base - 1.2-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu - 1.2-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2 - 1.2-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-structures-hl7org-dstu2 - 1.2-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-jpaserver-base - 1.2-SNAPSHOT - - - - com.phloc - phloc-schematron - ${phloc_schematron_version} - - - com.phloc - phloc-commons - ${phloc_commons_version} - - - org.thymeleaf - thymeleaf - ${thymeleaf-version} - - - - - org.slf4j - slf4j-api - 1.6.0 - - - ch.qos.logback - logback-classic - - - - - org.apache.derby - derby - test - - - org.apache.commons - commons-dbcp2 - test - - - - javax.servlet - javax.servlet-api - provided - - - - org.eclipse.jetty - jetty-servlets - test - - - org.eclipse.jetty - jetty-servlet - test - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-util - test - - - net.sf.json-lib - json-lib - 2.4 - jdk15 - test - - - commons-logging - commons-logging - - - - - net.sf.json-lib - json-lib - 2.4 - jdk15-sources - test - - - directory-naming - naming-java - 0.8 - test - - - commons-logging - commons-logging - - - - - com.google.guava - guava - ${guava_version} - - - org.ebaysf.web - cors-filter - ${ebay_cors_filter_version} - test - - - xmlunit - xmlunit - ${xmlunit_version} - test - - - - - - - - - - - - org.apache.maven.plugins - maven-site-plugin - - true - - - - org.codehaus.mojo - cobertura-maven-plugin - - false - - html - xml - - 256m - - - ca.uhn.fhir.model.dstu.valueset.* - - - **/valueset/*.class - **/exceptions/*.class - - - - - - - verify - - check - - - - - - - - - org.eluder.coveralls - coveralls-maven-plugin - 3.1.0 - - - - ${basedir}/target/coverage.xml - - - UTF-8 - travis-ci - ${env.TRAVIS_JOB_ID} - - ../hapi-fhir-structures-dstu/src/test/java - ../hapi-fhir-structures-dstu2/src/test/java - ../hapi-fhir-structures-hl7org-dstu2/src/test/java - ../hapi-fhir-jpaserver-base/src/test/java - ../hapi-fhir-base/src/main/java - ../hapi-fhir-jpaserver-base/src/main/java - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${maven_build_helper_plugin_version} - - - add-source - generate-sources - - add-source - - - - ../hapi-fhir-base/src/main/java - ../hapi-fhir-jpaserver-base/src/main/java - - - - - add-test-source - generate-test-sources - - add-test-source - - - - ../hapi-fhir-structures-dstu/src/test/java - ../hapi-fhir-structures-dstu2/src/test/java - ../hapi-fhir-structures-hl7org-dstu2/src/test/java - ../hapi-fhir-jpaserver-base/src/test/java - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - alphabetical - -Xms512m -Xmx1024m - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - true - - - - - verify - - check - - - - - - - - - - - ../hapi-fhir-jpaserver-base/src/test/resources - - - ../hapi-fhir-structures-dstu/src/test/resources - - - ../hapi-fhir-structures-dstu2/src/test/resources - - - ../hapi-fhir-structures-hl7org-dstu2/src/test/resources - - - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - cobertura - - - - true - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven_project_info_plugin_version} - - true - - - - - - - - TRAVIS - - - - org.apache.maven.plugins - maven-surefire-plugin - - - false - - - - - - - diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml index cbdd5361599..ab4e384fa5d 100644 --- a/hapi-fhir-jacoco/pom.xml +++ b/hapi-fhir-jacoco/pom.xml @@ -56,6 +56,11 @@ hapi-fhir-jpaserver-base 2.0-SNAPSHOT + + ca.uhn.hapi.fhir + hapi-fhir-client-okhttp + 2.0-SNAPSHOT + com.phloc @@ -226,6 +231,7 @@ hapi-fhir-structures-hl7org-dstu2/target/jacoco.exec hapi-fhir-structures-dstu3/target/jacoco.exec hapi-fhir-jpaserver-base/target/jacoco.exec + hapi-fhir-client-okhttp/target/jacoco.exec @@ -241,12 +247,13 @@ travis-ci ${env.TRAVIS_JOB_ID} + ../hapi-fhir-base/src/main/java ../hapi-fhir-structures-dstu/src/test/java ../hapi-fhir-structures-dstu2/src/test/java ../hapi-fhir-structures-hl7org-dstu2/src/test/java + ../hapi-fhir-structures-dstu3/src/test/java ../hapi-fhir-jpaserver-base/src/test/java - ../hapi-fhir-base/src/main/java - ../hapi-fhir-jpaserver-base/src/main/java + ../hapi-fhir-client-okhttp/src/main/java @@ -267,25 +274,6 @@ - @@ -303,47 +291,9 @@ - - - - - ../hapi-fhir-base/src/test/resources - - - ../hapi-fhir-jpaserver-base/src/test/resources - - - ../hapi-fhir-structures-dstu/src/test/resources - - - ../hapi-fhir-structures-dstu2/src/test/resources - - - ../hapi-fhir-structures-hl7org-dstu2/src/test/resources - - - ../hapi-fhir-structures-dstu3/src/test/resources - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - cobertura - - - - true - - - - - org.apache.maven.plugins maven-project-info-reports-plugin diff --git a/hapi-fhir-okhttp/pom.xml b/hapi-fhir-okhttp/pom.xml deleted file mode 100644 index c2ff2001c09..00000000000 --- a/hapi-fhir-okhttp/pom.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - hapi-fhir - ca.uhn.hapi.fhir - 2.0-SNAPSHOT - - 4.0.0 - - hapi-fhir-okhttp - jar - - HAPI FHIR OkHttp Client - - - - - ca.uhn.hapi.fhir - hapi-fhir-base - 2.0-SNAPSHOT - - - commons-logging - commons-logging - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2 - 2.0-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu3 - 2.0-SNAPSHOT - - - - com.squareup.okhttp3 - okhttp - 3.4.1 - - - - - com.google.guava - guava - test - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-servlet - test - - - org.glassfish.jersey.core - jersey-server - test - - - org.glassfish.jersey.containers - jersey-container-servlet-core - test - - - org.glassfish.jersey.containers - jersey-container-jetty-http - test - - - org.glassfish.jersey.media - jersey-media-moxy - test - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 31a4d406523..0eaa72cab06 100644 --- a/pom.xml +++ b/pom.xml @@ -1559,6 +1559,7 @@ restful-server-example-test hapi-fhir-testpage-overlay hapi-fhir-jpaserver-uhnfhirtest + hapi-fhir-client-okhttp hapi-fhir-android hapi-fhir-cli hapi-fhir-dist