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

Merge branch 'develop' into stable

parents dafbe33f 458650db
Loading
Loading
Loading
Loading
+11 −10
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@
			<plugin>
				<groupId>io.repaint.maven</groupId>
				<artifactId>tiles-maven-plugin</artifactId>
				<version>2.40</version>
				<version>2.43</version>
				<extensions>true</extensions>
				<configuration>
					<tiles>
@@ -230,7 +230,7 @@
			</build>
		</profile>
		<profile>
			<id>ossrh-release</id>
			<id>central-publish</id>
			<properties>
				<maven.deploy.skip>true</maven.deploy.skip>
			</properties>
@@ -270,19 +270,20 @@
						</executions>
					</plugin>
					<plugin>
						<groupId>org.sonatype.plugins</groupId>
						<artifactId>nexus-staging-maven-plugin</artifactId>
						<version>1.7.0</version>
						<groupId>org.sonatype.central</groupId>
						<artifactId>central-publishing-maven-plugin</artifactId>
						<version>0.8.0</version>
						<extensions>true</extensions>
						<configuration>
							<serverId>ossrh</serverId>
							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
							<autoReleaseAfterClose>true</autoReleaseAfterClose>
							<publishingServerId>central</publishingServerId>
							<autoPublish>true</autoPublish>
						</configuration>
						<!-- for some reason this is required... -->
						<executions>
							<execution>
								<id>ossrh-deploy</id>
								<id>deploy</id>
								<phase>deploy</phase>
								<goals><goal>deploy</goal></goals>
								<goals><goal>publish</goal></goals>
							</execution>
						</executions>
					</plugin>