Fix vertx build.gradle files, jacoco gradle config, update jruby vers…

…ion. Update maven-docker-compose-plugin configuration in all pom.xml files.
daggerok · Jan 11, 2019 · 8339483 · 8339483
1 parent 827312c
commit 8339483
Show file tree

Hide file tree

Showing 58 changed files with 945 additions and 511 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/generators/app/templates/_common/gradle/jacoco.gradle b/generators/app/templates/_common/gradle/jacoco.gradle
@@ -36,9 +36,9 @@ subprojects {
   jacocoTestReport {
     def main = sourceSets.main
     def srcDirs = main.allSource.srcDirs
-    additionalSourceDirs = files(srcDirs)
-    sourceDirectories = files(srcDirs)
-    classDirectories = files(main.output)
+    additionalSourceDirs.from files(srcDirs)
+    sourceDirectories.from files(srcDirs)
+    classDirectories.from files(main.output)
     reports {
       xml.enabled = false
       csv.enabled = false
@@ -52,20 +52,20 @@ jacocoTestReport {
   def main = subprojects.sourceSets.main
   def srcDirs = main.allSource.srcDirs
   dependsOn = subprojects.check
-  additionalSourceDirs = files(srcDirs)
-  sourceDirectories = files(srcDirs)
-  classDirectories = files(main.output)
-  executionData = files(subprojects.jacocoTestReport.executionData)
+  additionalSourceDirs.from files(srcDirs)
+  sourceDirectories.from files(srcDirs)
+  classDirectories.from files(main.output)
+  executionData.from files(subprojects.jacocoTestReport.executionData)
   afterEvaluate {
-    classDirectories = files(classDirectories.files.collect {
+    classDirectories.from(files(classDirectories.files.collect {
       fileTree(
         dir    : it,
         exclude: [
           '*donot/check/me*',
           '*dont/check/metoo*',
         ]
       )
-    })
+    }))
   }
   reports {
     xml.enabled = false
@@ -77,8 +77,6 @@ jacocoTestReport {
     true
   }
   doFirst {
-    executionData = files(executionData.findAll {
-      it.exists()
-    })
+    executionData.from files(executionData.findAll { it.exists() })
   }
 }
diff --git a/generators/app/templates/java-akka-actor/build.gradle b/generators/app/templates/java-akka-actor/build.gradle
@@ -17,7 +17,13 @@ buildscript {
 
   dependencies {
     classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
-    classpath 'org.jruby:jruby-complete:9.1.13.0'
+    classpath 'org.jruby:jruby-complete:9.2.5.0'
+  }
+
+  configurations.all {
+    resolutionStrategy {
+      force 'org.codehaus.groovy:groovy-all:2.5.4' // asciidoctor
+    }
   }
 }
 

diff --git a/generators/app/templates/java-akka-actor/pom.xml b/generators/app/templates/java-akka-actor/pom.xml
@@ -272,30 +272,38 @@
             <groupId>com.dkanejs.maven.plugins</groupId>
             <artifactId>docker-compose-maven-plugin</artifactId>
             <version>2.2.0</version>
-
             <executions>
               <execution>
                 <id>up</id>
-                <!--<phase>process-resources</phase>-->
                 <phase>verify</phase>
                 <goals>
                   <goal>up</goal>
                 </goals>
               </execution>
               <execution>
                 <id>down</id>
-                <!--<phase>test</phase>-->
                 <phase>verify</phase>
                 <goals>
                   <goal>down</goal>
                 </goals>
               </execution>
+              <execution>
+                <id>help</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>help</goal>
+                </goals>
+              </execution>
             </executions>
-
             <configuration>
+              <build>true</build>
               <composeFile>${project.basedir}/docker-compose-maven.yaml</composeFile>
               <detachedMode>true</detachedMode>
+              <removeImages>true</removeImages>
+              <removeImagesType>local</removeImagesType>
+              <removeOrphans>true</removeOrphans>
               <removeVolumes>true</removeVolumes>
+              <!--<verbose>true</verbose>-->
               <detail>true</detail>
             </configuration>
           </plugin>

diff --git a/generators/app/templates/java-ee-cdi-full-multi-project/build.gradle b/generators/app/templates/java-ee-cdi-full-multi-project/build.gradle
@@ -10,7 +10,13 @@ buildscript {
 
   dependencies {
     classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
-    classpath 'org.jruby:jruby-complete:9.1.13.0'
+    classpath 'org.jruby:jruby-complete:9.2.5.0'
+  }
+
+  configurations.all {
+    resolutionStrategy {
+      force 'org.codehaus.groovy:groovy-all:2.5.4' // asciidoctor
+    }
   }
 }
 

diff --git a/generators/app/templates/java-ee-cdi-full-multi-project/ear/pom.xml b/generators/app/templates/java-ee-cdi-full-multi-project/ear/pom.xml
@@ -93,11 +93,23 @@
               <goal>down</goal>
             </goals>
           </execution>
+          <execution>
+            <id>help</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>help</goal>
+            </goals>
+          </execution>
         </executions>
         <configuration>
+          <build>true</build>
           <composeFile>${project.basedir}/../docker-compose-maven.yaml</composeFile>
           <detachedMode>true</detachedMode>
+          <removeImages>true</removeImages>
+          <removeImagesType>local</removeImagesType>
+          <removeOrphans>true</removeOrphans>
           <removeVolumes>true</removeVolumes>
+          <!--<verbose>true</verbose>-->
           <detail>true</detail>
         </configuration>
       </plugin>

diff --git a/generators/app/templates/java-ee-cdi-full-multi-project/pom.xml b/generators/app/templates/java-ee-cdi-full-multi-project/pom.xml
@@ -9,7 +9,8 @@
 
   <groupId>com.github.daggerok</groupId>
   <version>0.0.1</version>
-  <artifactId><%= projectDirectory %></artifactId>
+  <artifactId><%= projectDirectory %>
+  </artifactId>
   <packaging>pom</packaging>
 
   <modules>
@@ -254,25 +255,35 @@
             <executions>
               <execution>
                 <id>up</id>
-                <!--<phase>process-resources</phase>-->
                 <phase>verify</phase>
                 <goals>
                   <goal>up</goal>
                 </goals>
               </execution>
               <execution>
                 <id>down</id>
-                <!--<phase>test</phase>-->
                 <phase>verify</phase>
                 <goals>
                   <goal>down</goal>
                 </goals>
               </execution>
+              <execution>
+                <id>help</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>help</goal>
+                </goals>
+              </execution>
             </executions>
             <configuration>
+              <build>true</build>
               <composeFile>${project.basedir}/docker-compose-maven.yaml</composeFile>
               <detachedMode>true</detachedMode>
+              <removeImages>true</removeImages>
+              <removeImagesType>local</removeImagesType>
+              <removeOrphans>true</removeOrphans>
               <removeVolumes>true</removeVolumes>
+              <!--<verbose>true</verbose>-->
               <detail>true</detail>
             </configuration>
           </plugin>

diff --git a/generators/app/templates/java-ee-ejb-full-multi-project/build.gradle b/generators/app/templates/java-ee-ejb-full-multi-project/build.gradle
@@ -10,7 +10,13 @@ buildscript {
 
   dependencies {
     classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
-    classpath 'org.jruby:jruby-complete:9.1.13.0'
+    classpath 'org.jruby:jruby-complete:9.2.5.0'
+  }
+
+  configurations.all {
+    resolutionStrategy {
+      force 'org.codehaus.groovy:groovy-all:2.5.4' // asciidoctor
+    }
   }
 }
 

diff --git a/generators/app/templates/java-ee-ejb-full-multi-project/ear/pom.xml b/generators/app/templates/java-ee-ejb-full-multi-project/ear/pom.xml
@@ -91,11 +91,23 @@
               <goal>down</goal>
             </goals>
           </execution>
+          <execution>
+            <id>help</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>help</goal>
+            </goals>
+          </execution>
         </executions>
         <configuration>
+          <build>true</build>
           <composeFile>${project.basedir}/../docker-compose-maven.yaml</composeFile>
           <detachedMode>true</detachedMode>
+          <removeImages>true</removeImages>
+          <removeImagesType>local</removeImagesType>
+          <removeOrphans>true</removeOrphans>
           <removeVolumes>true</removeVolumes>
+          <!--<verbose>true</verbose>-->
           <detail>true</detail>
         </configuration>
       </plugin>

diff --git a/generators/app/templates/java-ee-ejb-full-multi-project/pom.xml b/generators/app/templates/java-ee-ejb-full-multi-project/pom.xml
@@ -252,31 +252,38 @@
             <groupId>com.dkanejs.maven.plugins</groupId>
             <artifactId>docker-compose-maven-plugin</artifactId>
             <version>2.2.0</version>
-
             <executions>
               <execution>
                 <id>up</id>
-                <!--<phase>process-resources</phase>-->
                 <phase>verify</phase>
                 <goals>
                   <goal>up</goal>
                 </goals>
               </execution>
-
               <execution>
                 <id>down</id>
-                <!--<phase>test</phase>-->
                 <phase>verify</phase>
                 <goals>
                   <goal>down</goal>
                 </goals>
               </execution>
+              <execution>
+                <id>help</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>help</goal>
+                </goals>
+              </execution>
             </executions>
-
             <configuration>
+              <build>true</build>
               <composeFile>${project.basedir}/docker-compose-maven.yaml</composeFile>
               <detachedMode>true</detachedMode>
+              <removeImages>true</removeImages>
+              <removeImagesType>local</removeImagesType>
+              <removeOrphans>true</removeOrphans>
               <removeVolumes>true</removeVolumes>
+              <!--<verbose>true</verbose>-->
               <detail>true</detail>
             </configuration>
           </plugin>

diff --git a/generators/app/templates/java-ee-faces/build.gradle b/generators/app/templates/java-ee-faces/build.gradle
@@ -15,7 +15,13 @@ buildscript {
 
   dependencies {
     classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
-    classpath 'org.jruby:jruby-complete:9.1.13.0'
+    classpath 'org.jruby:jruby-complete:9.2.5.0'
+  }
+
+  configurations.all {
+    resolutionStrategy {
+      force 'org.codehaus.groovy:groovy-all:2.5.4' // asciidoctor
+    }
   }
 }
 

diff --git a/generators/app/templates/java-ee-faces/pom.xml b/generators/app/templates/java-ee-faces/pom.xml
@@ -285,25 +285,35 @@
             <executions>
               <execution>
                 <id>up</id>
-                <!--<phase>process-resources</phase>-->
                 <phase>verify</phase>
                 <goals>
                   <goal>up</goal>
                 </goals>
               </execution>
               <execution>
                 <id>down</id>
-                <!--<phase>test</phase>-->
                 <phase>verify</phase>
                 <goals>
                   <goal>down</goal>
                 </goals>
               </execution>
+              <execution>
+                <id>help</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>help</goal>
+                </goals>
+              </execution>
             </executions>
             <configuration>
+              <build>true</build>
               <composeFile>${project.basedir}/docker-compose-maven.yaml</composeFile>
               <detachedMode>true</detachedMode>
+              <removeImages>true</removeImages>
+              <removeImagesType>local</removeImagesType>
+              <removeOrphans>true</removeOrphans>
               <removeVolumes>true</removeVolumes>
+              <!--<verbose>true</verbose>-->
               <detail>true</detail>
             </configuration>
           </plugin>

diff --git a/generators/app/templates/java-ee-thymeleaf/build.gradle b/generators/app/templates/java-ee-thymeleaf/build.gradle
@@ -21,7 +21,13 @@ buildscript {
 
   dependencies {
     classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
-    classpath 'org.jruby:jruby-complete:9.1.13.0'
+    classpath 'org.jruby:jruby-complete:9.2.5.0'
+  }
+
+  configurations.all {
+    resolutionStrategy {
+      force 'org.codehaus.groovy:groovy-all:2.5.4' // asciidoctor
+    }
   }
 }
 

diff --git a/generators/app/templates/java-ee-thymeleaf/pom.xml b/generators/app/templates/java-ee-thymeleaf/pom.xml
@@ -380,25 +380,35 @@
             <executions>
               <execution>
                 <id>up</id>
-                <!--<phase>process-resources</phase>-->
                 <phase>verify</phase>
                 <goals>
                   <goal>up</goal>
                 </goals>
               </execution>
               <execution>
                 <id>down</id>
-                <!--<phase>test</phase>-->
                 <phase>verify</phase>
                 <goals>
                   <goal>down</goal>
                 </goals>
               </execution>
+              <execution>
+                <id>help</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>help</goal>
+                </goals>
+              </execution>
             </executions>
             <configuration>
+              <build>true</build>
               <composeFile>${project.basedir}/docker-compose-maven.yaml</composeFile>
               <detachedMode>true</detachedMode>
+              <removeImages>true</removeImages>
+              <removeImagesType>local</removeImagesType>
+              <removeOrphans>true</removeOrphans>
               <removeVolumes>true</removeVolumes>
+              <!--<verbose>true</verbose>-->
               <detail>true</detail>
             </configuration>
           </plugin>

diff --git a/generators/app/templates/java-ee/build.gradle b/generators/app/templates/java-ee/build.gradle
@@ -20,7 +20,13 @@ buildscript {
 
   dependencies {
     classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
-    classpath 'org.jruby:jruby-complete:9.1.13.0'
+    classpath 'org.jruby:jruby-complete:9.2.5.0'
+  }
+
+  configurations.all {
+    resolutionStrategy {
+      force 'org.codehaus.groovy:groovy-all:2.5.4' // asciidoctor
+    }
   }
 }