#46 prepared for multiple allowed modes to keep comments and refactoring

Author: raydac

jcp-tests/jcp-test-gradle-5/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         flatDir dirs: "../../jcp/target"
     }
     dependencies {
-        classpath "com.igormaznitsa:jcp:7.0.6-SNAPSHOT"
+        classpath "com.igormaznitsa:jcp:$jcp_test_version"
     }
 }
 

jcp-tests/jcp-test-gradle-5/pom.xml

@@ -70,9 +70,8 @@
                 <argument>--rerun-tasks</argument>
                 <argument>--scan</argument>
                 <argument>--full-stacktrace</argument>
-                <argument>
-                  -Pjcp_plugin_path=${project.basedir}${file.separator}..${file.separator}..${file.separator}jcp-gradle-plugin${file.separator}build${file.separator}libs${file.separator}jcp-gradle-plugin-${jcp.test.version}.jar
-                </argument>
+                <argument>-Pjcp_test_version=${jcp.test.version}</argument>
+                <argument>-Pjcp_plugin_path=${project.basedir}${file.separator}..${file.separator}..${file.separator}jcp-gradle-plugin${file.separator}build${file.separator}libs${file.separator}jcp-gradle-plugin-${jcp.test.version}.jar</argument>
               </arguments>
             </configuration>
             <goals>

jcp-tests/jcp-test-gradle-6/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         flatDir dirs: "../../jcp/target"
     }
     dependencies {
-        classpath "com.igormaznitsa:jcp:7.0.6-SNAPSHOT"
+        classpath "com.igormaznitsa:jcp:$jcp_test_version"
     }
 }
 
@@ -49,7 +49,7 @@ preprocess {
     verbose = true
     clearTarget = true
     careForLastEol = true
-    keepComments = true
+    keepComments = 'keep_all'
     excludeFolders = ['**/some1', '**/some2']
     configFiles = ['./configFile.txt']
     keepLines = true

jcp-tests/jcp-test-gradle-6/pom.xml

@@ -70,6 +70,7 @@
                 <argument>--rerun-tasks</argument>
                 <argument>--scan</argument>
                 <argument>--full-stacktrace</argument>
+                <argument>-Pjcp_test_version=${jcp.test.version}</argument>
                 <argument>
                   -Pjcp_plugin_path=${project.basedir}${file.separator}..${file.separator}..${file.separator}jcp-gradle-plugin${file.separator}build${file.separator}libs${file.separator}jcp-gradle-plugin-${jcp.test.version}.jar
                 </argument>

jcp-tests/jcp-test-gradle-7/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         flatDir dirs: "../../jcp/target"
     }
     dependencies {
-        classpath "com.igormaznitsa:jcp:7.0.6-SNAPSHOT"
+        classpath "com.igormaznitsa:jcp:$jcp_test_version"
     }
 }
 
@@ -49,7 +49,7 @@ preprocess {
     verbose = true
     clearTarget = true
     careForLastEol = true
-    keepComments = true
+    keepComments = 'remove_all'
     excludeFolders = ['**/some1', '**/some2']
     configFiles = ['./configFile.txt']
     keepLines = true

jcp-tests/jcp-test-gradle-7/pom.xml

@@ -70,6 +70,7 @@
                 <argument>--rerun-tasks</argument>
                 <argument>--scan</argument>
                 <argument>--full-stacktrace</argument>
+                <argument>-Pjcp_test_version=${jcp.test.version}</argument>
                 <argument>
                   -Pjcp_plugin_path=${project.basedir}${file.separator}..${file.separator}..${file.separator}jcp-gradle-plugin${file.separator}build${file.separator}libs${file.separator}jcp-gradle-plugin-${jcp.test.version}.jar
                 </argument>

jcp-tests/jcp-test-gradle-8/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         flatDir dirs: "../../jcp/target"
     }
     dependencies {
-        classpath "com.igormaznitsa:jcp:7.0.6-SNAPSHOT"
+        classpath "com.igormaznitsa:jcp:$jcp_test_version"
     }
 }
 
@@ -49,7 +49,7 @@ preprocess {
     verbose = true
     clearTarget = true
     careForLastEol = true
-    keepComments = true
+    keepComments = 'remove_jcp'
     excludeFolders = ['**/some1', '**/some2']
     configFiles = ['./configFile.txt']
     keepLines = true

jcp-tests/jcp-test-gradle-8/pom.xml

@@ -70,6 +70,7 @@
                 <argument>--rerun-tasks</argument>
                 <argument>--scan</argument>
                 <argument>--full-stacktrace</argument>
+                <argument>-Pjcp_test_version=${jcp.test.version}</argument>
                 <argument>
                   -Pjcp_plugin_path=${project.basedir}${file.separator}..${file.separator}..${file.separator}jcp-gradle-plugin${file.separator}build${file.separator}libs${file.separator}jcp-gradle-plugin-${jcp.test.version}.jar
                 </argument>

jcp-tests/pom.xml

@@ -9,7 +9,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jcp.test.version>7.0.6-SNAPSHOT</jcp.test.version>
+        <jcp.test.version>7.1.0-SNAPSHOT</jcp.test.version>
         <junit.version>5.4.2</junit.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>

jcp/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.igormaznitsa</groupId>
     <artifactId>jcp-pom</artifactId>
-    <version>7.0.6-SNAPSHOT</version>
+    <version>7.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>jcp</artifactId>