Skip to content
Snippets Groups Projects
Commit 3f63e654 authored by cdanger's avatar cdanger
Browse files

updating develop poms to master versions to avoid merge conflicts

parent 159d89c6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
atom-model/pom.xml
+ 1
− 1
View file @ 3f63e654
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.ow2.authzforce</groupId> <groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId> <artifactId>authzforce-ce-parent</artifactId>
<version>7.6.1-SNAPSHOT</version> <version>7.6.0</version>
</parent> </parent>
<artifactId>authzforce-ce-atom-model</artifactId> <artifactId>authzforce-ce-atom-model</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
......
pdp-ext-model/pom.xml
+ 1
− 1
View file @ 3f63e654
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.ow2.authzforce</groupId> <groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId> <artifactId>authzforce-ce-parent</artifactId>
<version>7.6.1-SNAPSHOT</version> <version>7.6.0</version>
</parent> </parent>
<artifactId>authzforce-ce-pdp-ext-model</artifactId> <artifactId>authzforce-ce-pdp-ext-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name> <name>${project.groupId}:${project.artifactId}</name>
......
pom.xml
+ 5
− 5
View file @ 3f63e654
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.ow2.authzforce</groupId> <groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId> <artifactId>authzforce-ce-parent</artifactId>
<version>7.6.1-SNAPSHOT</version> <version>7.6.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>${project.groupId}:${project.artifactId}</name> <name>${project.groupId}:${project.artifactId}</name>
<description>AuthzForce - Parent of all AuthzForce components</description> <description>AuthzForce - Parent of all AuthzForce components</description>
...@@ -178,25 +178,25 @@ ...@@ -178,25 +178,25 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-xmlns-model</artifactId> <artifactId>${artifactId.prefix}-xmlns-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start --> <!-- Version updated automatically by maven jgitflow:release-start -->
<version>7.6.1-SNAPSHOT</version> <version>7.6.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-atom-model</artifactId> <artifactId>${artifactId.prefix}-atom-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start --> <!-- Version updated automatically by maven jgitflow:release-start -->
<version>7.6.1-SNAPSHOT</version> <version>7.6.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-xacml-model</artifactId> <artifactId>${artifactId.prefix}-xacml-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start --> <!-- Version updated automatically by maven jgitflow:release-start -->
<version>7.6.1-SNAPSHOT</version> <version>7.6.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-pdp-ext-model</artifactId> <artifactId>${artifactId.prefix}-pdp-ext-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start --> <!-- Version updated automatically by maven jgitflow:release-start -->
<version>7.6.1-SNAPSHOT</version> <version>7.6.0</version>
</dependency> </dependency>
<!-- /Common AuthzForce CE dependencies --> <!-- /Common AuthzForce CE dependencies -->
</dependencies> </dependencies>
......
xacml-model/pom.xml
+ 1
− 1
View file @ 3f63e654
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.ow2.authzforce</groupId> <groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId> <artifactId>authzforce-ce-parent</artifactId>
<version>7.6.1-SNAPSHOT</version> <version>7.6.0</version>
</parent> </parent>
<artifactId>authzforce-ce-xacml-model</artifactId> <artifactId>authzforce-ce-xacml-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name> <name>${project.groupId}:${project.artifactId}</name>
......
xmlns-model/pom.xml
+ 1
− 1
View file @ 3f63e654
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.ow2.authzforce</groupId> <groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId> <artifactId>authzforce-ce-parent</artifactId>
<version>7.6.1-SNAPSHOT</version> <version>7.6.0</version>
</parent> </parent>
<artifactId>authzforce-ce-xmlns-model</artifactId> <artifactId>authzforce-ce-xmlns-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name> <name>${project.groupId}:${project.artifactId}</name>
......
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