Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/86553f17 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/86553f17 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/86553f17 Branch: refs/heads/3.1.x-fixes Commit: 86553f1706ca023bc617837702d4e541ede59b93 Parents: 74e2f0b Author: Colm O hEigeartaigh <[email protected]> Authored: Mon May 29 13:20:43 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon May 29 13:20:43 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/86553f17/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java ---------------------------------------------------------------------- diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java index f50dee8..2a74221 100644 --- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java +++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java @@ -57,15 +57,11 @@ public class BasicIntegrationTest { @Configuration public Option[] getConfig() { -<<<<<<< HEAD - String karafVersion = System.getProperty("karaf.version", "3.0.4"); -======= String port = TestUtil.getPortNumber(BasicIntegrationTest.class); System.setProperty("BasicIntegrationTest.PORT", port); String xkmsEndpoint = "http://localhost:"; + port + "/cxf/XKMS"; - String karafVersion = System.getProperty("karaf.version", "4.0.8"); ->>>>>>> da59b25117... Updating XKMS tests to use random ports + String karafVersion = System.getProperty("karaf.version", "3.0.4"); String localRepository = System.getProperty("localRepository"); MavenArtifactUrlReference karafUrl = maven() // .groupId("org.apache.karaf") //
