Commit 25edd0d4 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents fa944cc0 fb5a41e5
Loading
Loading
Loading
Loading
+27 −21
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@

	<name>A Maven plugin to generate AMP files</name>
	<description>Generate Alfresco Module Packages (AMP) files in a way simialr to WAR files</description>
	<url>https://bitbucket.org/inteligr8/amp-maven-plugin</url>
	<url>https://git.inteligr8.com/inteligr8/amp-maven-plugin</url>

	<licenses>
		<license>
@@ -21,9 +21,9 @@
	</licenses>

	<scm>
		<connection>scm:git:https://bitbucket.org/inteligr8/amp-maven-plugin.git</connection>
		<developerConnection>scm:git:git@bitbucket.org:inteligr8/amp-maven-plugin.git</developerConnection>
		<url>https://bitbucket.org/inteligr8/amp-maven-plugin</url>
		<connection>scm:git:https://git.inteligr8.com/inteligr8/amp-maven-plugin.git</connection>
		<developerConnection>scm:git:git@git.inteligr8.com:inteligr8/amp-maven-plugin.git</developerConnection>
		<url>https://git.inteligr8.com/inteligr8/amp-maven-plugin</url>
	</scm>
	<organization>
		<name>Inteligr8</name>
@@ -40,21 +40,21 @@

	<properties>
		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
		<maven.compiler.source>1.7</maven.compiler.source>
		<maven.compiler.target>1.7</maven.compiler.target>
		<maven.version>3.9.0</maven.version>
		<maven.compiler.source>1.8</maven.compiler.source>
		<maven.compiler.target>1.8</maven.compiler.target>
		<maven.version>3.9.11</maven.version>
	</properties>

	<dependencies>
		<dependency>
			<groupId>org.apache.commons</groupId>
			<artifactId>commons-lang3</artifactId>
			<version>3.12.0</version>
			<version>3.20.0</version>
		</dependency>
		<dependency>
			<groupId>org.apache.commons</groupId>
			<groupId>commons-io</groupId>
			<artifactId>commons-io</artifactId>
			<version>1.3.2</version>
			<version>2.21.0</version>
		</dependency>

		<!-- Extra Maven Plugin libraries -->
@@ -68,7 +68,7 @@
		<dependency>
			<groupId>org.codehaus.plexus</groupId>
			<artifactId>plexus-utils</artifactId>
			<version>3.5.0</version>
			<version>4.0.2</version>
		</dependency>

		<!-- Embedded Maven Plugin libraries -->
@@ -81,7 +81,7 @@
		<dependency>
			<groupId>org.apache.maven.plugin-tools</groupId>
			<artifactId>maven-plugin-annotations</artifactId>
			<version>3.7.1</version>
			<version>3.15.2</version>
			<scope>provided</scope>
		</dependency>
		<dependency>
@@ -95,7 +95,7 @@
		<dependency>
			<groupId>junit</groupId>
			<artifactId>junit</artifactId>
			<version>4.12</version>
			<version>4.13.2</version>
			<scope>test</scope>
		</dependency>

@@ -115,10 +115,17 @@
	</dependencies>
	
	<build>
		<pluginManagement>
			<plugins>
				<plugin>
					<artifactId>maven-plugin-plugin</artifactId>
					<version>3.7.1</version>
				</plugin>
			</plugins>
		</pluginManagement>
		<plugins>
			<plugin>
				<artifactId>maven-plugin-plugin</artifactId>
				<configuration>
					<goalPrefix>amp</goalPrefix>
				</configuration>
@@ -142,7 +149,7 @@

	<profiles>
		<profile>
			<id>ossrh-release</id>
			<id>central-publish</id>
			<build>
				<plugins>
					<plugin>
@@ -179,14 +186,13 @@
						</executions>
					</plugin>
					<plugin>
						<groupId>org.sonatype.plugins</groupId>
						<artifactId>nexus-staging-maven-plugin</artifactId>
						<version>1.6.13</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>
					</plugin>
				</plugins>