Commit b2f2b206 authored by Yves's avatar Yves

Merge branch 'dev' into mihai_equal_and_hash

parents 2aaab7ed 3f549e62
Pipeline #48963193 passed with stage
in 1 minute and 21 seconds
......@@ -76,7 +76,7 @@ For extra details please refer to [the original GitLab guide](https://docs.gitla
When you get done with the Bitbucket integration, make sure the
following variables are declared:
`OKAPI_TRIGGER_TOKEN`: the trigger token which has to be added to the
`TRIGGER_TOKEN_OKAPI`: the trigger token which has to be added to the
Okapi project before that (needs to be added under
**Settings > CI/CD > Variables**)
......@@ -87,7 +87,7 @@ Okapi project before that (needs to be added under
So, the following line from the `.gitlab-ci.yml` can be executed successfully:
```
curl -X POST -F token=${OKAPI_TRIGGER_TOKEN} -F ref=${OKAPI_SNAPSHOTS_BRANCH} https://gitlab.com/api/v4/projects/${OKAPI_PROJECT_ID}/trigger/pipeline
curl -X POST -F token=${TRIGGER_TOKEN_OKAPI} -F ref=${OKAPI_SNAPSHOTS_BRANCH} https://gitlab.com/api/v4/projects/${OKAPI_PROJECT_ID}/trigger/pipeline
```
# Sonatype integration
......
......@@ -88,7 +88,7 @@ release:
okapi-snapshot-trigger:
stage: trigger
script:
- curl -X POST -F token=${OKAPI_TRIGGER_TOKEN} -F ref=${OKAPI_SNAPSHOTS_BRANCH} https://gitlab.com/api/v4/projects/${OKAPI_PROJECT_ID}/trigger/pipeline
- curl -X POST -F token=${TRIGGER_TOKEN_OKAPI} -F ref=${OKAPI_SNAPSHOTS_BRANCH} https://gitlab.com/api/v4/projects/${OKAPI_PROJECT_ID}/trigger/pipeline
- touch ${CI_GITLAB_PATH}/${CI_JOB_NAME}-passed
only:
variables:
......
......@@ -41,7 +41,10 @@ echo "Pushing status to $BITBUCKET_STATUS_API..."
curl --request POST $BITBUCKET_STATUS_API \
--user $BITBUCKET_USERNAME:$BITBUCKET_ACCESS_TOKEN \
--header "Content-Type:application/json" \
--write-out "[%{http_code}]" \
--silent \
--show-error \
--output /dev/null \
--data "{ \"state\": \"$BITBUCKET_STATE\",
\"key\": \"$BITBUCKET_KEY\",
\"name\": \"$BITBUCKET_NAME\",
......
......@@ -84,12 +84,17 @@ public class URIPrefixesTest {
@Test
public void testRegistryLoader () {
URIPrefixes upr = new URIPrefixes();
Map<String, List<String>> map = upr.loadFromRegistry();
assertTrue(map.size()>0);
List<String> uris = map.get("my");
assertTrue(null!=uris);
assertEquals(1, uris.size());
assertEquals("http://example.org/myXLIFFExtensionURI", uris.get(0));
try {
Map<String, List<String>> map = upr.loadFromRegistry();
assertTrue(map.size()>0);
List<String> uris = map.get("my");
assertTrue(null!=uris);
assertEquals(1, uris.size());
assertEquals("http://example.org/myXLIFFExtensionURI", uris.get(0));
}
catch ( XLIFFException e ) {
System.err.println("WARNING: Error when accessing the prefix registry: " + e.getMessage());
}
}
}
......@@ -175,6 +175,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<configuration>
<skip>true</skip>
</configuration>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment