Commit 5efedf3f authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 6d70c711 856c6f4a

beedk-acs-allinone-archetype/pom.xml

+7 −15
Original line number Diff line number Diff line
@@ -4,11 +4,16 @@ 
	

	<modelVersion>4.0.0</modelVersion>

 

	<groupId>com.inteligr8.ootbee</groupId>

	<artifactId>beedk-acs-allinone-archetype</artifactId>

	<version>1.0.11</version>

	<packaging>maven-archetype</packaging>



	<parent>

		<groupId>com.inteligr8.ootbee</groupId>

		<artifactId>beedk-parent</artifactId>

		<version>1.0.11</version>

		<relativePath>..</relativePath>

	</parent>



	<name>Order of the Bee Development Kit: Project Scaffolding for multi-module ACS projects</name>

	<scm>

		<url>https://bitbucket.org/inteligr8/ootbee-beedk</url>
@@ -35,18 +40,5 @@ 
				<version>3.1.1</version>

			</extension>

		</extensions>

		<plugins>

			<plugin>

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

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

				<version>2.20</version>

				<extensions>true</extensions>

				<configuration>

					<tiles>

						<tile>com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0)</tile>

					</tiles>

				</configuration>

			</plugin>

		</plugins>

	</build>

</project>

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.20</version>

				<version>2.26</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.20</version>

				<version>2.26</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.20</version>

				<version>2.26</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.20</version>

				<version>2.26</version>

				<extensions>true</extensions>

				<configuration>

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