Merge pull request #44 from ridoo/develop

Resolve merge artifact

dist/pom.xml

@@ -3,11 +3,7 @@
    <parent>
       <groupId>org.ow2.authzforce</groupId>
       <artifactId>authzforce-ce-server</artifactId>
-<<<<<<< HEAD
       <version>8.1.1-SNAPSHOT</version>
-=======
-      <version>8.1.0</version>
->>>>>>> release/8.1.0
       <relativePath>..</relativePath>
    </parent>
    <artifactId>authzforce-ce-server-dist</artifactId>

pom.xml

@@ -8,11 +8,7 @@
    </parent>
    <artifactId>authzforce-ce-server</artifactId>
    <!-- FIWARE Versioning + Version must be equal or higher than 'authzforce-ce-rest-api-model' dependency in 'rest-service' module -->
-<<<<<<< HEAD
    <version>8.1.1-SNAPSHOT</version>
-=======
-   <version>8.1.0</version>
->>>>>>> release/8.1.0
    <packaging>pom</packaging>
    <name>${project.groupId}:${project.artifactId}</name>
    <description>AuthzForce CE Server</description>

rest-service/pom.xml

@@ -4,11 +4,7 @@
       <groupId>org.ow2.authzforce</groupId>
       <artifactId>authzforce-ce-server</artifactId>
       <!-- Version must be equal or higher than authzforce-ce-rest-api-model dependency -->
-<<<<<<< HEAD
       <version>8.1.1-SNAPSHOT</version>
-=======
-      <version>8.1.0</version>
->>>>>>> release/8.1.0
       <relativePath>..</relativePath>
    </parent>
    <artifactId>authzforce-ce-server-rest-service</artifactId>

upgrader/pom.xml

@@ -3,11 +3,7 @@
    <parent>
       <groupId>org.ow2.authzforce</groupId>
       <artifactId>authzforce-ce-server</artifactId>
-<<<<<<< HEAD
       <version>8.1.1-SNAPSHOT</version>
-=======
-      <version>8.1.0</version>
->>>>>>> release/8.1.0
       <relativePath>..</relativePath>
    </parent>
    <artifactId>authzforce-ce-server-upgrader</artifactId>

webapp/pom.xml

@@ -3,11 +3,7 @@
 	<parent>
 		<groupId>org.ow2.authzforce</groupId>
 		<artifactId>authzforce-ce-server</artifactId>
-<<<<<<< HEAD
 		<version>8.1.1-SNAPSHOT</version>
-=======
-		<version>8.1.0</version>
->>>>>>> release/8.1.0
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>authzforce-ce-server-webapp</artifactId>