Commit 1f40b1cd authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents df9363c3 634af1ce

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
			<plugin>

				<groupId>io.repaint.maven</groupId>

				<artifactId>tiles-maven-plugin</artifactId>

				<version>2.44</version>

				<version>2.45</version>

				<extensions>true</extensions>

				<configuration>

                    <!-- This assures the parent properties override defaults in the tiles -->

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-webapp/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
			<plugin>

				<groupId>io.repaint.maven</groupId>

				<artifactId>tiles-maven-plugin</artifactId>

				<version>2.44</version>

				<version>2.45</version>

				<extensions>true</extensions>

				<configuration>

                    <!-- This assures the parent properties override defaults in the tiles -->

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
			<plugin>

				<groupId>io.repaint.maven</groupId>

				<artifactId>tiles-maven-plugin</artifactId>

				<version>2.44</version>

				<version>2.45</version>

				<extensions>true</extensions>

				<configuration>

                    <!-- This assures the parent properties override defaults in the tiles -->

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-webapp/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
			<plugin>

				<groupId>io.repaint.maven</groupId>

				<artifactId>tiles-maven-plugin</artifactId>

				<version>2.44</version>

				<version>2.45</version>

				<extensions>true</extensions>

				<configuration>

                    <!-- This assures the parent properties override defaults in the tiles -->

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/tengine-A/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
			<plugin>

				<groupId>io.repaint.maven</groupId>

				<artifactId>tiles-maven-plugin</artifactId>

				<version>2.44</version>

				<version>2.45</version>

				<extensions>true</extensions>

				<configuration>

                    <!-- This assures the parent properties override defaults in the tiles -->