Commit 563eaca1 authored by cdanger's avatar cdanger

updating develop poms to master versions to avoid merge conflicts

parent 077cba5b
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>7.5.1-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>authzforce-ce-atom-model</artifactId>
<packaging>jar</packaging>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>7.5.1-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>authzforce-ce-pdp-ext-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
......
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>7.5.1-SNAPSHOT</version>
<version>7.5.0</version>
<packaging>pom</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>AuthzForce - Parent of all AuthzForce components</description>
......@@ -178,25 +178,25 @@
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-xmlns-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>7.5.1-SNAPSHOT</version>
<version>7.5.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-atom-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>7.5.1-SNAPSHOT</version>
<version>7.5.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-xacml-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>7.5.1-SNAPSHOT</version>
<version>7.5.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-pdp-ext-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>7.5.1-SNAPSHOT</version>
<version>7.5.0</version>
</dependency>
<!-- /Common AuthzForce CE dependencies -->
</dependencies>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>7.5.1-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>authzforce-ce-xacml-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>7.5.1-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>authzforce-ce-xmlns-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
......
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