Update and simplify maven support in project templates

griffon · Jun 30, 2017 · 633b1fc · 633b1fc
1 parent 141a348
commit 633b1fc
Show file tree

Hide file tree

Showing 10 changed files with 120 additions and 121 deletions.
diff --git a/docs/griffon-guide/src/docs/asciidoc/buildtools/buildtools-maven.adoc b/docs/griffon-guide/src/docs/asciidoc/buildtools/buildtools-maven.adoc
@@ -15,31 +15,32 @@ The `application-master-pom` configures the following plugins:
 [cols="3*", options="header"]
 |===
 | Group                    | ArtifactId                        | Version
-| org.codehaus.mojo        | build-helper-maven-plugin         | 1.9
-| org.eluder.coveralls     | coveralls-maven-plugin            | 2.2.0
-| org.codehaus.mojo        | exec-maven-plugin                 | 1.2.1
-| org.codehaus.mojo        | findbugs-maven-plugin             | 2.5.4
-| pl.project13.maven       | git-commit-id-plugin              | 2.2.1
-| org.codehaus.gmavenplus  | gmavenplus-plugin                 | 1.2
+| org.codehaus.mojo        | appassembler-maven-plugin         | 2.0.0
+| org.codehaus.mojo        | build-helper-maven-plugin         | 3.0.0
+| org.eluder.coveralls     | coveralls-maven-plugin            | 4.3.0
+| org.codehaus.mojo        | exec-maven-plugin                 | 1.6.0
+| org.codehaus.mojo        | findbugs-maven-plugin             | 3.0.4
+| pl.project13.maven       | git-commit-id-plugin              | 2.2.2
+| org.codehaus.gmavenplus  | gmavenplus-plugin                 | 1.5
 | org.jacoco               | jacoco-maven-plugin               | 0.7.9
-| com.zenjava              | javafx-maven-plugin               | 8.2.0
+| com.zenjava              | javafx-maven-plugin               | 8.8.3
 | org.codehaus.mojo        | jdepend-maven-plugin              | 2.0
-| org.apache.maven.plugins | maven-appassembler-plugin         | 1.8.1
-| org.apache.maven.plugins | maven-antrun-plugin               | 1.7
-| org.apache.maven.plugins | maven-assembly-plugin             | 2.4
-| org.apache.maven.plugins | maven-compiler-plugin             | 3.1
-| org.apache.maven.plugins | maven-checkstyle-plugin           | 2.12.1
-| org.apache.maven.plugins | maven-dependency-plugin           | 2.9
-| org.apache.maven.plugins | maven-javadoc-plugin              | 2.9.1
-| org.apache.maven.plugins | maven-jxr-plugin                  | 2.4
-| org.bsc.maven            | maven-processor-plugin            | 2.2.4
-| org.apache.maven.plugins | maven-project-info-reports-plugin | 2.7
-| org.apache.maven.plugins | maven-release-plugin              | 2.5
-| org.apache.maven.plugins | maven-shade-plugin                | 2.3
-| org.apache.maven.plugins | maven-site-plugin                 | 3.4
-| org.apache.maven.plugins | maven-surefire-plugin             | 2.17
-| org.apache.maven.plugins | maven-surefire-report-plugin      | 2.17
-| org.codehaus.mojo        | versions-maven-plugin             | 2.1
+| org.apache.maven.plugins | maven-antrun-plugin               | 1.8
+| org.apache.maven.plugins | maven-assembly-plugin             | 3.0.0
+| org.apache.maven.plugins | maven-changes-plugin              | 2.12.1
+| org.apache.maven.plugins | maven-checkstyle-plugin           | 2.17
+| org.apache.maven.plugins | maven-compiler-plugin             | 3.6.1
+| org.apache.maven.plugins | maven-dependency-plugin           | 3.0.1
+| org.apache.maven.plugins | maven-javadoc-plugin              | 2.10.4
+| org.apache.maven.plugins | maven-jxr-plugin                  | 2.5
+| org.bsc.maven            | maven-processor-plugin            | 3.3.1
+| org.apache.maven.plugins | maven-project-info-reports-plugin | 2.9
+| org.apache.maven.plugins | maven-release-plugin              | 2.5.3
+| org.apache.maven.plugins | maven-shade-plugin                | 3.0.0
+| org.apache.maven.plugins | maven-site-plugin                 | 3.6
+| org.apache.maven.plugins | maven-surefire-plugin             | 2.20
+| org.apache.maven.plugins | maven-surefire-report-plugin      | 2.20
+| org.codehaus.mojo        | versions-maven-plugin             | 2.4
 |===
 
 Of which the following are applied by default:
@@ -52,7 +53,7 @@ include::{master-pom}[tags=plugins,indent=0]
 
 == Dependencies
 
-All Griffon core dependencies have benn added using a `<dependencyManagement>` block as follows:
+All Griffon core dependencies have been added using a `<dependencyManagement>` block as follows:
 
 [source,xml,linenums,options="nowrap"]
 [subs="verbatim,attributes"]
@@ -74,16 +75,6 @@ default configuration provided by the master pom:
 include::{master-pom}[tags=plugin_surefire,indent=0]
 ----
 
-== Repositories
-
-The following repositories are added by default:
-
-[source,xml,linenums,options="nowrap"]
-[subs="verbatim,attributes"]
-----
-include::{master-pom}[tags=repositories,indent=0]
-----
-
 == Profiles
 
 The master pom enables a few profiles to take care of special tasks.

diff --git a/subprojects/application-master-pom/src/pom/master-pom.xml b/subprojects/application-master-pom/src/pom/master-pom.xml
@@ -52,39 +52,40 @@
         <slf4j.version>@slf4j.version@</slf4j.version>
         <spock.version>@spock.version@</spock.version>
         <codenarc.version>0.21</codenarc.version>
+        <spotbugs.version>3.1.0-RC3</spotbugs.version>
         <izpack-standalone.version>4.3.5</izpack-standalone.version>
         <izpack.staging.dir>${project.build.directory}/izpack</izpack.staging.dir>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- plugins -->
-        <plugin.antrun.version>1.7</plugin.antrun.version>
-        <plugin.appassembler.version>1.8.1</plugin.appassembler.version>
-        <plugin.assembly.version>2.4</plugin.assembly.version>
-        <plugin.buildhelper.version>1.9</plugin.buildhelper.version>
-        <plugin.changes.version>2.8</plugin.changes.version>
-        <plugin.checkstyle.version>2.12.1</plugin.checkstyle.version>
-        <plugin.compiler.version>3.1</plugin.compiler.version>
-        <plugin.coveralls.version>2.2.0</plugin.coveralls.version>
-        <plugin.dependency.version>2.9</plugin.dependency.version>
-        <plugin.exec.version>1.2.1</plugin.exec.version>
-        <plugin.findbugs.version>2.5.4</plugin.findbugs.version>
-        <plugin.git.commit.version>2.2.1</plugin.git.commit.version>
-        <plugin.gmavenplus.version>1.2</plugin.gmavenplus.version>
-        <plugin.javadoc.version>2.9.1</plugin.javadoc.version>
-        <plugin.javafx.version>8.7.0</plugin.javafx.version>
+        <plugin.antrun.version>1.8</plugin.antrun.version>
+        <plugin.appassembler.version>2.0.0</plugin.appassembler.version>
+        <plugin.assembly.version>3.0.0</plugin.assembly.version>
+        <plugin.buildhelper.version>3.0.0</plugin.buildhelper.version>
+        <plugin.changes.version>2.12.1</plugin.changes.version>
+        <plugin.checkstyle.version>2.17</plugin.checkstyle.version>
+        <plugin.compiler.version>3.6.1</plugin.compiler.version>
+        <plugin.coveralls.version>4.3.0</plugin.coveralls.version>
+        <plugin.dependency.version>3.0.1</plugin.dependency.version>
+        <plugin.exec.version>1.6.0</plugin.exec.version>
+        <plugin.findbugs.version>3.0.4</plugin.findbugs.version>
+        <plugin.git.commit.version>2.2.2</plugin.git.commit.version>
+        <plugin.gmavenplus.version>1.5</plugin.gmavenplus.version>
+        <plugin.javadoc.version>2.10.4</plugin.javadoc.version>
+        <plugin.javafx.version>8.8.3</plugin.javafx.version>
         <plugin.jacoco.version>0.7.9</plugin.jacoco.version>
         <plugin.jdepend.version>2.0</plugin.jdepend.version>
-        <plugin.jxr.version>2.4</plugin.jxr.version>
+        <plugin.jxr.version>2.5</plugin.jxr.version>
         <plugin.osxappbundle.version>1.0.1</plugin.osxappbundle.version>
-        <plugin.processor.version>2.2.4</plugin.processor.version>
-        <plugin.project-info-reports.version>2.7</plugin.project-info-reports.version>
-        <plugin.release.version>2.5</plugin.release.version>
-        <plugin.shade.version>2.3</plugin.shade.version>
-        <plugin.shade_ext_transformers.version>1.0.0</plugin.shade_ext_transformers.version>
-        <plugin.site.version>3.4</plugin.site.version>
-        <plugin.surefire.version>2.17</plugin.surefire.version>
-        <plugin.versions.version>2.1</plugin.versions.version>
+        <plugin.processor.version>3.3.1</plugin.processor.version>
+        <plugin.project-info-reports.version>2.9</plugin.project-info-reports.version>
+        <plugin.release.version>2.5.3</plugin.release.version>
+        <plugin.shade.version>3.0.0</plugin.shade.version>
+        <plugin.shade_ext_transformers.version>1.0.3</plugin.shade_ext_transformers.version>
+        <plugin.site.version>3.6</plugin.site.version>
+        <plugin.surefire.version>2.20</plugin.surefire.version>
+        <plugin.versions.version>2.4</plugin.versions.version>
         <maven-checkstyle-plugin.configLocation>${project.basedir}/config/checkstyle/checkstyle.xml</maven-checkstyle-plugin.configLocation>
         <!-- javafx signing -->
         <keystore.alias>example-user</keystore.alias>
@@ -99,7 +100,7 @@
     </properties>
 
     <prerequisites>
-        <maven>3.0.4</maven>
+        <maven>3.5.0</maven>
     </prerequisites>
 
     <!-- tag::dependencyManagement[] -->
@@ -278,7 +279,7 @@
                     <version>${plugin.compiler.version}</version>
                     <inherited>true</inherited>
                     <configuration>
-                        <verbose>true</verbose>
+                        <verbose>false</verbose>
                         <fork>true</fork>
                         <source>${maven.compiler.source}</source>
                         <target>${maven.compiler.target}</target>
@@ -430,6 +431,13 @@
                     <artifactId>findbugs-maven-plugin</artifactId>
                     <version>${plugin.findbugs.version}</version>
                     <inherited>true</inherited>
+                    <dependencies>
+                        <dependency>
+                            <groupId>com.github.spotbugs</groupId>
+                            <artifactId>spotbugs</artifactId>
+                            <version>${spotbugs.version}</version>
+                        </dependency>
+                    </dependencies>
                     <configuration>
                         <skip>${findbugs.skip}</skip>
                         <maxHeap>512</maxHeap>
@@ -451,7 +459,7 @@
                         <links>
                             <link>http://www.slf4j.org/apidocs/</link>
                             <link>http://junit.org/junit4/javadoc/latest/</link>
-                            <link>http://static.javadoc.io/com.google.code.findbugs/jsr305/3.0.1</link>
+                            <link>http://aalmiray.github.io/jsr-305/apidocs/</link>
                             <link>http://javax-inject.github.io/javax-inject/api/</link>
                             <link>http://docs.oracle.com/javase/8/docs/api/</link>
                             <link>http://griffon-framework.org/guide/latest/api/</link>
@@ -698,7 +706,7 @@
                         <failOnNoGitDirectory>false</failOnNoGitDirectory>
                         <generateGitPropertiesFile>true</generateGitPropertiesFile>
                         <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
-                        <dateFormat>yyyy-MM-dd'@'HH:mm:ss.SSSZ</dateFormat>
+                        <dateFormat>yyyy-MM-dd'T'HH:mm:ss.SSSZ</dateFormat>
                     </configuration>
                 </plugin>
             </plugins>
@@ -714,10 +722,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.gmavenplus</groupId>
-                <artifactId>gmavenplus-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.bsc.maven</groupId>
                 <artifactId>maven-processor-plugin</artifactId>
@@ -758,10 +762,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
@@ -785,30 +785,6 @@
         </resources>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-        </dependency>
-    </dependencies>
-
-    <!-- tag::repositories[] -->
-    <repositories>
-        <repository>
-            <id>jcenter</id>
-            <url>http://jcenter.bintray.com/</url>
-        </repository>
-        <repository>
-            <id>griffon-plugins</id>
-            <url>http://dl.bintray.com/griffon/griffon-plugins/</url>
-        </repository>
-    </repositories>
-    <!-- end::repositories[] -->
-
     <profiles>
         <!-- tag::profile_binary[] -->
         <profile>
@@ -868,7 +844,7 @@
                                 <id>make-distribution</id>
                                 <phase>package</phase>
                                 <goals>
-                                    <goal>assembly</goal>
+                                    <goal>single</goal>
                                 </goals>
                             </execution>
                         </executions>

diff --git a/templates/griffon-javafx-groovy-templates/templates/griffon-javafx-groovy/pom.xml b/templates/griffon-javafx-groovy-templates/templates/griffon-javafx-groovy/pom.xml
@@ -37,6 +37,12 @@
             <filter>\${project.build.outputDirectory}/git.properties</filter>
         </filters>
         -->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+            </plugin>
+        </plugins>
     </build>
 
     <dependencies>
@@ -82,6 +88,10 @@
             <groupId>org.codehaus.griffon</groupId>
             <artifactId>griffon-core-test</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.griffon</groupId>
+            <artifactId>griffon-javafx-test</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.spockframework</groupId>
             <artifactId>spock-core</artifactId>
@@ -91,10 +101,12 @@
     <repositories>
         <repository>
             <id>jcenter</id>
+            <name>jcenter</name>
             <url>http://jcenter.bintray.com/</url>
         </repository>
         <repository>
             <id>griffon-plugins</id>
+            <name>griffon-plugins</name>
             <url>http://dl.bintray.com/griffon/griffon-plugins</url>
         </repository>
     </repositories>

diff --git a/templates/griffon-javafx-java-templates/templates/griffon-javafx-java/pom.xml b/templates/griffon-javafx-java-templates/templates/griffon-javafx-java/pom.xml
@@ -70,22 +70,20 @@
             <artifactId>griffon-core-test</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
+            <groupId>org.codehaus.griffon</groupId>
+            <artifactId>griffon-javafx-test</artifactId>
         </dependency>
     </dependencies>
 
     <repositories>
         <repository>
             <id>jcenter</id>
+            <name>jcenter</name>
             <url>http://jcenter.bintray.com/</url>
         </repository>
         <repository>
             <id>griffon-plugins</id>
+            <name>griffon-plugins</name>
             <url>http://dl.bintray.com/griffon/griffon-plugins</url>
         </repository>
     </repositories>

diff --git a/templates/griffon-lanterna-groovy-templates/templates/griffon-lanterna-groovy/pom.xml b/templates/griffon-lanterna-groovy-templates/templates/griffon-lanterna-groovy/pom.xml
@@ -29,6 +29,12 @@
             <filter>\${project.build.outputDirectory}/git.properties</filter>
         </filters>
         -->
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+            </plugin>
+        </plugins>
     </build>
 
     <dependencies>
@@ -79,10 +85,12 @@
     <repositories>
         <repository>
             <id>jcenter</id>
+            <name>jcenter</name>
             <url>http://jcenter.bintray.com/</url>
         </repository>
         <repository>
             <id>griffon-plugins</id>
+            <name>griffon-plugins</name>
             <url>http://dl.bintray.com/griffon/griffon-plugins</url>
         </repository>
     </repositories>

diff --git a/templates/griffon-lanterna-java-templates/templates/griffon-lanterna-java/pom.xml b/templates/griffon-lanterna-java-templates/templates/griffon-lanterna-java/pom.xml
@@ -57,23 +57,17 @@
             <groupId>org.codehaus.griffon</groupId>
             <artifactId>griffon-core-test</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-        </dependency>
     </dependencies>
 
     <repositories>
         <repository>
             <id>jcenter</id>
+            <name>jcenter</name>
             <url>http://jcenter.bintray.com/</url>
         </repository>
         <repository>
             <id>griffon-plugins</id>
+            <name>griffon-plugins</name>
             <url>http://dl.bintray.com/griffon/griffon-plugins</url>
         </repository>
     </repositories>