diff --git a/mbi/dist/metadata.txt b/mbi/dist/metadata.txt index 15094da5..35d80505 100644 --- a/mbi/dist/metadata.txt +++ b/mbi/dist/metadata.txt @@ -158,14 +158,6 @@ MOD easymock DEP cglib cglib DEP org.ow2.asm asm DEP org.objenesis objenesis -MOD extra-enforcer-rules - ART org.codehaus.mojo extra-enforcer-rules - DEP org.apache.maven.enforcer enforcer-api - DEP org.apache.maven maven-core - DEP org.apache.maven maven-compat - DEP org.apache.maven.shared maven-dependency-tree - DEP commons-codec commons-codec - DEP org.apache.maven.shared maven-common-artifact-filters MOD felix-utils ART org.apache.felix org.apache.felix.utils MOD gson @@ -489,18 +481,6 @@ MOD maven-embedder DEP commons-cli commons-cli DEP org.apache.commons commons-lang3 DEP org.fusesource.jansi jansi -MOD maven-enforcer - ART org.apache.maven.enforcer enforcer-rules - DEP org.codehaus.plexus plexus-utils - DEP org.apache.commons commons-lang3 - DEP commons-codec commons-codec - DEP commons-io commons-io - DEP org.apache.maven.enforcer enforcer-api - DEP org.apache.maven.resolver maven-resolver-util - ART org.apache.maven.plugins maven-enforcer-plugin - DEP org.apache.maven.enforcer enforcer-api - DEP org.apache.maven.enforcer enforcer-rules - ART org.apache.maven.enforcer enforcer-api MOD maven-file-management ART org.apache.maven.shared file-management DEP org.slf4j slf4j-api diff --git a/project/apache-pom.xml b/project/apache-pom.xml index 1ea67355..84edf127 100644 --- a/project/apache-pom.xml +++ b/project/apache-pom.xml @@ -5,6 +5,7 @@ + maven-enforcer-plugin maven-site-plugin diff --git a/project/extra-enforcer-rules.properties b/project/extra-enforcer-rules.properties deleted file mode 100644 index 2413655e..00000000 --- a/project/extra-enforcer-rules.properties +++ /dev/null @@ -1,3 +0,0 @@ -url=https://github.com/mojohaus/extra-enforcer-rules.git -ref=@.@.@ -version=1.7.0 diff --git a/project/extra-enforcer-rules.xml b/project/extra-enforcer-rules.xml deleted file mode 100644 index 32ef5213..00000000 --- a/project/extra-enforcer-rules.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - Apache-2.0 - LICENSE.txt - - - commons-codec - injection-api - maven-artifact - maven-model - maven-core - maven-enforcer - maven-resolver - plexus-utils - sisu-plexus - maven-dependency-tree - maven-common-artifact-filters - - - src/main/java - - - - - diff --git a/project/fusesource-pom.xml b/project/fusesource-pom.xml index 3b6fe7a4..fa415ea9 100644 --- a/project/fusesource-pom.xml +++ b/project/fusesource-pom.xml @@ -7,6 +7,7 @@ fusesource-pom + maven-enforcer-plugin maven-scm-plugin diff --git a/project/maven-enforcer.properties b/project/maven-enforcer.properties deleted file mode 100644 index 9943ee63..00000000 --- a/project/maven-enforcer.properties +++ /dev/null @@ -1,3 +0,0 @@ -url=https://github.com/apache/maven-enforcer.git -ref=enforcer-@.@.@ -version=3.5.0 diff --git a/project/maven-enforcer.xml b/project/maven-enforcer.xml deleted file mode 100644 index 63f33e24..00000000 --- a/project/maven-enforcer.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - Apache-2.0 - NOTICE - - - maven-plugin-tools - injection-api - jsr-305 - maven-plugin-api - sisu-plexus - maven-core - maven-model - maven-model-builder - maven-settings - maven-artifact - maven-resolver - slf4j - plexus-utils - plexus-classworlds - commons-lang - commons-codec - commons-io - - - enforcer-api/src/main/java - enforcer-rules/src/main/java - maven-enforcer-plugin/src/main/java - EvaluateBeanshell - - - - maven-enforcer-plugin - - - - diff --git a/project/maven-parent-pom.xml b/project/maven-parent-pom.xml index a087f9c3..14d59e0c 100644 --- a/project/maven-parent-pom.xml +++ b/project/maven-parent-pom.xml @@ -18,6 +18,7 @@ maven-plugins + maven-enforcer-plugin generate-helpmojo