Commit 5ec49247 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents a61e5bc5 434045f5

pom.xml

+4 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


<project xmlns="http://maven.apache.org/POM/4.0.0"

		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

	<modelVersion>4.0.0</modelVersion>



	<groupId>com.inteligr8</groupId>
@@ -43,7 +43,7 @@ 
		<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.0</maven.version>

	</properties>



	<dependencies>
@@ -55,7 +55,7 @@ 
		<dependency>

			<groupId>org.apache.maven.shared</groupId>

			<artifactId>file-management</artifactId>

			<version>3.0.0</version>

			<version>3.1.0</version>

		</dependency>

		<dependency>

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

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

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

			<version>3.6.0</version>

			<version>3.7.1</version>

			<scope>provided</scope>

		</dependency>

		<dependency>
@@ -239,5 +239,4 @@ 
			</build>

		</profile>

	</profiles>



</project>

src/it/copy-file/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


<project xmlns="http://maven.apache.org/POM/4.0.0"

		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

	<modelVersion>4.0.0</modelVersion>



	<groupId>com.inteligr8</groupId>

src/it/match-file-content/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


<project xmlns="http://maven.apache.org/POM/4.0.0"

		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

	<modelVersion>4.0.0</modelVersion>



	<groupId>com.inteligr8</groupId>

src/it/match-filename/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


<project xmlns="http://maven.apache.org/POM/4.0.0"

		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

	<modelVersion>4.0.0</modelVersion>



	<groupId>com.inteligr8</groupId>

src/it/match-properties/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


<project xmlns="http://maven.apache.org/POM/4.0.0"

		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

	<modelVersion>4.0.0</modelVersion>



	<groupId>com.inteligr8</groupId>