From 613c2d6dd23e8b14204e8eed629d0d013beb001f Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 14 Jul 2017 18:45:40 +0000 Subject: [PATCH] CCM NG: Updated Maven plugins git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4874 8810af33-2d31-482b-a856-94f89814c4df --- ccm-archetype-module/pom.xml | 24 +++++------ ccm-cms-types-agenda/pom.xml | 24 ++++------- ccm-cms-types-bookmark/pom.xml | 17 +++----- ccm-cms-types-decisiontree/pom.xml | 26 ++++-------- ccm-cms-types-externallink/pom.xml | 19 ++++----- ccm-cms-types-faqitem/pom.xml | 24 ++++------- ccm-cms-types-glossaryitem/pom.xml | 24 ++++------- ccm-cms-types-minutes/pom.xml | 24 ++++------- ccm-cms/pom.xml | 18 +++----- ccm-core/pom.xml | 20 ++++++--- ccm-docrepo/pom.xml | 25 +++-------- ccm-shortcuts/pom.xml | 19 +++------ ccm-testutils/pom.xml | 29 ++++++++++--- ccm-xafilesystemadapter/pom.xml | 36 +++++++++++++--- pom.xml | 68 +++++++++++++++++++++++++++--- 15 files changed, 216 insertions(+), 181 deletions(-) diff --git a/ccm-archetype-module/pom.xml b/ccm-archetype-module/pom.xml index b385ad119..da9d88324 100644 --- a/ccm-archetype-module/pom.xml +++ b/ccm-archetype-module/pom.xml @@ -1,19 +1,19 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 - + + org.libreccm + libreccm-parent + 7.0.0-SNAPSHOT + + org.libreccm - libreccm-parent + ccm-archetype-module 7.0.0-SNAPSHOT - - org.libreccm - ccm-archetype-module - 7.0.0-SNAPSHOT + LibreCCM Module archetype + http://www.libreccm.org/devel/modules - LibreCCM Module archetype - http://www.libreccm.org/devel/modules - - + diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml index 98b65d99e..4f78c8cb8 100644 --- a/ccm-cms-types-agenda/pom.xml +++ b/ccm-cms-types-agenda/pom.xml @@ -140,10 +140,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 - 1.7 - 1.7 + 1.8 + 1.8 true true ${project.build.sourceEncoding} @@ -153,7 +152,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 org.libreccm.tests.categories.UnitTest @@ -162,7 +160,6 @@ org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 default-prepare-agent @@ -238,7 +235,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 true true @@ -276,23 +273,23 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.18.1 + 2.20 org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 + 0.7.9 org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.4 org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.8 true utf-8 @@ -318,15 +315,10 @@ - - org.codehaus.mojo - javancss-maven-plugin - 2.1 - org.apache.maven.plugins maven-project-info-reports-plugin - 2.8 + 2.9 diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml index bada09610..52c127416 100644 --- a/ccm-cms-types-bookmark/pom.xml +++ b/ccm-cms-types-bookmark/pom.xml @@ -139,10 +139,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 - 1.7 - 1.7 + 1.8 + 1.8 true true ${project.build.sourceEncoding} @@ -152,7 +151,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 org.libreccm.tests.categories.UnitTest @@ -161,7 +159,6 @@ org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 default-prepare-agent @@ -237,7 +234,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 true true @@ -275,23 +272,23 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.18.1 + 2.20 org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 + 0.7.9 org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.4 org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.8 true utf-8 diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml index f98d785ad..50aca56f6 100644 --- a/ccm-cms-types-decisiontree/pom.xml +++ b/ccm-cms-types-decisiontree/pom.xml @@ -140,10 +140,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 - 1.7 - 1.7 + 1.8 + 1.8 true true ${project.build.sourceEncoding} @@ -153,7 +152,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 org.libreccm.tests.categories.UnitTest @@ -162,7 +160,6 @@ org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 default-prepare-agent @@ -238,7 +235,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 true true @@ -276,27 +273,27 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.18.1 + 2.20 org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 + 0.7.9 org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.4 org.apache.maven.plugins maven-pmd-plugin - 3.4 + 3.8 true utf-8 - 1.7 + 1.8 /rulesets/java/basic.xml /rulesets/java/braces.xml @@ -318,15 +315,10 @@ - - org.codehaus.mojo - javancss-maven-plugin - 2.1 - org.apache.maven.plugins maven-project-info-reports-plugin - 2.8 + 2.9 diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml index f49ad396b..a81076803 100644 --- a/ccm-cms-types-externallink/pom.xml +++ b/ccm-cms-types-externallink/pom.xml @@ -139,10 +139,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 - 1.7 - 1.7 + 1.8 + 1.8 true true ${project.build.sourceEncoding} @@ -152,7 +151,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 org.libreccm.tests.categories.UnitTest @@ -161,7 +159,6 @@ org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 default-prepare-agent @@ -237,7 +234,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 true true @@ -275,23 +272,23 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.18.1 + 2.20 org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 + 0.7.9 org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.4 org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.8 true utf-8 @@ -326,7 +323,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.8 + 2.9 diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml index d6b87cacf..f2d63bb46 100644 --- a/ccm-cms-types-faqitem/pom.xml +++ b/ccm-cms-types-faqitem/pom.xml @@ -139,10 +139,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 - 1.7 - 1.7 + 1.8 + 1.8 true true ${project.build.sourceEncoding} @@ -152,7 +151,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 org.libreccm.tests.categories.UnitTest @@ -161,7 +159,6 @@ org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 default-prepare-agent @@ -237,7 +234,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 true true @@ -275,23 +272,23 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.18.1 + 2.20 org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 + 0.7.9 org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.4 org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.8 true utf-8 @@ -318,15 +315,10 @@ - - org.codehaus.mojo - javancss-maven-plugin - 2.1 - org.apache.maven.plugins maven-project-info-reports-plugin - 2.8 + 2.9 diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml index 23209bb06..6f9e549a2 100644 --- a/ccm-cms-types-glossaryitem/pom.xml +++ b/ccm-cms-types-glossaryitem/pom.xml @@ -139,10 +139,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 - 1.7 - 1.7 + 1.8 + 1.8 true true ${project.build.sourceEncoding} @@ -152,7 +151,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 org.libreccm.tests.categories.UnitTest @@ -161,7 +159,6 @@ org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 default-prepare-agent @@ -237,7 +234,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 true true @@ -275,23 +272,23 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.18.1 + 2.20 org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 + 0.7.9 org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.4 org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.8 true utf-8 @@ -318,15 +315,10 @@ - - org.codehaus.mojo - javancss-maven-plugin - 2.1 - org.apache.maven.plugins maven-project-info-reports-plugin - 2.8 + 2.9 diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml index 3619de291..a9a2fb39c 100644 --- a/ccm-cms-types-minutes/pom.xml +++ b/ccm-cms-types-minutes/pom.xml @@ -140,10 +140,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 - 1.7 - 1.7 + 1.8 + 1.8 true true ${project.build.sourceEncoding} @@ -153,7 +152,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 org.libreccm.tests.categories.UnitTest @@ -162,7 +160,6 @@ org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 default-prepare-agent @@ -238,7 +235,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 true true @@ -276,23 +273,23 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.18.1 + 2.20 org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 + 0.7.9 org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.4 org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.8 true utf-8 @@ -318,15 +315,10 @@ - - org.codehaus.mojo - javancss-maven-plugin - 2.1 - org.apache.maven.plugins maven-project-info-reports-plugin - 2.8 + 2.9 diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml index 7663c49cd..db6022225 100644 --- a/ccm-cms/pom.xml +++ b/ccm-cms/pom.xml @@ -172,7 +172,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 1.8 1.8 @@ -185,7 +184,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 org.libreccm.tests.categories.UnitTest false @@ -266,7 +264,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 true true @@ -304,7 +302,7 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.18.1 + 2.20 false @@ -312,18 +310,18 @@ org.jacoco jacoco-maven-plugin - 0.7.8 + 0.7.9 org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.4 org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.8 true utf-8 @@ -357,7 +355,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.8 + 2.9 @@ -440,7 +438,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -527,7 +524,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 false always @@ -614,7 +610,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -701,7 +696,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 false always diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index c6971a6c2..2a06de518 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -602,6 +602,20 @@ false + + org.codehaus.mojo + versions-maven-plugin + 2.4 + + + + dependency-updates-report + plugin-updates-report + property-updates-report + + + + @@ -712,7 +726,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -793,7 +806,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -877,7 +889,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -955,7 +966,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -1038,7 +1048,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -1116,7 +1125,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml index c5430eed1..01c93c81e 100644 --- a/ccm-docrepo/pom.xml +++ b/ccm-docrepo/pom.xml @@ -121,11 +121,6 @@ h2 test - - log4j - log4j - 1.2.13 - @@ -225,7 +220,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 true true @@ -265,22 +260,22 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.19.1 + 2.20 org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 + 0.7.9 org.codehaus.mojo findbugs-maven-plugin - 3.0.3 + 3.0.4 org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.8 true utf-8 @@ -314,7 +309,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.8.1 + 2.9 @@ -353,7 +348,6 @@ org.jboss.arquillian.extension arquillian-jacoco - 1.0.0.Alpha8 net.sf.saxon @@ -400,7 +394,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -435,7 +428,6 @@ org.jboss.arquillian.extension arquillian-jacoco - 1.0.0.Alpha8 net.sf.saxon @@ -482,7 +474,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -517,7 +508,6 @@ org.jboss.arquillian.extension arquillian-jacoco - 1.0.0.Alpha8 net.sf.saxon @@ -564,7 +554,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -599,7 +588,6 @@ org.jboss.arquillian.extension arquillian-jacoco - 1.0.0.Alpha8 net.sf.saxon @@ -646,7 +634,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index 42b6753e9..734034f97 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -165,7 +165,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 1.8 1.8 @@ -178,7 +177,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 org.libreccm.tests.categories.UnitTest false @@ -257,7 +255,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 true true @@ -297,22 +295,22 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.18.1 + 2.20 org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 + 0.7.9 org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.4 org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.8 true utf-8 @@ -346,7 +344,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.8 + 2.9 @@ -436,7 +434,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -523,7 +520,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -566,7 +562,6 @@ org.jboss.arquillian.extension arquillian-jacoco - 1.0.0.Alpha8 net.sf.saxon @@ -613,7 +608,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 @@ -700,7 +694,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 always 999 diff --git a/ccm-testutils/pom.xml b/ccm-testutils/pom.xml index 70de56390..366c2b6cd 100644 --- a/ccm-testutils/pom.xml +++ b/ccm-testutils/pom.xml @@ -55,7 +55,6 @@ net.sourceforge.findbugs annotations - 1.3.2 provided @@ -70,10 +69,30 @@ ccm-testutils + + org.apache.maven.plugins + maven-enforcer-plugin + 1.4.1 + + + enforce-maven + + enforce + + + + + 3.3.1 + + + + + + + org.apache.maven.plugins maven-compiler-plugin - 3.5.1 1.8 1.8 @@ -130,12 +149,12 @@ org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.4 org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.8 true utf-8 @@ -168,7 +187,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.8 + 2.9 diff --git a/ccm-xafilesystemadapter/pom.xml b/ccm-xafilesystemadapter/pom.xml index 612e4ce8e..0fb8a1844 100644 --- a/ccm-xafilesystemadapter/pom.xml +++ b/ccm-xafilesystemadapter/pom.xml @@ -61,6 +61,30 @@ ccm-xafilesystemadapter + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-maven-version + + enforce + + + + + 1.8.0 + + + 3.3 + + + true + + + + + org.apache.maven.plugins maven-compiler-plugin @@ -85,10 +109,10 @@ - + org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 true true @@ -128,7 +152,7 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.19.1 + 2.20 false @@ -136,12 +160,12 @@ org.jacoco jacoco-maven-plugin - 0.7.8 + 0.7.9 org.codehaus.mojo findbugs-maven-plugin - 3.0.3 + 3.0.4 @@ -149,7 +173,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.8 true utf-8 diff --git a/pom.xml b/pom.xml index 5d715365f..4398760ce 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,10 @@ 2.4.5 + + 3.3.1 + + org.libreccm libreccm-parent 7.0.0-SNAPSHOT @@ -85,6 +89,20 @@ + + org.codehaus.mojo + versions-maven-plugin + 2.4 + + + + dependency-updates-report + plugin-updates-report + property-updates-report + + + + @@ -103,6 +121,11 @@ ${project.build.sourceEncoding} + + org.apache.maven.plugins + maven-enforcer-plugin + 1.4.1 + org.apache.maven.plugins maven-javadoc-plugin @@ -138,6 +161,11 @@ maven-site-plugin 3.6 + + org.codehaus.mojo + versions-maven-plugin + 2.4 + org.apache.maven.plugins maven-pmd-plugin @@ -226,16 +254,33 @@ vaadin-maven-plugin 8.0.6 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-maven-version + + enforce + + + + + 1.8.0 + + + 3.3.1 + + + + + + + org.wildfly.plugins wildfly-maven-plugin @@ -523,6 +568,12 @@ 1.2.2 + + net.sourceforge.findbugs + annotations + 1.3.2 + + xml-resolver xml-resolver @@ -603,6 +654,11 @@ arquillian-persistence-dbunit 1.0.0.Alpha7 + + org.jboss.arquillian.extension + arquillian-jacoco + 1.0.0.Alpha9 + org.wildfly wildfly-arquillian-container-managed