v1.0.6 pom

README.md

@@ -0,0 +1,203 @@
+
+# Regular Expression Maven Plugin
+
+This is a maven plugin that provides various regular expression based goals to Maven.
+
+## Usage
+
+```xml
+<project>
+    ...
+    <build>
+        ...
+        <plugins>
+            ...
+            <plugin>
+                <groupId>com.inteligr8</groupId>
+                <artifactId>regex-maven-plugin</artifactId>
+                <version>...</version>
+                <executions>
+                    <execution>
+                        <id>sample-regex-test</id>
+                        <phase>validate</phase>
+                        <goals><goal>replace-property</goal></goals>
+                        <configuration>
+                            <property>a.property.to.eval</property>
+                            <regexes>
+                                <regex>
+                                    <pattern>\.txt<pattern>
+                                    <replacement></replacement>
+                                </regex>
+                            </regexes>
+                            <newProperty>a.new.property.to.set</newProperty>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            ...
+        </plugins>
+        ...
+    </build>
+    ...
+</project>
+```
+
+## Goals
+
+| Goal                 | Description |
+| -------------------- | ----------- |
+| `replace-file`       | Apply a regular expression pattern against the contents of a file, replacing matches with the regex-compliant replacement text.  The existing file is changed. |
+| `replace-properties` | Apply a regular expression pattern against a set of property values, replacing matches with the regex-compliant replacement text, and storing in new properties. |
+| `replace-property`   | Apply a regular expression pattern against a property value, replacing matches with the regex-compliant replacement text, and storing in a new property. |
+| `replace-text`       | Apply a regular expression pattern against text, replacing matches with the regex-compliant replacement text, and storing in a new property. |
+| `match-file`         | Evaluate a regular expression pattern against the contents of a file, storing the result in a boolean property. |
+| `match-filename`     | Evaluate a regular expression pattern against the name of a file, storing the result in a boolean property. |
+| `match-properties`   | Evaluate a regular expression pattern against a set of property values, storing the result in boolean properties. |
+| `match-property`     | Evaluate a regular expression pattern against a property value, storing the result in a boolean property. |
+| `match-text`         | Evaluate a regular expression pattern against text, storing the result in a boolean property. |
+| `copy-file`          | A convenience goal that copies all files/folders specified in a source path to a target path. |
+| `move-file`          | A convenience goal that moves all files/folders specified in a source path to a target path. |
+
+### Common Configuration Properties
+
+| Configuration Property | Data Type   | Required | Default | Description |
+| ---------------------- |:-----------:|:--------:| ------- | ----------- |
+| `allowMultiLineMatch`  | `boolean`   |          | `false` | A value of `true` allows for multi-line matching.  This takes substantially more memory/time to process. |
+| `charset`              | `string`    |          | `utf-8` | |
+| `skip`                 | `boolean`   |          | `false` | |
+| `verbose`              | `boolean`   |          | `false` | |
+
+### Goal: `replace-file`
+
+Manipulates all the contents in the specified files based the specified regular expression replacements.
+
+| Configuration Property | Data Type   | Required | Default | Description |
+| ---------------------- |:-----------:|:--------:| ------- | ----------- |
+| `chunkSize`            | `int`       |          | `1024`  | The streaming buffer/chunk size in bytes, while evaluating the regular expressions.  Adjust for classic speed/memory trade-off.  Be aware that files are processed line-by-line, unless `allowMultiLineMatch` is set to `true`. |
+| `filesets`             | `FileSet[]` | Yes      |         | Executes against these files. |
+| `regexes`              | `Regex[]`   | Yes      |         | Applies these regular expressions and replacement text against those files. |
+
+### Goal: `replace-properties`
+
+Copies and replaces the values of the specified properties based on the specified regular expression replacements; storing the changed values in new properties.
+
+| Configuration Property | Data Type  | Required | Default  | Description |
+| ---------------------- |:----------:|:--------:| -------- | ----------- |
+| `properties`           | `String[]` | Yes      |          | Executes against these properties. |
+| `newPropertySuffix`    | `String`   |          | `-regex` | All evaluated properties will be copied to new properties with the same property name plus this suffix. |
+| `regexes`              | `Regex[]`  | Yes      |          | Applies these regular expressions and replacement text against those files. |
+
+### Goal: `replace-property`
+
+Copies and replaces the value of the specified property based on the specified regular expression replacements; storing the changed value in a new property.
+
+| Configuration Property | Data Type  | Required | Default | Description |
+| ---------------------- |:----------:|:--------:| ------- | ----------- |
+| `property`             | `String`   | Yes      |         | Executes against this property. |
+| `newProperty`          | `String`   |          |         | The evaluated property will be copied to this property name.  If not specified, it will be the same name as the `property` with a `-regex` suffix. |
+| `regexes`              | `Regex[]`  | Yes      |         | Applies these regular expressions and replacement text against those files. |
+
+### Goal: `replace-text`
+
+Replaces the specified text based on the specified regular expression replacements; storing the result in a property.
+
+| Configuration Property | Data Type  | Required | Default | Description |
+| ---------------------- |:----------:|:--------:| ------- | ----------- |
+| `text`                 | `String`   | Yes      |         | Execute against this text. |
+| `newProperty`          | `String`   | Yes      |         | The evaluated text will be copied to this property name. |
+| `regexes`              | `Regex[]`  | Yes      |         | Applies these regular expressions and replacement text against those files. |
+
+### Goal: `match-file`
+
+Searches the contents of the specified files based using the specified regular expressions; storing the result of the search in a property.
+
+| Configuration Property | Data Type   | Required | Default | Description |
+| ---------------------- |:-----------:|:--------:| ------- | ----------- |
+| `chunkSize`            | `int`       |          | `1024`  | The streaming buffer/chunk size in bytes, while evaluating the regular expressions.  Adjust for classic speed/memory trade-off.  Be aware that files are processed line-by-line, unless `allowMultiLineMatch` is set to `true`. |
+| `filesets`             | `FileSet[]` | Yes      |         | Executes against these files. |
+| `newProperty`          | `String`    | Yes      |         | If a single regular expression matches the contents in a single file, then this property will be set to `true`; `false` otherwise. |
+| `patterns`             | `String[]`  | Yes      |         | Evaluates these regular expressions against those files. |
+| `allowPartialMatch`    | `boolean`   |          | `true`  | A value of `true` allows for partial matching, rather than exact line-by-line matching. |
+| `negate`               | `boolean`   |          | `false` | A value of `true` will reverse the `true`/`false` on the resultant property value. |
+
+### Goal: `match-filename`
+
+Checks the filenames of the specified files based using the specified regular expressions; storing the result in a property.
+
+| Configuration Property | Data Type   | Required | Default | Description |
+| ---------------------- |:-----------:|:--------:| ------- | ----------- |
+| `sourceDirectory`      | `File`      | Yes      |         | Executes against this file. |
+| `newProperty`          | `String`    | Yes      |         | If a single regular expression matches the name of the file, then this property will be set to `true`; `false` otherwise. |
+| `patterns`             | `String[]`  | Yes      |         | Evaluates these regular expressions the file. |
+| `allowPartialMatch`    | `boolean`   |          | `true`  | A value of `true` allows for partial matching, rather than exact filename matching. |
+| `negate`               | `boolean`   |          | `false` | A value of `true` will reverse the `true`/`false` on the resultant property value. |
+
+### Goal: `match-properties`
+
+Checks the values of the specified properties based on the specified regular expressions; storing the results in new properties.
+
+| Configuration Property | Data Type  | Required | Default  | Description |
+| ---------------------- |:----------:|:--------:| -------- | ----------- |
+| `properties`           | `String[]` | Yes      |          | Executes against these properties. |
+| `newPropertySuffix`    | `String`   |          | `-regex` | All evaluated properties will be copied to new properties with the same property name plus this suffix. |
+| `patterns`             | `String[]` | Yes      |          | Evaluates these regular expressions against those properties' values. |
+| `allowPartialMatch`    | `boolean`  |          | `true`   | A value of `true` allows for partial matching, rather than exact matching. |
+| `negate`               | `boolean`  |          | `false`  | A value of `true` will reverse the `true`/`false` on the resultant property value. |
+
+### Goal: `match-property`
+
+Checks the value of the specified property based on the specified regular expressions; storing the result in a new property.
+
+| Configuration Property | Data Type  | Required | Default | Description |
+| ---------------------- |:----------:|:--------:| ------- | ----------- |
+| `property`             | `String`   | Yes      |         | Executes against this property. |
+| `newProperty`          | `String`   |          |         | The evaluated property will be copied to this property name.  If not specified, it will be the same name as the `property` with a `-regex` suffix. |
+| `patterns`             | `String[]` | Yes      |         | Evaluates these regular expressions against the property value. |
+| `allowPartialMatch`    | `boolean`  |          | `true`  | A value of `true` allows for partial matching, rather than exact matching. |
+| `negate`               | `boolean`  |          | `false` | A value of `true` will reverse the `true`/`false` on the resultant property value. |
+
+### Goal: `match-text`
+
+Checks the specified text based on the specified regular expressions; storing the result in a property.
+
+| Configuration Property | Data Type  | Required | Default | Description |
+| ---------------------- |:----------:|:--------:| ------- | ----------- |
+| `text`                 | `String`   | Yes      |         | Execute against this text. |
+| `newProperty`          | `String`   | Yes      |         | The evaluated text will be copied to this property name. |
+| `patterns`             | `String[]` | Yes      |         | Evaluates these regular expressions against the property value. |
+| `allowPartialMatch`    | `boolean`  |          | `true`  | A value of `true` allows for partial matching, rather than exact matching. |
+| `negate`               | `boolean`  |          | `false` | A value of `true` will reverse the `true`/`false` on the resultant property value. |
+
+### Goal: `copy-file`
+
+Copies all the files in the specified source directory while applying the specified regular expression replacements to their contents; storing the files in the specified target directory.
+
+| Configuration Property | Data Type | Required | Default    | Description |
+| ---------------------- |:---------:|:--------:| ---------- | ----------- |
+| `sourceDirectory`      | `File`    |          | ${basedir} | Copy all files from this directory. |
+| `targetDirectory`      | `File`    |          | ${basedir} | Copy all files to this directory. |
+| `regexes`              | `Regex[]` | Yes      |            | Applies these regular expressions and replacement text against those files. |
+| `overwrite`            | `boolean` |          | `true`     | |
+
+### Goal: `move-file`
+
+Moves all the files from the specified source directory while applying the specified regular expression replacements to their contents; storing the files in the specified target directory.
+
+| Configuration Property | Data Type | Required | Default    | Description |
+| ---------------------- |:---------:|:--------:| ---------- | ----------- |
+| `sourceDirectory`      | `File`    |          | ${basedir} | Move all files from this directory. |
+| `targetDirectory`      | `File`    |          | ${basedir} | Move all files to this directory. |
+| `regexes`              | `Regex[]` | Yes      |            | Applies these regular expressions and replacement text against those files. |
+| `overwrite`            | `boolean` |          | `true`     | |
+
+## Model
+
+### Object Type: `Regex`
+
+| Element           | Data Type | Required | Default | Description |
+| ----------------- |:---------:|:--------:| ------- | ----------- |
+| `pattern`         | `String`  | Yes      |         | A regular expression pattern. |
+| `replacement`     | `String`  |          | ``      | A regular expression replacement string. |
+| `previousPattern` | `String`  |          |         | A regular expression pattern to look back against, removing everything down to and including the pattern. |
+
+The `previousPattern` allows for you to match some text and remove everything before the match, up to the `prevoiusPattern`.  This is useful when matching a method and removing it and all its annotations.  If the `previousPattern` has no match, it will not remove any text before the primary match.

pom.xml

@@ -2,17 +2,28 @@
 
 <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>
 	<artifactId>regex-maven-plugin</artifactId>
-	<version>1.0.3</version>
+	<version>1.0.6</version>
 	<packaging>maven-plugin</packaging>
 
-	<name>A Maven plugin for regex operations</name>
+	<name>Regular Expression Maven Plugin</name>
+	<description>A Maven plugin for regular expression operations</description>
+	<url>https://bitbucket.org/inteligr8/regex-maven-plugin</url>
+
+	<licenses>
+		<license>
+			<name>GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007</name>
+			<url>https://www.gnu.org/licenses/lgpl-3.0.txt</url>
+		</license>
+	</licenses>
 
 	<scm>
+		<connection>scm:git:https://bitbucket.org/inteligr8/regex-maven-plugin.git</connection>
+		<developerConnection>scm:git:git@bitbucket.org:inteligr8/regex-maven-plugin.git</developerConnection>
 		<url>https://bitbucket.org/inteligr8/regex-maven-plugin</url>
 	</scm>
 	<organization>
@@ -32,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>
@@ -44,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>
@@ -55,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>
@@ -142,19 +153,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>javadoc</id>
-						<phase>package</phase>
-						<goals><goal>jar</goal></goals>
-						<configuration>
-							<show>public</show>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 	
@@ -189,14 +187,56 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>ossrh-release</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-source-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>source</id>
+								<phase>package</phase>
+								<goals><goal>jar-no-fork</goal></goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>javadoc</id>
+								<phase>package</phase>
+								<goals><goal>jar</goal></goals>
+								<configuration>
+									<show>public</show>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>sign</id>
+								<phase>verify</phase>
+								<goals><goal>sign</goal></goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.13</version>
+						<extensions>true</extensions>
+						<configuration>
+							<serverId>ossrh</serverId>
+							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
-
-	<distributionManagement>
-		<repository>
-			<id>inteligr8-releases</id>
-			<name>Inteligr8 Releases</name>
-			<url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
-		</repository>
-	</distributionManagement>
-
 </project>

src/it/copy-file/pom.xml

@@ -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

@@ -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

@@ -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

@@ -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-property/pom.xml

@@ -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-text/pom.xml

@@ -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/move-file/pom.xml

@@ -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/replace-file-content/folder1/file12.txt

@@ -3,4 +3,6 @@ this is a multi line test file.
 
 it is supposed to emulate larger files and multiline pattern matching.
 
+sometimes this doesn՚t work with unicode characters.
+
 good luck!

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

@@ -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>
@@ -160,17 +160,17 @@
 								</requireFileChecksum>
 								<requireFileChecksum>
 									<file>${project.build.directory}/noreplace-one/folder1/file12.txt</file>
-									<checksum>925a6e3bd25cdd61695aa55d008ab4d2</checksum>
+									<checksum>725d3a15f631dda5b058357129fd17fd</checksum>
 									<type>md5</type>
 								</requireFileChecksum>
 								<requireFileChecksum>
 									<file>${project.build.directory}/replace-linestart/file12.txt</file>
-									<checksum>fb1f2b040970526fc99b1339f22465f1</checksum>
+									<checksum>791882a340c18da89b524d7735cc085c</checksum>
 									<type>md5</type>
 								</requireFileChecksum>
 								<requireFileChecksum>
 									<file>${basedir}/folder1/file12.txt</file>
-									<checksum>a7f509275e16ff57cd7756cdca70822a</checksum>
+									<checksum>6fb82d67ec64b04df220a11adfba81a3</checksum>
 									<type>md5</type>
 								</requireFileChecksum>
 							</rules>

src/it/replace-properties/pom.xml

@@ -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/replace-property/pom.xml

@@ -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/replace-text/pom.xml

@@ -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/main/java/com/inteligr8/maven/StandardProjectPropertyResolver.java

@@ -21,9 +21,10 @@ import org.apache.maven.model.Profile;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
 
-@Component(role = ProjectPropertyResolver.class)
-public class StandardProjectPropertyResolver implements ProjectPropertyResolver {
+@Component(role = ProjectPropertyResolver.class, instantiationStrategy = "per-lookup")
+public class StandardProjectPropertyResolver extends AbstractLogEnabled implements ProjectPropertyResolver {
 	
 	@Requirement
 	private MavenSession session;
@@ -51,34 +52,38 @@ public class StandardProjectPropertyResolver implements ProjectPropertyResolver
     private Properties findPropertiesObject(String key) {
     	// search the user/cli properties first
     	Properties props = this.session.getUserProperties();
-    	if (props.containsKey(key))
+    	if (props.containsKey(key)) {
+    	    this.getLogger().debug("Found in session user properties: " + key);
     		return props;
-    	
-    	// search the profiles next; in order (FIXME maybe we should go backwards?)
-    	for (Profile profile : this.project.getActiveProfiles()) {
-    		props = profile.getProperties();
-    		if (props.containsKey(key))
-    			return props;
     	}
     	
-    	// now look at the project props
-    	props = this.project.getProperties();
-		if (props.containsKey(key))
-			return props;
-		
-		// now recursively look up the parent project props
-		MavenProject ancestor = this.project.getParent();
-		while (ancestor != null) {
-			props = ancestor.getProperties();
-			if (props.containsKey(key))
-				return props;
-			ancestor = ancestor.getParent();
-		}
+    	MavenProject ancestor = this.project;
+        while (ancestor != null) {
+        	// search the profiles next; in order (FIXME maybe we should go backwards?)
+        	for (Profile profile : ancestor.getActiveProfiles()) {
+        		props = profile.getProperties();
+        		if (props.containsKey(key)) {
+                    this.getLogger().debug("Found in project profile properties: " + ancestor.getArtifact() + ": " + profile.getId() + ": " + key);
+        			return props;
+        		}
+        	}
+        	
+        	// now look at the project props
+        	props = ancestor.getProperties();
+    		if (props.containsKey(key)) {
+                this.getLogger().debug("Found in project properties: " + ancestor.getArtifact() + ": " + key);
+    			return props;
+    		}
+
+            ancestor = ancestor.getParent();
+        }
 
     	// search the system properties last (FIXME is this right?)
     	props = this.session.getSystemProperties();
-    	if (props.containsKey(key))
+    	if (props.containsKey(key)) {
+            this.getLogger().debug("Found in system properties: " + key);
     		return props;
+    	}
 		
 		return null;
     }

src/main/java/com/inteligr8/maven/model/Regex.java

@@ -18,6 +18,7 @@ public class Regex implements Normalizable {
 	
 	private String pattern;
 	private String replacement;
+	private String previousPattern;
 	
 	public String getPattern() {
 		return this.pattern;
@@ -27,6 +28,10 @@ public class Regex implements Normalizable {
 		return this.replacement;
 	}
 	
+	public String getPreviousPattern() {
+        return previousPattern;
+    }
+	
 	public Regex setPattern(String pattern) {
 		this.pattern = pattern;
 		return this;
@@ -37,6 +42,11 @@ public class Regex implements Normalizable {
 		return this;
 	}
 	
+	public Regex setPreviousPattern(String previousPattern) {
+        this.previousPattern = previousPattern;
+        return this;
+    }
+	
 	@Override
 	public void normalize() {
 		if (this.replacement == null)

src/main/java/com/inteligr8/maven/regex/AbstractMatchMojo.java

@@ -48,8 +48,10 @@ public abstract class AbstractMatchMojo extends AbstractRegexMojo {
 	@Override
 	protected void executeOnText(Properties props, String text, String newPropertyName) {
 		boolean matches = this.matches(text);
-		if (matches)
-        	this.getLog().debug("Matches!");
+        if (this.verbose)
+            this.getLog().info("Setting property: " + newPropertyName + ": " + matches);
+        else if (matches)
+        	this.getLog().info("Matches!");
 		if (props == null)
 			props = this.project.getProperties();
 		props.setProperty(newPropertyName, String.valueOf(matches));
@@ -97,11 +99,17 @@ public abstract class AbstractMatchMojo extends AbstractRegexMojo {
         	
     		Matcher matcher = pattern.matcher(text);
     		if (this.allowPartialMatch) {
-    			if (matcher.find())
+    			if (matcher.find()) {
+                    if (this.verbose)
+                        this.getLog().info("Pattern '" + pattern + "' matches text: " + text);
     				return !this.negate;
+    			}
     		} else {
-    			if (matcher.matches())
+    			if (matcher.matches()) {
+                    if (this.verbose)
+                        this.getLog().info("Pattern '" + pattern + "' matches text: " + text);
     				return !this.negate;
+    			}
     		}
     	}
 

src/main/java/com/inteligr8/maven/regex/AbstractRegexMojo.java

@@ -16,8 +16,6 @@ package com.inteligr8.maven.regex;
 
 import java.util.Properties;
 
-import javax.annotation.OverridingMethodsMustInvokeSuper;
-
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -47,6 +45,9 @@ public abstract class AbstractRegexMojo extends AbstractMojo {
 	
 	@Parameter( property = "skip", required = true, defaultValue = "false" )
 	protected boolean skip = false;
+    
+    @Parameter( property = "verbose", required = true, defaultValue = "false" )
+    protected boolean verbose = false;
 
     public final void execute() throws MojoExecutionException, MojoFailureException {
     	if (this.skip) {
@@ -63,17 +64,14 @@ public abstract class AbstractRegexMojo extends AbstractMojo {
     
     protected abstract void go() throws MojoExecutionException, MojoFailureException;
 
-    @OverridingMethodsMustInvokeSuper
     protected void validateParamsPreNormalization() throws MojoFailureException {
     	this.getLog().debug("Validating parameters before their normalization");
     }
 
-    @OverridingMethodsMustInvokeSuper
     protected void normalizeParameters() throws MojoFailureException {
     	this.getLog().debug("Normalizing parameters");
     }
 
-    @OverridingMethodsMustInvokeSuper
     protected void validateParamsPostNormalization() throws MojoFailureException {
     	this.getLog().debug("Validating parameters after their normalization");
     }

src/main/java/com/inteligr8/maven/regex/AbstractReplaceMojo.java

@@ -24,14 +24,14 @@ import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutableTriple;
+import org.apache.commons.lang3.tuple.Triple;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Parameter;
 
@@ -41,10 +41,10 @@ import com.inteligr8.nio.DelimitedReadableByteChannel;
 public abstract class AbstractReplaceMojo extends AbstractRegexMojo {
 	
 	@Parameter( property = "regexes", required = true )
-	protected List<Regex> regexes;
+	protected Regex[] regexes;
 
 	// Pattern does not implement hashCode, so not using a Map
-	private List<Pair<Pattern, String>> compiledRegexes;
+	private List<Triple<Pattern, String, Pattern>> compiledRegexes;
     
 	@Override
 	protected void executeOnText(Properties props, String text, String newPropertyName) {
@@ -52,9 +52,13 @@ public abstract class AbstractReplaceMojo extends AbstractRegexMojo {
 			text = "";
     	String originalText = text;
     	text = this.replaceAll(text);
-    	
-		if (this.getLog().isDebugEnabled() && !text.equals(originalText))
-        	this.getLog().debug("Manipulated value: " + text);
+
+    	if (!text.equals(originalText)) {
+            if (this.verbose)
+                this.getLog().info("Setting property: " + newPropertyName + ": " + text);
+            else if (this.getLog().isDebugEnabled())
+            	this.getLog().debug("Manipulated value: " + text);
+    	}
 		if (props == null)
 			props = this.project.getProperties();
 		props.setProperty(newPropertyName, text);
@@ -118,12 +122,20 @@ public abstract class AbstractReplaceMojo extends AbstractRegexMojo {
 		if (this.getLog().isDebugEnabled())
 			this.getLog().debug("replace first: " + text.length());
 		
-    	for (Pair<Pattern, String> regex : this.compiledRegexes) {
+    	for (Triple<Pattern, String, Pattern> regex : this.compiledRegexes) {
         	this.getLog().debug("Applying regex pattern: " + regex.getLeft());
         	this.getLog().debug("Operating on value: " + text);
         	
     		Matcher matcher = regex.getLeft().matcher(text);
-    		text = matcher.replaceFirst(regex.getRight());
+    		if (regex.getRight() == null) {
+    		    text = matcher.replaceFirst(regex.getMiddle());
+    		} else if (matcher.find()) {
+                Integer previousMatchStart = this.findLastMatchIndex(regex.getRight(), text.substring(0, matcher.start()));
+    		    text = text.substring(0, previousMatchStart) + text.substring(matcher.start());
+
+                matcher = regex.getLeft().matcher(text);
+                text = matcher.replaceFirst(regex.getMiddle());
+    		}
     	}
     	
     	return text;
@@ -196,25 +208,54 @@ public abstract class AbstractReplaceMojo extends AbstractRegexMojo {
 	protected String replaceAll(String text) {
 		if (text == null)
 			text = "";
-		if (this.getLog().isDebugEnabled())
-			this.getLog().debug("replace all: " + text.length());
 		
-    	for (Pair<Pattern, String> regex : this.compiledRegexes) {
+    	for (Triple<Pattern, String, Pattern> regex : this.compiledRegexes) {
         	this.getLog().debug("Applying regex pattern: " + regex.getLeft());
         	this.getLog().debug("Operating on value: " + text);
         	
     		Matcher matcher = regex.getLeft().matcher(text);
-    		text = matcher.replaceAll(regex.getRight());
+    		if (regex.getRight() == null) {
+    		    String newtext = matcher.replaceAll(regex.getMiddle());
+    		    if (this.verbose)
+    		        this.getLog().info("Pattern '" + regex.getLeft() + "' matches text: " + text + "; replaced with: " + newtext);
+    		    text = newtext;
+            } else while (matcher.find()) {
+                Integer previousMatchStart = this.findLastMatchIndex(regex.getRight(), text.substring(0, matcher.start()));
+                if (previousMatchStart == null) {
+                    // the previous pattern matches nothing; ignore
+                } else {
+                    String newtext = text.substring(0, previousMatchStart) + text.substring(matcher.start());
+                    if (this.verbose)
+                        this.getLog().info("Pattern '" + regex.getRight() + "' matches text: " + text + "; chopped until next pattern: " + text);
+                    text = newtext;
+    
+                    matcher = regex.getLeft().matcher(text);
+                }
+
+                String newtext = matcher.replaceFirst(regex.getMiddle());
+                if (this.verbose)
+                    this.getLog().info("Pattern '" + regex.getLeft() + "' matches text: " + text + "; replaced with: " + newtext);
+                text = newtext;
+            }
     	}
     	
     	return text;
 	}
+    
+    private Integer findLastMatchIndex(Pattern pattern, String text) {
+        Matcher matcher = pattern.matcher(text);
+        
+        Integer index = null;
+        while (matcher.find())
+            index = matcher.start();
+        return index;
+    }
 	
 	@Override
 	protected void validateParamsPreNormalization() throws MojoFailureException {
 		super.validateParamsPreNormalization();
     	
-    	if (this.regexes == null)
+    	if (this.regexes == null || this.regexes.length == 0)
     		throw new MojoFailureException("A 'regexes' element is required");
     }
     
@@ -222,22 +263,15 @@ public abstract class AbstractReplaceMojo extends AbstractRegexMojo {
 	protected void normalizeParameters() throws MojoFailureException {
 		super.normalizeParameters();
     	
-		ListIterator<Regex> r = this.regexes.listIterator();
-    	while (r.hasNext()) {
-    		Regex regex = r.next();
-    		if (regex == null) {
-    			r.remove();
-    		} else {
-    			regex.normalize();
-    		}
-    	}
+    	for (Regex regex : this.regexes)
+    		regex.normalize();
     }
 	
 	@Override
 	protected void validateParamsPostNormalization() throws MojoFailureException {
 		super.validateParamsPostNormalization();
 
-		if (this.regexes.isEmpty())
+		if (this.regexes == null || this.regexes.length == 0)
 			throw new MojoFailureException("At least one 'regexes' element is required");
     	
     	this.compiledRegexes = new LinkedList<>();
@@ -245,7 +279,9 @@ public abstract class AbstractReplaceMojo extends AbstractRegexMojo {
         	this.getLog().debug("Compiling regex pattern: " + regex.getPattern());
         	try {
 	    		Pattern pattern = Pattern.compile(regex.getPattern());
-	    		this.compiledRegexes.add(new ImmutablePair<Pattern, String>(pattern, regex.getReplacement()));
+	    		String previousPatternStr = StringUtils.trimToNull(regex.getPreviousPattern());
+                Pattern previousPattern = previousPatternStr == null ? null : Pattern.compile(previousPatternStr);
+	    		this.compiledRegexes.add(new ImmutableTriple<>(pattern, regex.getReplacement(), previousPattern));
         	} catch (PatternSyntaxException pse) {
         		throw new MojoFailureException("'" + regex.getPattern() + "' is not a valid regular expression: " + pse.getMessage());
         	}

src/main/java/com/inteligr8/maven/regex/CopyFileMojo.java

@@ -33,6 +33,12 @@ public class CopyFileMojo extends AbstractFileMojo {
 		} else {
 			Files.copy(sourcePath, targetPath);
 		}
+
+		if (this.verbose) {
+		    this.getLog().info("Copied " + sourcePath + " to " + targetPath);
+		} else {
+            this.getLog().info("Copied " + sourcePath.getFileName() + " to " + targetPath);
+		}
 	}
     
 }

src/main/java/com/inteligr8/maven/regex/MatchFileContentMojo.java

@@ -47,13 +47,15 @@ public class MatchFileContentMojo extends AbstractMatchMojo {
     	this.getLog().debug("Executing file regex match");
     	
     	boolean matches = this.matchesContentInFileSet();
-    	if (matches)
+    	if (this.verbose)
+    	    this.getLog().info("Setting property: " + this.newProperty + ": " + matches);
+    	else if (matches)
     		this.getLog().info("Matches!");
     	this.project.getProperties().setProperty(this.newProperty, String.valueOf(matches));
     }
     
     private boolean matchesContentInFileSet() throws MojoExecutionException {
-		FileSetManager fsman = new FileSetManager(this.getLog());
+		FileSetManager fsman = new FileSetManager();
 		Path basepath = this.project.getBasedir().toPath();
 		
 		try {
@@ -64,8 +66,11 @@ public class MatchFileContentMojo extends AbstractMatchMojo {
 	    		for (String filePathAndName : filePathsAndNames) {
 	    			Path file = baseInputPath.resolve(filePathAndName);
 	    			if (!Files.isDirectory(file))
-	    				if (this.matches(file, this.chunkSize))
+	    				if (this.matches(file, this.chunkSize)) {
+	    				    if (this.verbose)
+	    				        this.getLog().info("A pattern matches file: " + file);
 	    					return true;
+	    				}
 	    		}
 	    	}
 		} catch (IOException ie) {

src/main/java/com/inteligr8/maven/regex/MatchFilenameMojo.java

@@ -67,8 +67,11 @@ public class MatchFilenameMojo extends AbstractMatchMojo {
 	    			if (!Files.isDirectory(file)) {
 	    	        	getLog().debug("Visiting file: " + file);
 	    	        	
-	    				if (matches(basepath.relativize(file).toString()))
+	    				if (matches(basepath.relativize(file).toString())) {
+                            if (MatchFilenameMojo.this.verbose)
+                                MatchFilenameMojo.this.getLog().info("A pattern matches filename: " + file);
 	    					matches.setTrue();
+	    				}
 	    			}
 	    			return matches.isTrue() ? FileVisitResult.TERMINATE : FileVisitResult.CONTINUE;
 	    		}
@@ -81,8 +84,10 @@ public class MatchFilenameMojo extends AbstractMatchMojo {
     	} catch (IOException ie) {
     		throw new MojoExecutionException(ie.getMessage(), ie);
     	}
-    	
-    	if (matches.booleanValue())
+
+        if (this.verbose)
+            this.getLog().info("Setting property: " + this.newProperty + ": " + matches);
+        else if (matches.booleanValue())
     		this.getLog().info("Matches!");
     	this.project.getProperties().setProperty(this.newProperty, matches.toString());
     }

src/main/java/com/inteligr8/maven/regex/MoveFileMojo.java

@@ -33,6 +33,12 @@ public class MoveFileMojo extends AbstractFileMojo {
 		} else {
 			Files.move(sourcePath, targetPath);
 		}
+
+        if (this.verbose) {
+            this.getLog().info("Moved " + sourcePath + " to " + targetPath);
+        } else {
+            this.getLog().info("Moved " + sourcePath.getFileName() + " to " + targetPath);
+        }
 	}
     
 }

src/main/java/com/inteligr8/maven/regex/ReplaceFileContentMojo.java

@@ -47,7 +47,7 @@ public class ReplaceFileContentMojo extends AbstractReplaceMojo {
     
     private boolean replaceContentInFileSet() throws MojoExecutionException {
     	boolean didReplace = false;
-		FileSetManager fsman = new FileSetManager(this.getLog());
+		FileSetManager fsman = new FileSetManager();
 		Path basepath = this.project.getBasedir().toPath();
 		
 		try {
@@ -62,8 +62,13 @@ public class ReplaceFileContentMojo extends AbstractReplaceMojo {
 	    			if (!Files.exists(tofile.getParent()))
 	    				Files.createDirectories(tofile.getParent());
 	    			
-	    			if (!Files.isDirectory(file))
-	    				didReplace = this.replaceAll(file, tofile, this.chunkSize) || didReplace;
+	    			if (!Files.isDirectory(file)) {
+	    			    if (this.replaceAll(file, tofile, this.chunkSize)) {
+                            if (this.verbose)
+                                this.getLog().info("A pattern replaced in file: " + file + " => " + tofile);
+                            didReplace = true;
+	    			    }
+	    			}
 	    		}
 	    	}
 		} catch (IOException ie) {

src/main/java/com/inteligr8/maven/regex/ReplaceTextMojo.java

@@ -28,7 +28,7 @@ public class ReplaceTextMojo extends AbstractReplaceMojo {
 	@Parameter( property = "text", required = true )
 	protected String text;
 	
-	@Parameter( property = "newProperty", required = false )
+	@Parameter( property = "newProperty", required = true )
 	protected String newProperty;
 
     @Override

src/main/java/com/inteligr8/nio/DelimitedReadableByteChannel.java

@@ -23,8 +23,6 @@ import java.nio.charset.CharsetDecoder;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.annotation.OverridingMethodsMustInvokeSuper;
-
 public class DelimitedReadableByteChannel implements ReadableByteChannel {
 
 	private final CharBuffer buffer;
@@ -50,7 +48,6 @@ public class DelimitedReadableByteChannel implements ReadableByteChannel {
 	}
 	
 	@Override
-	@OverridingMethodsMustInvokeSuper
 	public void close() throws IOException {
 		this.rbchannel.close();
 	}