Commit a8811183 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 703fbdfa f5f2bc65
Loading
Loading
Loading
Loading
+23 −11
Original line number Diff line number Diff line
@@ -167,6 +167,29 @@
					</execution>
				</executions>
			</plugin>
			<plugin>
				<artifactId>maven-deploy-plugin</artifactId>
				<configuration>
					<skip>true</skip>
				</configuration>
				<executions>
					<execution>
						<id>deploy-classifier</id>
						<phase>deploy</phase>
						<goals><goal>deploy-file</goal></goals>
						<configuration>
							<file>${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar</file>
							<repositoryId>inteligr8-snapshots</repositoryId>
							<url>https://repos.inteligr8.com/nexus/repository/inteligr8-snapshots</url>
							<groupId>${project.groupId}</groupId>
							<artifactId>${project.artifactId}</artifactId>
							<version>${project.version}</version>
							<packaging>${project.packaging}</packaging>
							<classifier>jar-with-dependencies-${aps.app.tag}</classifier>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<plugin>
				<groupId>io.repaint.maven</groupId>
				<artifactId>tiles-maven-plugin</artifactId>
@@ -376,15 +399,4 @@
			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
		</pluginRepository>
	</pluginRepositories>

	<distributionManagement>
		<repository>
			<id>inteligr8-releases</id>
			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
		</repository>
		<snapshotRepository>
			<id>inteligr8-snapshots</id>
			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-snapshots</url>
		</snapshotRepository>
	</distributionManagement>
</project>