Commit a91e4b6a authored by Henning Bredel's avatar Henning Bredel

Resolve merge artifact

parent 7415ce66
...@@ -3,11 +3,7 @@ ...@@ -3,11 +3,7 @@
<parent> <parent>
<groupId>org.ow2.authzforce</groupId> <groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-server</artifactId> <artifactId>authzforce-ce-server</artifactId>
<<<<<<< HEAD
<version>8.1.1-SNAPSHOT</version> <version>8.1.1-SNAPSHOT</version>
=======
<version>8.1.0</version>
>>>>>>> release/8.1.0
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>authzforce-ce-server-dist</artifactId> <artifactId>authzforce-ce-server-dist</artifactId>
......
...@@ -8,11 +8,7 @@ ...@@ -8,11 +8,7 @@
</parent> </parent>
<artifactId>authzforce-ce-server</artifactId> <artifactId>authzforce-ce-server</artifactId>
<!-- FIWARE Versioning + Version must be equal or higher than 'authzforce-ce-rest-api-model' dependency in 'rest-service' module --> <!-- 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.1-SNAPSHOT</version>
=======
<version>8.1.0</version>
>>>>>>> release/8.1.0
<packaging>pom</packaging> <packaging>pom</packaging>
<name>${project.groupId}:${project.artifactId}</name> <name>${project.groupId}:${project.artifactId}</name>
<description>AuthzForce CE Server</description> <description>AuthzForce CE Server</description>
......
...@@ -4,11 +4,7 @@ ...@@ -4,11 +4,7 @@
<groupId>org.ow2.authzforce</groupId> <groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-server</artifactId> <artifactId>authzforce-ce-server</artifactId>
<!-- Version must be equal or higher than authzforce-ce-rest-api-model dependency --> <!-- Version must be equal or higher than authzforce-ce-rest-api-model dependency -->
<<<<<<< HEAD
<version>8.1.1-SNAPSHOT</version> <version>8.1.1-SNAPSHOT</version>
=======
<version>8.1.0</version>
>>>>>>> release/8.1.0
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>authzforce-ce-server-rest-service</artifactId> <artifactId>authzforce-ce-server-rest-service</artifactId>
......
...@@ -3,11 +3,7 @@ ...@@ -3,11 +3,7 @@
<parent> <parent>
<groupId>org.ow2.authzforce</groupId> <groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-server</artifactId> <artifactId>authzforce-ce-server</artifactId>
<<<<<<< HEAD
<version>8.1.1-SNAPSHOT</version> <version>8.1.1-SNAPSHOT</version>
=======
<version>8.1.0</version>
>>>>>>> release/8.1.0
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>authzforce-ce-server-upgrader</artifactId> <artifactId>authzforce-ce-server-upgrader</artifactId>
......
...@@ -3,11 +3,7 @@ ...@@ -3,11 +3,7 @@
<parent> <parent>
<groupId>org.ow2.authzforce</groupId> <groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-server</artifactId> <artifactId>authzforce-ce-server</artifactId>
<<<<<<< HEAD
<version>8.1.1-SNAPSHOT</version> <version>8.1.1-SNAPSHOT</version>
=======
<version>8.1.0</version>
>>>>>>> release/8.1.0
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>authzforce-ce-server-webapp</artifactId> <artifactId>authzforce-ce-server-webapp</artifactId>
......
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