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

upgraded dependencies and plugins

parent 08fb94eb

pom.xml

+31 −20
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


	<name>Conditional Maven Plugin</name>

	<description>A Maven plugin for conditional property declarations</description>

	<url>https://bitbucket.org/inteligr8/conditional-maven-plugin</url>

	<url>https://git.inteligr8.com/inteligr8/conditional-maven-plugin</url>



	<licenses>

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



	<scm>

		<connection>scm:git:https://bitbucket.org/inteligr8/conditional-maven-plugin.git</connection>

		<developerConnection>scm:git:git@bitbucket.org:inteligr8/conditional-maven-plugin.git</developerConnection>

		<url>https://bitbucket.org/inteligr8/conditional-maven-plugin</url>

		<connection>scm:git:https://git.inteligr8.com/inteligr8/conditional-maven-plugin.git</connection>

		<developerConnection>scm:git:git@git.inteligr8.com:inteligr8/conditional-maven-plugin.git</developerConnection>

		<url>https://git.inteligr8.com/inteligr8/conditional-maven-plugin</url>

	</scm>

	<organization>

		<name>Inteligr8</name>
@@ -43,14 +43,14 @@ 
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<maven.compiler.source>1.8</maven.compiler.source>

		<maven.compiler.target>1.8</maven.compiler.target>

		<maven.version>3.6.3</maven.version>

		<maven.version>3.9.11</maven.version>

	</properties>



	<dependencies>

		<dependency>

			<groupId>org.apache.commons</groupId>

			<artifactId>commons-lang3</artifactId>

			<version>3.4</version>

			<version>3.20.0</version>

		</dependency>

		<dependency>

			<groupId>org.apache.maven</groupId>
@@ -61,7 +61,7 @@ 
		<dependency>

			<groupId>org.apache.maven.plugin-tools</groupId>

			<artifactId>maven-plugin-annotations</artifactId>

			<version>3.6.0</version>

			<version>3.15.1</version>

			<scope>provided</scope>

		</dependency>

		<dependency>
@@ -85,16 +85,32 @@ 
		<dependency>

			<groupId>junit</groupId>

			<artifactId>junit</artifactId>

			<version>4.12</version>

			<version>4.13.2</version>

			<scope>test</scope>

		</dependency>

	</dependencies>

	

	<build>

		<pluginManagement>

			<plugins>

				<plugin>

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

					<version>3.15.2</version>

				</plugin>

				<plugin>

					<artifactId>maven-invoker-plugin</artifactId>

					<version>3.9.1</version>

				</plugin>

				<plugin>

					<groupId>org.codehaus.plexus</groupId>

					<artifactId>plexus-component-metadata</artifactId>

					<version>2.2.0</version>

				</plugin>

			</plugins>

		</pluginManagement>

		<plugins>

			<plugin>

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

				<version>3.6.0</version>

				<configuration>

					<goalPrefix>conditional</goalPrefix>

				</configuration>
@@ -116,7 +132,6 @@ 
			<plugin>

				<groupId>org.codehaus.plexus</groupId>

				<artifactId>plexus-component-metadata</artifactId>

				<version>2.0.0</version>

				<executions>

					<execution>

						<goals>
@@ -127,7 +142,6 @@ 
			</plugin>

			<plugin>

				<artifactId>maven-invoker-plugin</artifactId>

				<version>3.2.2</version>

				<configuration>

					<projectsDirectory>${basedir}/src/it</projectsDirectory>

					<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -163,7 +177,6 @@ 
				<plugins>

					<plugin>

						<artifactId>maven-invoker-plugin</artifactId>

						<version>3.2.2</version>

						<executions>

							<execution>

								<id>run-its</id>
@@ -183,7 +196,7 @@ 
			</build>

		</profile>

		<profile>

			<id>release</id>

			<id>central-publish</id>

			<build>

				<plugins>

					<plugin>
@@ -220,19 +233,17 @@ 
						</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>

			</build>

		</profile>

	</profiles>



</project>

src/main/java/com/inteligr8/maven/conditional/AbstractPropertyMojo.java

+0 −5
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
 */

package com.inteligr8.maven.conditional;



import javax.annotation.OverridingMethodsMustInvokeSuper;



import org.apache.commons.lang3.StringUtils;

import org.apache.maven.execution.MavenSession;

import org.apache.maven.plugin.AbstractMojo;
@@ -68,7 +66,6 @@ public abstract class AbstractPropertyMojo extends AbstractMojo { 
    

    protected abstract void go() throws MojoExecutionException, MojoFailureException;



    @OverridingMethodsMustInvokeSuper

    protected void validateParamsPreNormalization() throws MojoFailureException {

    	this.getLog().debug("Validating parameters before their normalization");
@@ -76,14 +73,12 @@ public abstract class AbstractPropertyMojo extends AbstractMojo { 
    		throw new MojoFailureException("The 'newProperty' element is required");

    }



    @OverridingMethodsMustInvokeSuper

    protected void normalizeParameters() throws MojoFailureException {

    	this.getLog().debug("Normalizing parameters");



    	this.newProperty = StringUtils.trimToNull(this.newProperty);

    }



    @OverridingMethodsMustInvokeSuper

    protected void validateParamsPostNormalization() throws MojoFailureException {

    	this.getLog().debug("Validating parameters after their normalization");

src/main/java/com/inteligr8/maven/conditional/BooleanPropertyMojo.java

+0 −5
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ package com.inteligr8.maven.conditional; 


import java.util.Properties;



import javax.annotation.OverridingMethodsMustInvokeSuper;



import org.apache.commons.lang3.StringUtils;

import org.apache.maven.plugin.MojoExecutionException;

import org.apache.maven.plugin.MojoFailureException;
@@ -56,7 +54,6 @@ public class BooleanPropertyMojo extends AbstractPropertyMojo { 
    }

    

    @Override

    @OverridingMethodsMustInvokeSuper

    protected void validateParamsPreNormalization() throws MojoFailureException {

    	super.validateParamsPreNormalization();
@@ -65,7 +62,6 @@ public class BooleanPropertyMojo extends AbstractPropertyMojo { 
    }



    @Override

    @OverridingMethodsMustInvokeSuper

    protected void normalizeParameters() throws MojoFailureException {

    	super.normalizeParameters();
@@ -73,7 +69,6 @@ public class BooleanPropertyMojo extends AbstractPropertyMojo { 
    }

    

    @Override

    @OverridingMethodsMustInvokeSuper

    protected void validateParamsPostNormalization() throws MojoFailureException {

    	super.validateParamsPostNormalization();

src/main/java/com/inteligr8/maven/conditional/FileExistenceMojo.java

+0 −5
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ package com.inteligr8.maven.conditional; 


import java.io.File;



import javax.annotation.OverridingMethodsMustInvokeSuper;



import org.apache.commons.lang3.StringUtils;

import org.apache.maven.plugin.MojoExecutionException;

import org.apache.maven.plugin.MojoFailureException;
@@ -56,7 +54,6 @@ public class FileExistenceMojo extends AbstractPropertyMojo { 
    }

    

    @Override

    @OverridingMethodsMustInvokeSuper

    protected void validateParamsPreNormalization() throws MojoFailureException {

    	super.validateParamsPreNormalization();
@@ -65,7 +62,6 @@ public class FileExistenceMojo extends AbstractPropertyMojo { 
    }



    @Override

    @OverridingMethodsMustInvokeSuper

    protected void normalizeParameters() throws MojoFailureException {

    	super.normalizeParameters();
@@ -73,7 +69,6 @@ public class FileExistenceMojo extends AbstractPropertyMojo { 
    }

    

    @Override

    @OverridingMethodsMustInvokeSuper

    protected void validateParamsPostNormalization() throws MojoFailureException {

    	super.validateParamsPostNormalization();