From a4133ad692107341b4e3848cf6d0b70e029e850a Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 8 Sep 2020 16:51:45 +0200 Subject: [PATCH] Fixed some problems in poms Former-commit-id: 1c89a53d678c7f10dd431687269b187c90db75c5 --- .gitignore | 1 + .../resources/archetype-resources/pom.xml | 19 ++------------ .../resources/archetype-resources/pom.xml | 23 +++------------- ccm-cms-profile/pom.xml | 17 ++---------- ccm-cms-types-agenda/pom.xml | 17 ++---------- ccm-cms-types-bookmark/pom.xml | 17 ++---------- ccm-cms-types-decisiontree/pom.xml | 17 ++---------- ccm-cms-types-externallink/pom.xml | 17 ++---------- ccm-cms-types-faqitem/pom.xml | 16 +++--------- ccm-cms-types-glossaryitem/pom.xml | 17 ++---------- ccm-cms-types-minutes/pom.xml | 17 ++---------- ccm-cms/pom.xml | 17 ++---------- ccm-core/pom.xml | 20 ++------------ ...ler.java => TaskAssignmentImExporter.java} | 0 ...ler.java => TaskDependencyImExporter.java} | 0 ccm-docrepo/pom.xml | 20 ++------------ ccm-shortcuts/pom.xml | 20 ++------------ ccm-testutils/pom.xml | 26 ++++--------------- ccm-xafilesystemadapter/pom.xml | 20 ++------------ pom.xml | 14 +++++++--- 20 files changed, 50 insertions(+), 265 deletions(-) rename ccm-core/src/main/java/org/libreccm/workflow/{TaskAssignmentMarshaller.java => TaskAssignmentImExporter.java} (100%) rename ccm-core/src/main/java/org/libreccm/workflow/{TaskDependencyMarshaller.java => TaskDependencyImExporter.java} (100%) diff --git a/.gitignore b/.gitignore index ef6e85bec..56e4e14b7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ node node_modules runtime target +.cache .classpath .factorypath .project diff --git a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml index 22b4300ff..c167449dc 100644 --- a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml +++ b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml @@ -183,13 +183,8 @@ maven-javadoc-plugin 2.10.3 - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -200,16 +195,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - - -sourceclasspath ${project.build.outputDirectory} - diff --git a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml index 78f0d8565..2bd673abd 100644 --- a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml +++ b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml @@ -113,8 +113,8 @@ maven-compiler-plugin 3.3 - 1.7 - 1.7 + 1.8 + 1.8 true true ${project.build.sourceEncoding} @@ -191,13 +191,8 @@ maven-javadoc-plugin 2.10.3 - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -208,16 +203,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - - -sourceclasspath ${project.build.outputDirectory} - diff --git a/ccm-cms-profile/pom.xml b/ccm-cms-profile/pom.xml index 719f6f624..8f52e31d0 100644 --- a/ccm-cms-profile/pom.xml +++ b/ccm-cms-profile/pom.xml @@ -215,13 +215,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -232,14 +227,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - -sourceclasspath ${project.build.outputDirectory} diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml index 4e9388de8..c48cd75d3 100644 --- a/ccm-cms-types-agenda/pom.xml +++ b/ccm-cms-types-agenda/pom.xml @@ -212,13 +212,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + falsed + false private true UTF-8 @@ -229,14 +224,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - -sourceclasspath ${project.build.outputDirectory} diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml index 5dcc2a0e4..b801fcd91 100644 --- a/ccm-cms-types-bookmark/pom.xml +++ b/ccm-cms-types-bookmark/pom.xml @@ -211,13 +211,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -228,14 +223,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - -sourceclasspath ${project.build.outputDirectory} diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml index c2511c0bd..6b4d14df8 100644 --- a/ccm-cms-types-decisiontree/pom.xml +++ b/ccm-cms-types-decisiontree/pom.xml @@ -212,13 +212,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -229,14 +224,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - -sourceclasspath ${project.build.outputDirectory} diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml index c89d7d9da..e896b05be 100644 --- a/ccm-cms-types-externallink/pom.xml +++ b/ccm-cms-types-externallink/pom.xml @@ -211,13 +211,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -228,14 +223,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - -sourceclasspath ${project.build.outputDirectory} diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml index c55cbf3d6..fbce46da6 100644 --- a/ccm-cms-types-faqitem/pom.xml +++ b/ccm-cms-types-faqitem/pom.xml @@ -211,11 +211,11 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true + false + false - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ + http://docs.oracle.com/javase/8/docs/api/ + http://docs.oracle.com/javaee/8/api/ http://docs.jboss.org/hibernate/orm/4.3/javadocs/ private @@ -228,14 +228,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - -sourceclasspath ${project.build.outputDirectory} diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml index 42a41978c..a9e0a5381 100644 --- a/ccm-cms-types-glossaryitem/pom.xml +++ b/ccm-cms-types-glossaryitem/pom.xml @@ -211,13 +211,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -228,14 +223,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - -sourceclasspath ${project.build.outputDirectory} diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml index 323e70313..4168af63f 100644 --- a/ccm-cms-types-minutes/pom.xml +++ b/ccm-cms-types-minutes/pom.xml @@ -212,13 +212,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -229,14 +224,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - -sourceclasspath ${project.build.outputDirectory} diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml index 7339dba5e..b2da1d216 100644 --- a/ccm-cms/pom.xml +++ b/ccm-cms/pom.xml @@ -250,13 +250,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -267,14 +262,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - -sourceclasspath ${project.build.outputDirectory} diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 0080ece81..e4b86ea4f 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -386,13 +386,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -403,17 +398,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - - -sourceclasspath ${project.build.outputDirectory} - - diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentImExporter.java similarity index 100% rename from ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java rename to ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentImExporter.java diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyMarshaller.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyImExporter.java similarity index 100% rename from ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyMarshaller.java rename to ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyImExporter.java diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml index c65c751bf..62e449e68 100644 --- a/ccm-docrepo/pom.xml +++ b/ccm-docrepo/pom.xml @@ -193,13 +193,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -210,17 +205,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - - -sourceclasspath ${project.build.outputDirectory} - - diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index 0ca828b20..ef64710d5 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -248,13 +248,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -265,17 +260,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - - -sourceclasspath ${project.build.outputDirectory} - - diff --git a/ccm-testutils/pom.xml b/ccm-testutils/pom.xml index ce893e154..29f478717 100644 --- a/ccm-testutils/pom.xml +++ b/ccm-testutils/pom.xml @@ -106,13 +106,8 @@ org.apache.maven.plugins maven-javadoc-plugin - true - true - - http://docs.oracle.com/javase/7/docs/api/ - http://docs.oracle.com/javaee/7/api/ - http://docs.jboss.org/hibernate/orm/4.3/javadocs/ - + false + false private true UTF-8 @@ -123,17 +118,6 @@ true true false - org.jboss.apiviz.APIviz - - org.jboss.apiviz - apiviz - 1.3.2.GA - - true - - -sourceclasspath ${project.build.outputDirectory} - - @@ -141,8 +125,8 @@ maven-jxr-plugin - org.codehaus.mojo - findbugs-maven-plugin + com.github.spotbugs + spotbugs-maven-plugin org.apache.maven.plugins @@ -151,7 +135,7 @@ true utf-8 1.8 - diff --git a/pom.xml b/pom.xml index 6d7793cd9..e691dcc52 100644 --- a/pom.xml +++ b/pom.xml @@ -8,10 +8,6 @@ - - 3.3.1 - - org.libreccm libreccm-parent 7.0.0-SNAPSHOT @@ -196,6 +192,11 @@ maven-javadoc-plugin 3.2.0 + + org.apache.maven.plugins + maven-jxr-plugin + 3.0.0 + org.apache.maven.plugins maven-pmd-plugin @@ -323,6 +324,11 @@ versions-maven-plugin 2.7 + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + org.jacoco jacoco-maven-plugin