Skip to content

Commit

Permalink
Merge branch 'release/1.9.4' into master_19x
Browse files Browse the repository at this point in the history
Conflicts:
	accesscontroltool-bundle/pom.xml
	accesscontroltool-exampleconfig-package/pom.xml
	accesscontroltool-oakindex-package/pom.xml
	accesscontroltool-package/pom.xml
	pom.xml
  • Loading branch information
ghenzler committed Mar 10, 2017
2 parents c310510 + 64e8e05 commit 1466826
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion accesscontroltool-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
<artifactId>accesscontroltool</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.9.4</version>
</parent>

<!-- ====================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion accesscontroltool-exampleconfig-package/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
<artifactId>accesscontroltool</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.9.4</version>
</parent>

<!-- ====================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion accesscontroltool-oakindex-package/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
<artifactId>accesscontroltool</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.9.4</version>
</parent>

<!-- ====================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion accesscontroltool-package/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
<artifactId>accesscontroltool</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.9.4</version>
</parent>

<!-- ====================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
<artifactId>accesscontroltool</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.9.4</version>
<packaging>pom</packaging>

<name>Access Control Tool - Reactor Project</name>
Expand Down

0 comments on commit 1466826

Please sign in to comment.