diff --git a/src/uk/org/floop/jenkins_pmd/Drafter.groovy b/src/uk/org/floop/jenkins_pmd/Drafter.groovy index 8012e0f..b37a485 100644 --- a/src/uk/org/floop/jenkins_pmd/Drafter.groovy +++ b/src/uk/org/floop/jenkins_pmd/Drafter.groovy @@ -97,7 +97,7 @@ while(waiting) { sleep(holdOffTime * 1000) HttpResponse response = getExec().execute( - Request.Get(apiBase.resolve('/status/writes-locked')) + Request.Get(apiBase.resolve('/v1/status/writes-locked')) .addHeader('Accept', 'application/json') .userAgent(PMDConfig.UA) ).returnResponse() diff --git a/test/integration/groovy/uk/org/floop/jenkins_pmd/DrafterTests.groovy b/test/integration/groovy/uk/org/floop/jenkins_pmd/DrafterTests.groovy index eceaf2e..fe86623 100644 --- a/test/integration/groovy/uk/org/floop/jenkins_pmd/DrafterTests.groovy +++ b/test/integration/groovy/uk/org/floop/jenkins_pmd/DrafterTests.groovy @@ -372,18 +372,18 @@ .withHeader('Accept', equalTo('application/json')) .withBasicAuth('admin', 'admin') .willReturn(aResponse().withStatus(202).withBodyFile('cubeImportJob.json'))) - instanceRule.stubFor(get('/status/finished-jobs/4fc9ad42-f964-4f56-a1ab-a00bd622b84c') + instanceRule.stubFor(get('/v1/status/finished-jobs/4fc9ad42-f964-4f56-a1ab-a00bd622b84c') .withHeader('Accept', equalTo('application/json')) .withBasicAuth('admin', 'admin') .willReturn(ok().withBodyFile('finishedImportJobOk.json'))) - instanceRule.stubFor(get('/status/writes-locked') + instanceRule.stubFor(get('/v1/status/writes-locked') .inScenario("Write lock") .whenScenarioStateIs(Scenario.STARTED) .withHeader('Accept', equalTo('application/json')) .withBasicAuth('admin', 'admin') .willReturn(ok().withBody('false')) .willSetStateTo('Still Publishing')) - instanceRule.stubFor(get('/status/writes-locked') + instanceRule.stubFor(get('/v1/status/writes-locked') .inScenario("Write lock") .whenScenarioStateIs('Still publishing') .withHeader('Accept', equalTo('application/json')) diff --git a/test/resources/__files/cubeImportJob.json b/test/resources/__files/cubeImportJob.json index 60ed849..d5637b5 100644 --- a/test/resources/__files/cubeImportJob.json +++ b/test/resources/__files/cubeImportJob.json @@ -1 +1 @@ -{"type":"ok","finished-job":"/status/finished-jobs/4fc9ad42-f964-4f56-a1ab-a00bd622b84c","restart-id":"a2a8f11d-96fd-466e-adaf-85e8d07d4956"} \ No newline at end of file +{"type":"ok","finished-job":"/v1/status/finished-jobs/4fc9ad42-f964-4f56-a1ab-a00bd622b84c","restart-id":"a2a8f11d-96fd-466e-adaf-85e8d07d4956"} \ No newline at end of file