Merge branch 'master' into 'develop'

Master

See merge request !6

.gitlab-ci.yml

@@ -31,4 +31,9 @@ code:
 quality:
   stage: tests
   extends:
-    - .testQualityForJavaWithSonarqube
\ No newline at end of file
+    - .testQualityForJavaWithSonarqube
+
+release/code:
+  stage: release
+  extends:
+    - .releaseCodeForJava

access-token-provider-api/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <artifactId>app.access-token-provider</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>net.ihe.gazelle</groupId>
     <artifactId>app.access-token-provider-api</artifactId>
     <name>Access Token Provider Api</name>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
 
     <build>
         <plugins>

audience-retriever/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <artifactId>app.access-token-provider</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>net.ihe.gazelle</groupId>
     <artifactId>app.audience-retriever</artifactId>
     <name>Audience Retriever</name>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

dummy-authorization-server-service/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>app.access-token-provider</artifactId>
         <groupId>net.ihe.gazelle</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>net.ihe.gazelle</groupId>
     <artifactId>app.dummy-authorization-server-service</artifactId>
     <name>Dummy Authorization Server Service</name>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
 
 
@@ -26,7 +24,7 @@
         <dependency>
             <groupId>net.ihe.gazelle</groupId>
             <artifactId>app.access-token-provider-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

pom.xml

@@ -5,16 +5,16 @@
 
     <groupId>net.ihe.gazelle</groupId>
     <artifactId>app.access-token-provider</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Access Token Provider</name>
     <url>http://gazelle.ihe.net</url>
 
     <scm>
-        <connection>${git.project.url}</connection>
-        <url>${git.project.url}</url>
-        <developerConnection>${git.project.url}</developerConnection>
+        <connection>scm:git:${git.project.url}</connection>
+        <url>scm:git:${git.project.url}</url>
+        <developerConnection>scm:git:${git.project.url}</developerConnection>
         <tag>HEAD</tag>
     </scm>
 
@@ -28,10 +28,10 @@
         <cvss.score.level.tolerate>8</cvss.score.level.tolerate>
         <nexus.url>https://gazelle.ihe.net/nexus</nexus.url>
         <nexus.path>/content/groups/public/</nexus.path>
-        <git.user.name>git</git.user.name>
-        <git.user.token>git</git.user.token>
+        <git.user.name>gitlab-ci</git.user.name>
+        <git.user.token>changeit</git.user.token>
         <git.project.url>
-            scm:${git.user.name}:${git.user.token}@gitlab.inria.fr/gazelle/applications/test-execution/simulator/access-token-provider.git
+            https://${git.user.name}:${git.user.token}@gitlab.inria.fr/gazelle/applications/test-execution/simulator/access-token-provider.git
         </git.project.url>
     </properties>