Commit 77d7ba6e authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 66483da5 6efe631c

pom.xml

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

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

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

				<version>2.21</version>

				<version>2.40</version>

				<extensions>true</extensions>

				<configuration>

					<tiles>
@@ -358,29 +358,6 @@ 
			</properties>

			<build>

				<plugins>

					<plugin>

						<artifactId>maven-source-plugin</artifactId>

						<executions>

							<execution>

								<id>source</id>

								<phase>package</phase>

								<goals><goal>jar-no-fork</goal></goals>

							</execution>

						</executions>

					</plugin>

					<plugin>

						<artifactId>maven-javadoc-plugin</artifactId>

						<executions>

							<execution>

								<id>javadoc</id>

								<phase>package</phase>

								<goals><goal>jar</goal></goals>

								<configuration>

									<show>public</show>

								</configuration>

							</execution>

						</executions>

					</plugin>

					<plugin>

						<artifactId>maven-gpg-plugin</artifactId>

						<executions>